Skip to content

Commit 00bfbf7

Browse files
0xNilesh0xNilesh
authored
Merge pull request #988 from ethereum-push-notification-service/dynamic-urls
Dynamic urls in chat -> app.push.org/#/chat/gmdm.eth
2 parents 726f810 + a9488e6 commit 00bfbf7

File tree

18 files changed

+659
-365
lines changed

18 files changed

+659
-365
lines changed

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@pushprotocol/dapp",
3-
"version": "0.6.2",
2+
"name": "@project/react-app",
3+
"version": "0.6.3",
44
"homepage": "https://app.push.org",
55
"browserslist": {
66
"production": [
@@ -34,7 +34,7 @@
3434
"@mui/lab": "^5.0.0-alpha.72",
3535
"@mui/material": "^5.5.0",
3636
"@pushprotocol/ledgerlive": "0.0.1",
37-
"@pushprotocol/restapi": "1.0.0",
37+
"@pushprotocol/restapi": "^1.0.0",
3838
"@pushprotocol/socket": "0.4.2",
3939
"@pushprotocol/uiweb": "0.5.0",
4040
"@reduxjs/toolkit": "^1.7.1",
@@ -108,7 +108,7 @@
108108
"react-player": "2.9.0",
109109
"react-query": "^3.39.1",
110110
"react-redux": "^7.2.6",
111-
"react-router-dom": "6",
111+
"react-router-dom": "^6.9.0",
112112
"react-scripts": "^5.0.1",
113113
"react-scroll-to-bottom": "^4.2.0",
114114
"react-select": "^5.2.2",

‎public/index-alpha.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎public/index-dev.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎public/index-prod.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎public/index-staging.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎public/index-w2w.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

‎public/index.html

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/">
45
<meta charset="utf-8" />
56
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
67
<meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
1314
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
1415
<meta name="msapplication-TileColor" content="#9f00a7" />
1516
<meta name="theme-color" content="#ffffff" />
16-
<script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
17+
<!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
1718
<!--
1819
manifest.json provides metadata used when your web app is installed on a
1920
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -28,23 +29,23 @@
2829
Learn how to configure a non-root public URL by running `npm run build`.
2930
-->
3031
<!-- HTML Meta Tags -->
31-
<title>Push Dev App (Previously EPNS) | Communication Protocol of Web3</title>
32-
<meta name="description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
32+
<title>Push App (Previously EPNS) | Communication Protocol of Web3</title>
33+
<meta name="description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
3334

3435
<!-- Facebook Meta Tags -->
35-
<meta property="og:url" content="https://dev.push.org">
36+
<meta property="og:url" content="https://app.push.org">
3637
<meta property="og:type" content="website">
37-
<meta property="og:title" content="Push Dev App (Previously EPNS)">
38-
<meta property="og:description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
39-
<meta property="og:image" content="https://dev.push.org/previews/homepage-dev.jpg">
38+
<meta property="og:title" content="Push App (Previously EPNS)">
39+
<meta property="og:description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
40+
<meta property="og:image" content="https://app.push.org/previews/homepage.jpg">
4041

4142
<!-- Twitter Meta Tags -->
4243
<meta name="twitter:card" content="summary_large_image">
43-
<meta property="twitter:domain" content="dev.push.org">
44-
<meta property="twitter:url" content="https://dev.push.org">
45-
<meta name="twitter:title" content="Push Dev App (Previously EPNS)">
46-
<meta name="twitter:description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
47-
<meta name="twitter:image" content="https://dev.push.org/previews/homepagetwitter-dev.jpg">
44+
<meta property="twitter:domain" content="app.push.org">
45+
<meta property="twitter:url" content="https://app.push.org">
46+
<meta name="twitter:title" content="Push App (Previously EPNS)">
47+
<meta name="twitter:description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
48+
<meta name="twitter:image" content="https://app.push.org/previews/homepagetwitter.jpg">
4849

4950
<!-- Meta Tags Generated via https://www.opengraph.xyz -->
5051

‎src/components/chat/chatsnap/ChatSnap.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
3535
const theme = useTheme();
3636
// get ens name
3737
const ensName = useResolveEns(!isGroup ? username : null);
38-
// get reverse name
39-
38+
4039
// get short username
4140
const walletAddress = !isGroup ? caip10ToWallet(username) : null;
4241
const shortUsername = !isGroup ? shortenText(walletAddress, 8, 7) : null;
@@ -66,7 +65,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
6665
className="fa fa-picture-o"
6766
aria-hidden="true"
6867
></i>{' '}
69-
Media
68+
Image
7069
</SpanV2>
7170
) : chatSnapMsg.type === 'File' ? (
7271
<SpanV2 color={theme.default.secondaryColor}>
@@ -76,7 +75,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
7675
></i>{' '}
7776
File
7877
</SpanV2>
79-
) : chatSnapMsg.type === 'GIF' ? (
78+
) : chatSnapMsg.type === 'GIF' || chatSnapMsg.type === 'MediaEmbed' ? (
8079
<SpanV2 color={theme.default.secondaryColor}>
8180
<i
8281
className="fa fa-picture-o"

0 commit comments

Comments
 (0)