Merge pull request #1256 from ethereum-push-notification-service/conf…

…igure-snap-addresses Configure Snap Addresses UI
push-protocol · Sep 19, 2023 · ff86a1c · ff86a1c
2 parents 1a917a3 + 3f22c32
commit ff86a1c
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 100 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -103,7 +103,7 @@ export default function App() {
   const {authError, setAuthError } = useContext(ErrorContext);
 
   const { run, stepIndex, tutorialContinous } = useSelector((state: any) => state.userJourney);
-  const location = useLocation();
+  // const location = useLocation();
   // Build takes care of this now
   // const [title, setTitle] = useState(EnvHelper.dappTitle());
 
@@ -225,6 +225,9 @@ export default function App() {
 
   // const { spaceUI } = useSpaceComponents();
 
+  const location = useLocation();
+  const isSnapPage = location?.pathname === '/snap';
+
   return (
     <ThemeProvider theme={darkMode ? themeDark : themeLight}>
       {!isActive && (
@@ -280,11 +283,11 @@ export default function App() {
                 bg={darkMode ? themeDark.backgroundBG : !isActive ? themeLight.connectWalletBg : themeLight.backgroundBG}
                 headerHeight={GLOBALS.CONSTANTS.HEADER_HEIGHT}
               >
-                <LeftBarContainer leftBarWidth={GLOBALS.CONSTANTS.LEFT_BAR_WIDTH}>
+                {!isSnapPage && <LeftBarContainer leftBarWidth={GLOBALS.CONSTANTS.LEFT_BAR_WIDTH}>
                   <Navigation />
-                </LeftBarContainer>
+                </LeftBarContainer>}
 
-                <ContentContainer leftBarWidth={GLOBALS.CONSTANTS.LEFT_BAR_WIDTH}>
+                <ContentContainer leftBarWidth={isSnapPage ? 0 : GLOBALS.CONSTANTS.LEFT_BAR_WIDTH}>
                    {/* Shared among all pages, load universal things here */}
                    <SpacesUIProvider spaceUI={spaceUI} theme={darkMode ? darkTheme : lightTheme}>
                       <MasterInterfacePage />

diff --git a/src/components/MetamaskSnap/InstallMetamaskSnapModal.tsx b/src/components/MetamaskSnap/InstallMetamaskSnapModal.tsx
@@ -1,14 +1,19 @@
-import { Button } from 'components/SharedStyling';
-import { ItemHV2, ItemVV2, SpanV2 } from 'components/reusables/SharedStylingV2';
+// React + Web3 Essentials
 import React, { useEffect } from 'react';
+
+// External Packages
 import styled,{useTheme} from 'styled-components';
+
+// Internal Compoonents
+import { A } from 'primaries/SharedStyling';
+import { ItemHV2, ItemVV2, SpanV2 } from 'components/reusables/SharedStylingV2';
+import { Button } from 'components/SharedStyling';
 import Metamask from 'assets/PushSnaps/metamasksnap.svg';
 import PushIcon from 'assets/PushSnaps/PushIcon.svg';
 import AppStoreQRCode from 'assets/PushSnaps/AppStoreQRCode.svg';
 import PlayStoreQRCode from 'assets/PushSnaps/PlayStoreQRCode.svg';
 import AppleIcon from 'assets/PushSnaps/AppleIcon.svg';
 import PlayStore from 'assets/PushSnaps/PlayStore.svg';
-import { A } from 'primaries/SharedStyling';
 
 
 const InstallMetamaskSnapModal = ({
@@ -28,7 +33,7 @@ const InstallMetamaskSnapModal = ({
             method: 'wallet_getSnaps'
         });
         Object.keys(installedSnaps).forEach((snap) => {
-            if (snap == 'npm:push-v1') {
+            if (snap == 'npm:@pushprotocol/snaps') {
                 setConfigure(true);
             }
         }