fix: modal loop

masa-finance · Jun 1, 2023 · 655de01 · 655de01
1 parent 6dd7d5d
commit 655de01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx
@@ -132,8 +132,8 @@ export const MasaInterface = ({
       if (isConnected) {
         // * user does not have a wallet
         if (!hasAccountAddress) {
-          openConnectModal?.();
           setModalOpen?.(false);
+          openConnectModal?.();
           console.log('user does not have wallet but is connected', {
             openConnectModal,
             hasAccountAddress,
@@ -208,7 +208,7 @@ export const MasaInterface = ({
 
       if (hasAccountAddress && isLoggedIn) return 'connectedState';
       // return 'authenticate';
-      setModalOpen?.(false);
+
       openConnectModal?.();
       setRainbowkKitModalCallback?.(() => {
         return () => {
@@ -217,7 +217,10 @@ export const MasaInterface = ({
         };
       });
 
-      if (hasAccountAddress) return 'authenticate';
+      if (hasAccountAddress) {
+        console.log('im ehre');
+        return 'authenticate';
+      }
       return 'rainbowkitConnect';
     }
   }, [

diff --git a/src/styles.scss b/src/styles.scss
@@ -804,7 +804,6 @@
         flex-direction: column;
 
         span {
-          border: 2px solid red;
           span {
             padding: 4px;
           }

diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx
@@ -245,7 +245,7 @@ const TemplateWithRainbowKit: Story = (props: Args) => {
         company="Masa"
         walletsToUse={['metamask', 'valora', 'walletconnect']}
         useRainbowKitWalletConnect
-        forceNetwork="alfajores"
+        forceNetwork="celo"
         rainbowKitModalSize={'wide'}
         verbose={false}
       >