Abdul sol nft gating (#1117)

* 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 <[email protected]> * 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 <[email protected]> * Update all non-major dependencies --------- Signed-off-by: Ahmed Kamal <[email protected]> Co-authored-by: Graham Tackley <[email protected]> Co-authored-by: Ahmed Kamal <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Node.js to v18.16.1 --------- Signed-off-by: Ahmed Kamal <[email protected]> Co-authored-by: David Suh <[email protected]> Co-authored-by: David Suh <[email protected]> Co-authored-by: Marshall T. Rose <[email protected]> Co-authored-by: Graham Tackley <[email protected]> Co-authored-by: Ahmed Kamal <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert "Update Node.js to v18.16.1 (#1059)" This reverts commit 0dc1969. * 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: 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 <[email protected]> * 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 * added solana parameter --------- Signed-off-by: Ahmed Kamal <[email protected]> Co-authored-by: Graham Tackley <[email protected]> Co-authored-by: Ahmed Kamal <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Suh <[email protected]> Co-authored-by: David Suh <[email protected]> Co-authored-by: Marshall T. Rose <[email protected]>
brave · Jul 12, 2023 · 0453469 · 0453469
1 parent d1154e9
commit 0453469
Showing 1 changed file with 48 additions and 46 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -47,6 +47,7 @@ export const App: React.FC = () => {
   } = useCallSetupStatus(params.isCreate);
 
   const browserProps = useBrowserProperties();
+  const isSolPath = window.location.search.includes("sol");
 
   if (isCallReady && params.isCreateOnly) {
     reportAction("closing window as requested", params);
@@ -56,58 +57,59 @@ export const App: React.FC = () => {
   return (
     <Router>
       <Routes>
-        <Route
-          path="/sol"
-          element={
-            <React.Fragment>
-              <GlobalStyles />
+        {isSolPath && (
+          <Route
+            path="/"
+            element={
+              <React.Fragment>
+                <GlobalStyles />
 
-              <div css={styles.container}>
-                <InCall
-                  roomName={roomName ?? ""}
-                  jwt={jwt ?? ""}
-                  isMobile={browserProps.isMobile}
-                  isCallReady={isCallReady}
-                  isWeb3Call={isWeb3Call}
-                  jitsiContext={jitsiContext}
-                />
-                {!isCallReady &&
-                  (isWeb3Call && hasInitialRoom ? (
-                    <JoinWeb3Call
-                      roomName={roomName as string}
-                      setJwt={setJwt}
-                      jitsiContext={jitsiContext}
-                      setJitsiContext={setJitsiContext}
-                      web3Account={web3Account}
-                      setWeb3Account={setWeb3Account}
-                    />
-                  ) : (
-                    <WelcomeScreen
-                      onStartCall={onStartCall}
-                      notice={notice}
-                      disabled={isEstablishingCall}
-                      hasInitialRoomName={hasInitialRoom}
-                      browser={browserProps}
-                      isWeb3Call={isWeb3Call}
-                      setIsWeb3Call={setIsWeb3Call}
-                      web3Account={web3Account}
-                      setWeb3Account={setWeb3Account}
-                      setJwt={setJwt}
-                      setRoomName={setRoomName}
-                      jitsiContext={jitsiContext}
-                      setJitsiContext={setJitsiContext}
-                    />
-                  ))}
-              </div>
-            </React.Fragment>
-          }
-        />
+                <div css={styles.container}>
+                  <InCall
+                    roomName={roomName ?? ""}
+                    jwt={jwt ?? ""}
+                    isMobile={browserProps.isMobile}
+                    isCallReady={isCallReady}
+                    isWeb3Call={isWeb3Call}
+                    jitsiContext={jitsiContext}
+                  />
+                  {!isCallReady &&
+                    (isWeb3Call && hasInitialRoom ? (
+                      <JoinWeb3Call
+                        roomName={roomName as string}
+                        setJwt={setJwt}
+                        jitsiContext={jitsiContext}
+                        setJitsiContext={setJitsiContext}
+                        web3Account={web3Account}
+                        setWeb3Account={setWeb3Account}
+                      />
+                    ) : (
+                      <WelcomeScreen
+                        onStartCall={onStartCall}
+                        notice={notice}
+                        disabled={isEstablishingCall}
+                        hasInitialRoomName={hasInitialRoom}
+                        browser={browserProps}
+                        isWeb3Call={isWeb3Call}
+                        setIsWeb3Call={setIsWeb3Call}
+                        web3Account={web3Account}
+                        setWeb3Account={setWeb3Account}
+                        setJwt={setJwt}
+                        setRoomName={setRoomName}
+                        jitsiContext={jitsiContext}
+                        setJitsiContext={setJitsiContext}
+                      />
+                    ))}
+                </div>
+              </React.Fragment>
+            }
+          />
+        )}
         <Route
           path="/"
           element={
             <React.Fragment>
               <GlobalStyles />
-
               <div css={styles.container}>
                 <InCall
                   roomName={roomName ?? ""}