Build fixes

masa-finance · Jul 4, 2023 · a37b0bc · a37b0bc
1 parent 7270e35
commit a37b0bc
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 241 deletions.
diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx
@@ -128,101 +128,96 @@ export const MasaInterface = ({
       if (hasAccountAddress && isLoggedIn) return 'connectedState';
 
       return 'connector';
-    } 
-      // * rainbowkit logic
-      if (forcedPage) return forcedPage;
-
-      if (verbose) {
-        console.log('');
-      }
-      if (isConnected) {
-        // * user does not have a wallet
-        if (!hasAccountAddress) {
-          setModalOpen?.(false);
-          openConnectModal?.();
-          console.log('user does not have wallet but is connected', {
-            openConnectModal,
-            hasAccountAddress,
-            hasWalletAddress,
-          });
-
-          setRainbowkKitModalCallback?.(() => () => {
-              console.log('modalcallback !hasAccountAddress');
-              // setForcedPage?.('authenticate');
-              setModalOpen?.(true);
-            });
-
-          return 'rainbowkitConnect';
-        }
-        // console.log({ currentNetwork });
-        if (forceNetwork && currentNetwork?.networkName !== forceNetwork) {
-          // switchNetworkNew?.(forceNetwork);
-          // return null;
-          console.log({ currentNetwork, forceNetwork });
-          if (!isModalOpen) setModalOpen?.(true);
-          console.log('return switchnetwork');
-          return 'switchNetwork';
-        }
-      }
-
-      // * connected with wallet but not logged in to masa
-      if (!isLoggedIn && signer && !hasAccountAddress) {
-        if (!openConnectModal) {
-          return 'authenticate';
-        }
+    }
+    // * rainbowkit logic
+    if (forcedPage) return forcedPage;
 
+    if (verbose) {
+      console.log('');
+    }
+    if (isConnected) {
+      // * user does not have a wallet
+      if (!hasAccountAddress) {
         setModalOpen?.(false);
         openConnectModal?.();
+        console.log('user does not have wallet but is connected', {
+          openConnectModal,
+          hasAccountAddress,
+          hasWalletAddress,
+        });
 
         setRainbowkKitModalCallback?.(() => () => {
-            // setForcedPage?.('authenticate');
-            setModalOpen?.(true);
-          });
-
-        return 'authenticate';
-      }
+          console.log('modalcallback !hasAccountAddress');
+          // setForcedPage?.('authenticate');
+          setModalOpen?.(true);
+        });
 
-      if (
-        isLoggedIn &&
-        (!soulnames || (soulnames && soulnames.length === 0)) &&
-        scope?.includes('soulname')
-      ) {
-        // setForcedPage?.('createSoulname');
-        return 'createSoulname';
+        return 'rainbowkitConnect';
       }
-
-      if (
-        scope?.includes('identity') &&
-        isLoggedIn &&
-        (!identity || !identity?.identityId)
-      ) {
-        // setForcedPage?.('createIdentity');
-        return 'createIdentity';
+      // console.log({ currentNetwork });
+      if (forceNetwork && currentNetwork?.networkName !== forceNetwork) {
+        // switchNetworkNew?.(forceNetwork);
+        // return null;
+        console.log({ currentNetwork, forceNetwork });
+        if (!isModalOpen) setModalOpen?.(true);
+        console.log('return switchnetwork');
+        return 'switchNetwork';
       }
+    }
 
-      if (
-        identity &&
-        !creditScores?.length &&
-        scope?.includes('credit-score')
-      ) {
-        // setForcedPage?.('createCreditScore');
-        return 'createCreditScore';
+    // * connected with wallet but not logged in to masa
+    if (!isLoggedIn && signer && !hasAccountAddress) {
+      if (!openConnectModal) {
+        return 'authenticate';
       }
 
-      if (hasAccountAddress && isLoggedIn) return 'connectedState';
-      // return 'authenticate';
-
+      setModalOpen?.(false);
       openConnectModal?.();
+
       setRainbowkKitModalCallback?.(() => () => {
-          // setForcedPage?.('authenticate');
-          setModalOpen?.(true);
-        });
+        // setForcedPage?.('authenticate');
+        setModalOpen?.(true);
+      });
 
