feat: correct error handling and logging

masa-finance · Aug 4, 2023 · 1e77259 · 1e77259
1 parent 10490e5
commit 1e77259
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx
@@ -60,7 +60,7 @@ export const MasaInterface = ({
 }): JSX.Element => {
   useMetamask({ disabled: disableMetamask });
   const { isConnected } = useAccount();
-  console.log({ hideLegacyModal });
+
   const {
     isModalOpen,
     setModalOpen,
@@ -87,6 +87,8 @@ export const MasaInterface = ({
   } = useMasa();
 
   const page = useMemo(() => {
+    if (hideLegacyModal) return '';
+
     if (verbose) {
       console.log('INTERFACE', {
         hasWalletAddress,
@@ -275,6 +277,7 @@ export const MasaInterface = ({
   );
 
   if (hideLegacyModal) return <div />;
+
   return (
     <ModalComponent
       open={isModalOpen as boolean}

diff --git a/src/provider/masa-provider.tsx b/src/provider/masa-provider.tsx
@@ -69,7 +69,12 @@ export const MasaProvider = ({
         >
           <MasaContextProvider {...args}>
             <div id="modal-mount" />
-            <MasaInterface hideLegacyModal={args.hideLegacyModal} disableMetamask={args.useRainbowKitWalletConnect} />
+            {!args.hideLegacyModal && (
+              <MasaInterface
+                hideLegacyModal={args.hideLegacyModal}
+                disableMetamask={args.useRainbowKitWalletConnect}
+              />
+            )}
             {children}
           </MasaContextProvider>
         </MasaRefactorProvider>

diff --git a/src/refactor/masa-client/use-masa-client.ts b/src/refactor/masa-client/use-masa-client.ts
@@ -13,7 +13,7 @@ export const useMasaClient = () => {
   const { activeChainId, currentNetwork } = useNetwork();
 
   const networkName = getMasaNetworkName(currentNetwork?.networkName);
-
+  // console.log({ contractAddressOverrides });
   const masa = useMasaSDK(
     {
       address,

diff --git a/src/refactor/masa-client/use-masa-sdk.ts b/src/refactor/masa-client/use-masa-sdk.ts
@@ -76,6 +76,8 @@ export const useMasaSDK = (
         signer
       );
       contractOverrides.SoulNameContract.hasAddress = true;
+
+      console.log('END OF OVERRIDES', { contractOverrides });
     }
     if (verbose) {
       signer

diff --git a/src/refactor/masanew.stories.tsx b/src/refactor/masanew.stories.tsx
@@ -495,6 +495,7 @@ const ModalFlow = () => {
     onRegisterFinish: () => console.log('FINISH FROM OUTSIDE ?????'),
     onMintSuccess: () => console.log('MINT SUCCESS FROM OUTSIDE'),
     onMintError: () => console.log('MINT ERROR FROM OUTSIDE'),
+    onError: () => console.log('CREATE SOULNAME ERROR'),
   });
 
   const onClickSoulname = useCallback(() => {
@@ -503,6 +504,7 @@ const ModalFlow = () => {
       onMintError: () => console.log('MINT ERROR FROM OUTSIDE'),
       onRegisterFinish: () => console.log('REGISTER SOULNAME FINISHED OUTSIDE'),
       onSuccess: () => console.log('EVERYTHING WAS SUCCESSFUL'),
+      onError: () => console.log('CREATE SOULNAME ERROR'),
       closeOnSuccess: true,
     });
   }, []);

diff --git a/src/refactor/ui/components/modals/create-soulname/use-register-soulname.ts b/src/refactor/ui/components/modals/create-soulname/use-register-soulname.ts
@@ -58,12 +58,10 @@ export const useRegisterSoulname = ({
           soulNameStyle
         );
 
-        console.log({ type: typeof result, isError: result instanceof Error });
-
         if (result instanceof Error) {
-          // onMintError?.();
           throw result;
         }
+
         if (result) {
           onMintSuccess?.();
         }
@@ -87,12 +85,14 @@ export const useRegisterSoulname = ({
         soulNameStyle
       );
 
+      if (result instanceof Error) {
+        throw result;
+      }
+
       if (result) {
         onMintSuccess?.();
       }
 
-      if (!result) onMintError?.();
-
       onRegisterFinish?.();
 
       return result;
@@ -111,7 +111,7 @@ export const useRegisterSoulname = ({
       console.log('ERROR registerSoulname catch2', error);
       onMintError?.();
 
-      return error as Error;
+      throw error as Error;
       // return {
       //   title: '',
       //   subtitle,

diff --git a/stories/masa.stories.tsx b/stories/masa.stories.tsx
@@ -245,7 +245,6 @@ const TemplateWithRainbowKit: Story = (props: Args) => {
         company="Masa"
         walletsToUse={['metamask', 'walletconnect', 'valora']}
         useRainbowKitWalletConnect
-        hideLegacyModal
         rainbowKitModalSize={'wide'}
         contractAddressOverrides={{
           SoulNameAddress: '0x9C78Bf97A6abf185C8878C13F1Fd5976C41dDCfa',