Merge pull request #211 from argoapp-live/dev

Release V2.4

package.json

@@ -2,7 +2,7 @@
   "name": "argo-react",
   "version": "2.0.0",
   "description": "ArGo Frontend App",
-  "main": "build/index.js",
+  "private": true,
   "author": "ArGo",
   "license": "MIT",
   "keywords": [
@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@argoapp/payment-js": "^1.0.3",
+    "@ensdomains/ui": "https://github.com/rekpero/ui.git",
     "@fortawesome/fontawesome-svg-core": "^1.2.30",
     "@fortawesome/free-brands-svg-icons": "^5.14.0",
     "@fortawesome/free-regular-svg-icons": "^5.14.0",
@@ -81,9 +82,11 @@
     "react-tooltip": "^4.2.21",
     "reactjs-popup": "^2.0.5",
     "rxjs": "^6.6.2",
+    "skynet-js": "^4.0.14-beta",
     "socket.io-client": "^4.1.1",
     "source-map-explorer": "^2.5.0",
-    "typescript": "~3.7.2"
+    "typescript": "^4.2.4",
+    "web3modal": "^1.9.4"
   },
   "devDependencies": {
     "@types/javascript-time-ago": "^2.0.1",

src/components/Dashboard/routes/InviteMembers/components/InvitePopup/InvitePopup.scss

@@ -33,11 +33,6 @@
     align-items: center;
     padding: 0px 50px 40px 50px;
     backdrop-filter: blur(4px);
-    .content {
-      display: flex;
-      flex-direction: column;
-      width: -webkit-fill-available;
-    }
     .header-container {
       font-weight: 700;
       font-size: xx-large;

src/components/Dashboard/routes/InviteMembers/components/InvitePopup/InvitePopup.tsx

@@ -63,7 +63,7 @@ const InvitePopup: React.FC<IInviteProps> = ({ isOpen, memberLoading, isData })
               Invite mail sent successfully.
               <br />
               <br />
-              Please check your mail and confirm, to add as a member of this
+              Ask member to check his mail and confirm, to add as a member of this
               organization.
             </div>
           </div>

src/components/Dashboard/routes/Overview/Overview.tsx

@@ -138,6 +138,7 @@ const Overview = () => {
                         ? repo.handshakeSubdomains
                         : []
                     }
+                    ensDomains={repo.ensDomains?.length ? repo.ensDomains : []}
                     latestDeployment={
                       repo?.latestDeployment?.sitePreview
                         ? repo?.latestDeployment?.sitePreview
@@ -158,6 +159,7 @@ const Overview = () => {
                 subdomains={null}
                 hnsDomains={null}
                 hnsSubdomains={null}
+                ensDomains={null}
                 latestDeployment={null}
                 githubUrl={null}
                 updateTime={null}
@@ -173,6 +175,7 @@ const Overview = () => {
               subdomains={null}
               hnsDomains={null}
               hnsSubdomains={null}
+              ensDomains={null}
               latestDeployment={null}
               githubUrl={null}
               updateTime={null}