-      if (hasAccountAddress) {
-        return 'authenticate';
-      }
-      return 'rainbowkitConnect';
-
+      return 'authenticate';
+    }
+
+    if (
+      isLoggedIn &&
+      (!soulnames || (soulnames && soulnames.length === 0)) &&
+      scope?.includes('soulname')
+    ) {
+      // setForcedPage?.('createSoulname');
+      return 'createSoulname';
+    }
+
+    if (
+      scope?.includes('identity') &&
+      isLoggedIn &&
+      (!identity || !identity?.identityId)
+    ) {
+      // setForcedPage?.('createIdentity');
+      return 'createIdentity';
+    }
+
+    if (identity && !creditScores?.length && scope?.includes('credit-score')) {
+      // setForcedPage?.('createCreditScore');
+      return 'createCreditScore';
+    }
+
+    if (hasAccountAddress && isLoggedIn) return 'connectedState';
+    // return 'authenticate';
+
+    openConnectModal?.();
+    setRainbowkKitModalCallback?.(() => () => {
+      // setForcedPage?.('authenticate');
+      setModalOpen?.(true);
+    });
+
+    if (hasAccountAddress) {
+      return 'authenticate';
+    }
+    return 'rainbowkitConnect';
   }, [
     hasWalletAddress,
     verbose,
@@ -246,21 +241,24 @@ export const MasaInterface = ({
     signer,
   ]);
 
-  const isModal = useMemo(() => ['createIdentity', 'successIdentityCreate'].includes(String(page)), [page]);
+  const isModal = useMemo(
+    () => ['createIdentity', 'successIdentityCreate'].includes(String(page)),
+    [page]
+  );
 
   return (
     <ModalComponent
-        open={isModalOpen as boolean}
-        close={(): void => closeModal?.()}
-        setOpen={setModalOpen as (val: boolean) => void}
-        height={isModal ? 340 : undefined}
-      >
-        <PageSwitcher
-          page={page }
-          useRainbowKit={useRainbowKit}
-          disableMetamask={disableMetamask}
-        />
-      </ModalComponent>
+      open={isModalOpen as boolean}
+      close={(): void => closeModal?.()}
+      setOpen={setModalOpen as (val: boolean) => void}
+      height={isModal ? 340 : undefined}
+    >
+      <PageSwitcher
+        page={page}
+        useRainbowKit={useRainbowKit}
+        disableMetamask={disableMetamask}
+      />
+    </ModalComponent>
   );
 };
 
@@ -277,8 +275,7 @@ const PageSwitcher = ({
     return page === 'connector'
       ? pages[page]({ disableMetamask })
       : pages[page];
-  } 
-    if (page === 'rainbowkitConnect') return null;
-    return page ? pages[page] : null;
-
+  }
+  if (page === 'rainbowkitConnect') return null;
+  return page ? pages[page] : null;
 };
diff --git a/src/components/masa-interface/pages/authenticate/authenticate.tsx b/src/components/masa-interface/pages/authenticate/authenticate.tsx
@@ -52,10 +52,14 @@ export const InterfaceAuthenticate = (): JSX.Element => {
     }
   }, [company]);
 
