From d1154e9271859dc856be9df598a2672cb0de3fe5 Mon Sep 17 00:00:00 2001 From: Hadi Amjad <46374292+hadiamjad@users.noreply.github.com> Date: Wed, 12 Jul 2023 21:52:48 +0200 Subject: [PATCH] Adding seperate end-point for Solana (#1114) * Use renovate for dependency updates (#1054) 1. Disable dependabot for normal dependency updates. Note the dependabot PRs will need to be manually closed, and the "security" dependabot PRs will continue. 2. Use renovateapp instead. The renovate configuration included here is based on that from ads-serve, and: a. waits for updates to have been published for 4 days before raising a PR - this both reduces churn and also avoids the 3 day period where npm-published entries can be "unpublished" b. combines all minor and patch updates into a single PR * removed as *[bot] is not accepted by AWS (#1055) Signed-off-by: Ahmed Kamal * Update all non-major dependencies (#1057) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Pin dependencies (#1056) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update all non-major dependencies (#1063) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Node.js to v18.16.1 (#1059) * first mockup on dev2 * remove cluttered talk, add request payload * change permission name from BAT-gating to balance as per spec sheet * Renovate/all minor patch (#1062) * Use renovate for dependency updates (#1054) 1. Disable dependabot for normal dependency updates. Note the dependabot PRs will need to be manually closed, and the "security" dependabot PRs will continue. 2. Use renovateapp instead. The renovate configuration included here is based on that from ads-serve, and: a. waits for updates to have been published for 4 days before raising a PR - this both reduces churn and also avoids the 3 day period where npm-published entries can be "unpublished" b. combines all minor and patch updates into a single PR * removed as *[bot] is not accepted by AWS (#1055) Signed-off-by: Ahmed Kamal * Update all non-major dependencies --------- Signed-off-by: Ahmed Kamal Co-authored-by: Graham Tackley Co-authored-by: Ahmed Kamal Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Node.js to v18.16.1 --------- Signed-off-by: Ahmed Kamal Co-authored-by: David Suh Co-authored-by: David Suh Co-authored-by: Marshall T. Rose Co-authored-by: Graham Tackley Co-authored-by: Ahmed Kamal Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert "Update Node.js to v18.16.1 (#1059)" This reverts commit 0dc19698f5dead7ba07e2bc48dc5525e5b77632b. * this is what should have happened (#1070) * Update dependency react-i18next to v13 (#1060) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Address word-wrap audit warning (#1073) Addresses: https://github.com/advisories/GHSA-j8xg-fqg3-53r7 * reduce impact of web3 dependencies on non-web3 users (#1066) * dynamically loading ethers library * syncing package-lock.json with main * removed short-circuit code * removed short-circuit code * fixed dynamic hexilify for solana * phantom fallback option in solana * phantom wallet support for solana * Pin dependency optionator to 0.9.3 (#1074) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Duplicate Fix For Update jest monorepo to v29 (major) (#1082) * testing changes by renovate * testing changes by renovate * Pin dependency jest-environment-jsdom to 29.5.0 (#1083) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update all non-major dependencies (#1080) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marshall T. Rose * Update dependency i18next to v23.2.6 (#1084) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update all non-major dependencies (#1085) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix for high spam scores #1088 and lock wallet #1089 * fix for high spam scores #1088 and lock wallet #1089 * checkbox text fixed * Fix for Inability to Deselect Avatar NFT without Selecting Another in Web3 Call (#1101) * Fix for Inability to Deselect Avatar NFT without Selecting Another * Adding a check-box to filter NFTs with high spam score (#1102) * check-btn for filtering high spam score NFTs * JP-translations added * JP-translations added * JP-translations added * JP-translations added * forcefully adding recording flag * adding seperate end-point for solana --------- Signed-off-by: Ahmed Kamal Co-authored-by: Graham Tackley Co-authored-by: Ahmed Kamal Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Suh Co-authored-by: David Suh Co-authored-by: Marshall T. Rose --- package-lock.json | 64 +++++++++++++++++++++- package.json | 7 +-- src/App.tsx | 134 ++++++++++++++++++++++++++++++++-------------- 3 files changed, 161 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e924f53..cafa116e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,8 @@ "jest-environment-jsdom": "29.5.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "13.0.1" + "react-i18next": "13.0.1", + "react-router-dom": "^6.14.1" }, "devDependencies": { "@brave-intl/skus-sdk": "0.1.3", @@ -2739,6 +2740,14 @@ "node": ">= 8" } }, + "node_modules/@remix-run/router": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz", + "integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==", + "engines": { + "node": ">=14" + } + }, "node_modules/@rushstack/eslint-patch": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz", @@ -10675,6 +10684,36 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/react-router": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz", + "integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==", + "dependencies": { + "@remix-run/router": "1.7.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz", + "integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==", + "dependencies": { + "@remix-run/router": "1.7.1", + "react-router": "6.14.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -14883,6 +14922,11 @@ "fastq": "^1.6.0" } }, + "@remix-run/router": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz", + "integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==" + }, "@rushstack/eslint-patch": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz", @@ -17262,7 +17306,6 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", "source-map": "~0.6.1" }, "dependencies": { @@ -20692,6 +20735,23 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "react-router": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz", + "integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==", + "requires": { + "@remix-run/router": "1.7.1" + } + }, + "react-router-dom": { + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz", + "integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==", + "requires": { + "@remix-run/router": "1.7.1", + "react-router": "6.14.1" + } + }, "readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index 7f02ab39..40115664 100644 --- a/package.json +++ b/package.json @@ -45,20 +45,21 @@ "svgo-loader": "4.0.0", "ts-loader": "9.4.4", "typescript": "4.9.5", - "webpack-cli": "5.1.4", "webpack": "5.88.1", + "webpack-cli": "5.1.4", "ts-jest": "29.1.1", "webpack-dev-server": "4.15.1" }, "dependencies": { "@emotion/react": "11.11.1", - "buffer": "6.0.3", "@types/dom-screen-wake-lock": "1.0.1", + "buffer": "6.0.3", "ethers": "6.6.2", "i18next": "23.2.6", "jest-environment-jsdom": "29.5.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "13.0.1" + "react-i18next": "13.0.1", + "react-router-dom": "6.14.1" } } \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index 175475d0..53091e8f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,5 @@ import { css } from "@emotion/react"; +import { BrowserRouter as Router, Route, Routes } from "react-router-dom"; import React from "react"; import { GlobalStyles } from "./components/GlobalStyles"; import { InCall } from "./components/InCall"; @@ -53,46 +54,101 @@ export const App: React.FC = () => { } return ( - - + + + + -
- + + {!isCallReady && + (isWeb3Call && hasInitialRoom ? ( + + ) : ( + + ))} +
+ + } /> - {!isCallReady && - (isWeb3Call && hasInitialRoom ? ( - - ) : ( - - ))} - - + + + +
+ + {!isCallReady && + (isWeb3Call && hasInitialRoom ? ( + + ) : ( + + ))} +
+ + } + /> + + ); };