refactor

masa-finance · Mar 2, 2023 · 3c590d7 · 3c590d7
1 parent 3c881eb
commit 3c590d7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -115,6 +115,7 @@ export const MasaContextProvider = ({
     closeModal,
     forcedPage,
     setForcedPage,
+    openMintSoulnameModal,
   } = useModal(
     masaInstance,
     isLoggedIn,
@@ -157,20 +158,6 @@ export const MasaContextProvider = ({
     [setModalOpen, setModalCallback, setScope, setForcedPage, forcedPage]
   );
 
-  const openMintSoulnameModal = useCallback(
-    (mintCallback?: () => void) => {
-      setForcedPage?.('createSoulname');
-      setModalOpen(true);
-      const cb = () => {
-        setForcedPage?.(null);
-        if (mintCallback) mintCallback();
-      };
-
-      setModalCallback(() => cb);
-    },
-    [setForcedPage, setModalOpen, setModalCallback]
-  );
-
   useEffect(() => {
     const loadMasa = async (): Promise<void> => {
       if (!provider) return;
@@ -221,6 +208,7 @@ export const MasaContextProvider = ({
     forcedPage,
     setForcedPage,
     openMintSoulnameModal,
+
     // wallet
     walletAddress,
     isWalletLoading,

diff --git a/src/provider/modules/modal/modal.ts b/src/provider/modules/modal/modal.ts
@@ -15,6 +15,7 @@ export const useModal = (
   setModalCallback: (callback: () => void) => void;
   forcedPage: string | null;
   setForcedPage?: (page: null | string) => void;
+  openMintSoulnameModal: (mintCallback?: () => void) => void;
 } => {
   const [isModalOpen, setModalOpen] = useState(false);
   const [modalCallback, setModalCallback] = useState<(() => void) | null>(null);
@@ -51,12 +52,27 @@ export const useModal = (
     ]
   );
 
+  const openMintSoulnameModal = useCallback(
+    (mintCallback?: () => void) => {
+      setForcedPage?.('createSoulname');
+      setModalOpen(true);
+      const cb = () => {
+        setForcedPage?.(null);
+        if (mintCallback) mintCallback();
+      };
+
+      setModalCallback(() => cb);
+    },
+    [setForcedPage, setModalOpen, setModalCallback]
+  );
+
   return {
     isModalOpen,
     closeModal,
     setModalOpen,
     setModalCallback,
     forcedPage,
     setForcedPage,
+    openMintSoulnameModal,
   };
 };
diff --git a/src/provider/use-metamask.ts b/src/provider/use-metamask.ts
@@ -37,8 +37,9 @@ export const useMetamask = ({
           console.error('No accounts returned from metamask');
         }
       } catch (error) {
-        if (error instanceof Error)
+        if (error instanceof Error) {
           console.error('Failed to connect to metamask!', error.message);
+        }
       }
 
       const signer = getWeb3Provider()?.getSigner();