-  const shortAddress = useMemo(() => `${accountAddress?.slice(0, 2)}...${accountAddress?.substring(
-      accountAddress.length - 4,
-      accountAddress.length
-    )}`, [accountAddress]);
+  const shortAddress = useMemo(
+    () =>
+      `${accountAddress?.slice(0, 2)}...${accountAddress?.substring(
+        accountAddress.length - 4,
+        accountAddress.length
+      )}`,
+    [accountAddress]
+  );
 
   const handleClipboard = useCallback(() => {
     if (accountAddress) {
@@ -95,10 +99,7 @@ export const InterfaceAuthenticate = (): JSX.Element => {
               Want to use a different wallet?
               {!isLoggedIn && isConnected && (
                 <span className="connected-wallet">
-                  <span
-                    className="authenticate-button"
-                    onClick={switchWallet}
-                  >
+                  <span className="authenticate-button" onClick={switchWallet}>
                     Switch Wallet
                   </span>
                 </span>

diff --git a/src/components/masa-interface/pages/gallery/add-sbt.tsx b/src/components/masa-interface/pages/gallery/add-sbt.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import { useLocalStorage } from '../../../../provider';
-import { Input } from "../../../input";
-import Toggle from "../../../toggle/toggle";
+import { Input } from '../../../input';
+import Toggle from '../../../toggle/toggle';
 
 export const AddSBT = ({ back }) => {
   const { localStorageSet } = useLocalStorage();

diff --git a/src/components/masa-interface/pages/gallery/gallery.stories.tsx b/src/components/masa-interface/pages/gallery/gallery.stories.tsx
@@ -9,7 +9,7 @@ const customRenderWhaleSBT: CustomGallerySBT = {
   name: 'Solid World Whale SBT',
   address: '0xd843fB69473F77fF45502e1EB8733B6DD7feC98F',
   network: 'polygon',
-  async getMetadata (sbt: { tokenId: string; tokenUri: string }) {
+  async getMetadata(sbt: { tokenId: string; tokenUri: string }) {
     const apiUrl = sbt.tokenUri.replace('.json', '');
 
     return {
@@ -24,7 +24,7 @@ const DackieSBT: CustomGallerySBT = {
   name: 'Dackies SBT',
   address: '0xbA444542E493Ed497D9Ef7f2ed596244a1952Ba2',
   network: 'polygon',
-  async getMetadata (sbt: { tokenId: string; tokenUri: string }) {
+  async getMetadata(sbt: { tokenId: string; tokenUri: string }) {
     return {
       name: 'Dackie quack SBT',
       image: sbt.tokenUri,
@@ -37,7 +37,7 @@ const AmbassadorOGSBT: CustomGallerySBT = {
   name: 'Masa Ambassador OG SBT',
   address: '0x376f5039Df4e9E9c864185d8FaBad4f04A7E394A',
   network: 'polygon',
-  async getMetadata (sbt: { tokenId: string; tokenUri: string }) {
+  async getMetadata(sbt: { tokenId: string; tokenUri: string }) {
     return {
       name: 'Masa Ambassador OG SBT',
       image: sbt.tokenUri,
@@ -50,7 +50,7 @@ const AmbassadorSBT: CustomGallerySBT = {
   name: 'Masa Ambassador SBT',
   address: '0x3F1EFED96Eb7f98F0618136133D795F5997ECEf4',
   network: 'polygon',
-  async getMetadata (sbt: { tokenId: string; tokenUri: string }) {
+  async getMetadata(sbt: { tokenId: string; tokenUri: string }) {
     return {
       name: 'Masa Ambassador SBT',
       image: sbt.tokenUri,
@@ -63,7 +63,7 @@ const GoodDollarSBT: CustomGallerySBT = {
   name: 'Good Dollar SBT',
   address: '0x3F1EFED96Eb7f98F0618136133D795F5997ECEf4',
   network: 'celo',
-  async getMetadata (sbt: { tokenId: string; tokenUri: string }) {
+  async getMetadata(sbt: { tokenId: string; tokenUri: string }) {
     return {
       name: 'Good Dollar SBT',
       image: sbt.tokenUri,
@@ -79,19 +79,19 @@ const meta: Meta = {
   decorators: [
     (Story) => (
       <MasaProvider
-          company="Masa"
-          customGallerySBT={[
-            DackieSBT,
-            customRenderWhaleSBT,
-            GoodDollarSBT,
-            AmbassadorSBT,
-            AmbassadorOGSBT,
-          ]}
-        >
-          <div className="masa-modal">
-            <Story />
-          </div>
-        </MasaProvider>
+        company="Masa"
+        customGallerySBT={[
+          DackieSBT,
+          customRenderWhaleSBT,
+          GoodDollarSBT,
+          AmbassadorSBT,
+          AmbassadorOGSBT,
+        ]}
+      >
+        <div className="masa-modal">
+          <Story />
+        </div>
+      </MasaProvider>
     ),
   ],
   parameters: {