feat: integrate refactor into old masa

masa-finance · Jun 23, 2023 · fac54dd · fac54dd
1 parent eb21f03
commit fac54dd
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 27 deletions.
diff --git a/src/components/masa-interface/masa-interface.tsx b/src/components/masa-interface/masa-interface.tsx
@@ -156,7 +156,7 @@ export const MasaInterface = ({
 
           return 'rainbowkitConnect';
         }
-
+        // console.log({ currentNetwork });
         if (forceNetwork && currentNetwork?.networkName !== forceNetwork) {
           // switchNetworkNew?.(forceNetwork);
           // return null;

diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -18,7 +18,7 @@ import {
   // useGreen,
   // useIdentity,
   useModal,
-  useNetwork,
+  // useNetwork,
   // useSession,
   // useSoulnames,
   // useWallet,
@@ -57,8 +57,8 @@ export interface ArweaveConfig {
 export type EnvironmentNameEx = EnvironmentName & ('local' | 'stage');
 
 export interface MasaContextProviderProps extends MasaShape {
-  // environmentName?: EnvironmentNameEx;
-  // arweaveConfig?: ArweaveConfig;
+  environmentName?: EnvironmentNameEx; // eslint-disable-line react/no-unused-prop-types
+  arweaveConfig?: ArweaveConfig; // eslint-disable-line react/no-unused-prop-types
   customGallerySBT?: CustomGallerySBT[];
   fullScreenGallery?: boolean;
   // apiUrl?: string;
@@ -138,14 +138,16 @@ export const MasaContextProvider = ({
     useSessionNew();
 
   // network <-- used for metamask interation
-  const { currentNetwork, switchNetwork } = useNetwork({
-    provider: signer,
-    useRainbowKitWalletConnect,
-  });
+  // const { currentNetwork, switchNetwork } = useNetwork({
+  //   provider: signer,
+  //   useRainbowKitWalletConnect,
+  // });
   const {
-    currentNetwork: currentNetworkNew,
+    currentNetwork,
+    currentNetworkNew,
     // switchNetworkByName: switchNetwork,
     switchNetworkByName: switchNetworkNew,
+    switchNetworkByName: switchNetwork,
     canProgramaticallySwitchNetwork,
   } = useNetworkNew();
   // const {

diff --git a/src/provider/masa-provider.tsx b/src/provider/masa-provider.tsx
@@ -21,24 +21,49 @@ export const MasaProvider = ({
   chainsToUse?: Array<keyof MasaNetworks>;
   walletsToUse?: ('metamask' | 'valora' | 'walletconnect')[];
   rainbowKitModalSize?: 'compact' | 'wide';
-}): JSX.Element => (
-  <QueryClientProvider contextSharing client={queryClient}>
-    {/* //   <ConfiguredRainbowKitProvider
+}): JSX.Element => {
+  const {
+    forceNetwork,
+    // arweaveConfig,
+    // environmentName
+  } = args;
+  return (
+    <QueryClientProvider contextSharing client={queryClient}>
+      {/* //   <ConfiguredRainbowKitProvider
   //     chainsToUse={chainsToUse}
   //     walletsToUse={walletsToUse}
   //     rainbowKitModalSize={rainbowKitModalSize}
   //   > */}
-    <MasaRefactorProvider
-      config={{
-        masaConfig: {},
-      }}
-    >
-      <MasaContextProvider {...args}>
-        <div id="modal-mount" />
-        <MasaInterface disableMetamask={args.useRainbowKitWalletConnect} />
-        {children}
-      </MasaContextProvider>
-    </MasaRefactorProvider>
-  </QueryClientProvider>
-  //   </ConfiguredRainbowKitProvider>
-);
+      <MasaRefactorProvider
+        config={{
+          allowedWallets: ['metamask', 'valora', 'walletconnect'],
+          forceChain: forceNetwork,
+          allowedNetworkNames: [
+            'goerli',
+            'ethereum',
+            'alfajores',
+            'celo',
+            'mumbai',
+            'polygon',
+            'bsctest',
+            'bsc',
+            'basegoerli',
+            'unknown',
+          ],
+          masaConfig: {
+            networkName: 'ethereum',
+            // arweave: arweaveConfig,
+            // environment: environmentName,
+          },
+        }}
+      >
+        <MasaContextProvider {...args}>
+          <div id="modal-mount" />
+          <MasaInterface disableMetamask={args.useRainbowKitWalletConnect} />
+          {children}
+        </MasaContextProvider>
+      </MasaRefactorProvider>
+    </QueryClientProvider>
+    //   </ConfiguredRainbowKitProvider>
+  );
+};
diff --git a/src/refactor/wallet-client/network/use-network.ts b/src/refactor/wallet-client/network/use-network.ts
@@ -55,6 +55,10 @@ export const useNetwork = () => {
 
   const activeChainId = useMemo(() => activeChain?.id, [activeChain]);
   const activeNetwork = useMemo(() => activeChain?.network, [activeChain]);
+  const currentNetwork = useMemo(
+    () => SupportedNetworks[activeChain?.network as NetworkName],
+    [activeChain?.network]
+  );
 
   const stopSwitching = useCallback(() => {
     setSwitchingToChain(null);
@@ -109,6 +113,7 @@ export const useNetwork = () => {
     isActiveChainUnsupported,
 
     // * old
-    currentNetwork: network,
+    currentNetwork,
+    currentNetworkNew: network,
   };
 };