Merge pull request #988 from ethereum-push-notification-service/dynam…

…ic-urls Dynamic urls in chat -> app.push.org/#/chat/gmdm.eth
push-protocol · Mar 29, 2023 · 00bfbf7 · 00bfbf7
2 parents 726f810 + a9488e6
commit 00bfbf7
Show file tree

Hide file tree

Showing 18 changed files with 659 additions and 365 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@pushprotocol/dapp",
-  "version": "0.6.2",
+  "name": "@project/react-app",
+  "version": "0.6.3",
   "homepage": "https://app.push.org",
   "browserslist": {
     "production": [
@@ -34,7 +34,7 @@
     "@mui/lab": "^5.0.0-alpha.72",
     "@mui/material": "^5.5.0",
     "@pushprotocol/ledgerlive": "0.0.1",
-    "@pushprotocol/restapi": "1.0.0",
+    "@pushprotocol/restapi": "^1.0.0",
     "@pushprotocol/socket": "0.4.2",
     "@pushprotocol/uiweb": "0.5.0",
     "@reduxjs/toolkit": "^1.7.1",
@@ -108,7 +108,7 @@
     "react-player": "2.9.0",
     "react-query": "^3.39.1",
     "react-redux": "^7.2.6",
-    "react-router-dom": "6",
+    "react-router-dom": "^6.9.0",
     "react-scripts": "^5.0.1",
     "react-scroll-to-bottom": "^4.2.0",
     "react-select": "^5.2.2",

diff --git a/public/index-alpha.html b/public/index-alpha.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/index-dev.html b/public/index-dev.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/index-prod.html b/public/index-prod.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/index-staging.html b/public/index-staging.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/index-w2w.html b/public/index-w2w.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/">
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,7 +14,7 @@
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#cf1c84" />
     <meta name="msapplication-TileColor" content="#9f00a7" />
     <meta name="theme-color" content="#ffffff" />
-    <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script>
+    <!-- <script type="text/javascript" src="https://app.olvy.co/script.js" defer="defer"></script> -->
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -28,23 +29,23 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <!-- HTML Meta Tags -->
-    <title>Push Dev App (Previously EPNS) | Communication Protocol of Web3</title>
-    <meta name="description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
+    <title>Push App (Previously EPNS) | Communication Protocol of Web3</title>
+    <meta name="description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
 
     <!-- Facebook Meta Tags -->
-    <meta property="og:url" content="https://dev.push.org">
+    <meta property="og:url" content="https://app.push.org">
     <meta property="og:type" content="website">
-    <meta property="og:title" content="Push Dev App (Previously EPNS)">
-    <meta property="og:description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
-    <meta property="og:image" content="https://dev.push.org/previews/homepage-dev.jpg">
+    <meta property="og:title" content="Push App (Previously EPNS)">
+    <meta property="og:description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
+    <meta property="og:image" content="https://app.push.org/previews/homepage.jpg">
 
     <!-- Twitter Meta Tags -->
     <meta name="twitter:card" content="summary_large_image">
-    <meta property="twitter:domain" content="dev.push.org">
-    <meta property="twitter:url" content="https://dev.push.org">
-    <meta name="twitter:title" content="Push Dev App (Previously EPNS)">
-    <meta name="twitter:description" content="Push Dev App (Previously EPNS) | Communication Protocol of Web3">
-    <meta name="twitter:image" content="https://dev.push.org/previews/homepagetwitter-dev.jpg">
+    <meta property="twitter:domain" content="app.push.org">
+    <meta property="twitter:url" content="https://app.push.org">
+    <meta name="twitter:title" content="Push App (Previously EPNS)">
+    <meta name="twitter:description" content="Push App (Previously EPNS) | Communication Protocol of Web3">
+    <meta name="twitter:image" content="https://app.push.org/previews/homepagetwitter.jpg">
 
     <!-- Meta Tags Generated via https://www.opengraph.xyz -->
 

diff --git a/src/components/chat/chatsnap/ChatSnap.tsx b/src/components/chat/chatsnap/ChatSnap.tsx
@@ -35,8 +35,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
   const theme = useTheme();
   // get ens name
   const ensName = useResolveEns(!isGroup ? username : null);
-  // get reverse name
-
+
   // get short username
   const walletAddress = !isGroup ? caip10ToWallet(username) : null;
   const shortUsername = !isGroup ? shortenText(walletAddress, 8, 7) : null;
@@ -66,7 +65,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
           className="fa fa-picture-o"
           aria-hidden="true"
         ></i>{' '}
-        Media
+        Image
       </SpanV2>
     ) : chatSnapMsg.type === 'File' ? (
       <SpanV2 color={theme.default.secondaryColor}>
@@ -76,7 +75,7 @@ const ChatSnap = ({ pfp, username, chatSnapMsg, timestamp, selected, onClick, is
         ></i>{' '}
         File
       </SpanV2>
-    ) : chatSnapMsg.type === 'GIF' ? (
+    ) : chatSnapMsg.type === 'GIF' || chatSnapMsg.type === 'MediaEmbed' ? (
       <SpanV2 color={theme.default.secondaryColor}>
         <i
           className="fa fa-picture-o"