feat: prevent old modal open callback from firing

masa-finance · Aug 4, 2023 · 14bea8a · 14bea8a
1 parent 0a5a624
commit 14bea8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 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,
@@ -274,9 +274,8 @@ export const MasaInterface = ({
     [page]
   );
 
-  return hideLegacyModal ? (
-    <></>
-  ) : (
+  if (hideLegacyModal) return <div />;
+  return (
     <ModalComponent
       open={isModalOpen as boolean}
       close={(): void => closeModal?.()}

diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -267,6 +267,7 @@ export const MasaContextProvider = ({
 
   const connect = useCallback(
     (options?: { scope?: string[]; callback?: () => void }) => {
+      if (hideLegacyModal) return;
       if (verbose) {
         console.info({ forcedPage, useRainbowKitWalletConnect, options });
       }
@@ -306,6 +307,7 @@ export const MasaContextProvider = ({
       openConnectModal,
       verbose,
       useRainbowKitWalletConnect,
+      hideLegacyModal,
       // openAuthenticateModal,
       // openConnectedModal,
       // wagmiSigner,

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