avoid get network, use get chain id and lookup our own data

masa-finance · Mar 2, 2023 · 1ec721c · 1ec721c
1 parent e718383
commit 1ec721c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/provider/masa-context-provider.tsx b/src/provider/masa-context-provider.tsx
@@ -66,7 +66,7 @@ export const MasaContextProvider = ({
     useSession(masaInstance, walletAddress);
 
   // network
-  const { switchNetwork, network } = useNetwork(provider);
+  const { switchNetwork, currentNetwork } = useNetwork(provider);
 
   // identity
   const {
@@ -120,7 +120,7 @@ export const MasaContextProvider = ({
     masaInstance,
     isLoggedIn,
     isConnected,
-    network,
+    currentNetwork,
     areScopesFullfiled
   );
 
@@ -180,7 +180,7 @@ export const MasaContextProvider = ({
     arweaveConfig,
     environmentName,
     verbose,
-    network,
+    currentNetwork,
   ]);
 
   const context: MasaShape = {
@@ -246,7 +246,7 @@ export const MasaContextProvider = ({
     reloadGreens,
 
     // network
-    network,
+    currentNetwork,
     SupportedNetworks,
     switchNetwork,
   };

diff --git a/src/provider/masa-shape.ts b/src/provider/masa-shape.ts
@@ -100,7 +100,7 @@ export interface MasaShape {
   reloadGreens?: () => void;
 
   // network
-  network?: ethers.providers.Network;
+  currentNetwork?: Network;
   SupportedNetworks?: Partial<{ [index in NetworkName]: Network }>;
   switchNetwork?: (chainId: number) => void;
 }
diff --git a/src/provider/modules/modal/modal.ts b/src/provider/modules/modal/modal.ts
@@ -1,12 +1,12 @@
 import { useCallback, useState } from 'react';
-import { providers } from 'ethers';
 import { Masa } from '@masa-finance/masa-sdk';
+import { Network } from '../../../helpers';
 
 export const useModal = (
   masa?: Masa,
   isLoggedIn?: boolean,
   isConnected?: boolean,
-  network?: providers.Network,
+  network?: Network,
   areScopesFullfiled?: boolean
 ): {
   isModalOpen: boolean;
@@ -32,7 +32,7 @@ export const useModal = (
         isLoggedIn &&
         isConnected &&
         (masa?.config.network
-          ? network?.name.includes(masa.config.network)
+          ? network?.networkName.includes(masa.config.network)
           : true)
       ) {
         modalCallback();

diff --git a/src/provider/modules/network/network.ts b/src/provider/modules/network/network.ts
@@ -1,4 +1,4 @@
-import { providers, Signer, utils, Wallet } from 'ethers';
+import { Signer, utils, Wallet } from 'ethers';
 import { useCallback, useEffect, useState } from 'react';
 import { Network, SupportedNetworks } from '../../../helpers';
 
@@ -7,9 +7,9 @@ export const useNetwork = (
 ): {
   addNetwork: (networkDetails: Network) => void;
   switchNetwork: (chainId: number) => void;
-  network?: providers.Network;
+  currentNetwork?: Network;
 } => {
-  const [network, setNetwork] = useState<providers.Network | undefined>();
+  const [currentNetwork, setCurrentNetwork] = useState<Network | undefined>();
 
   const addNetwork = useCallback(async (networkDetails: Network) => {
     try {
@@ -34,8 +34,8 @@ export const useNetwork = (
   const loadNetwork = useCallback(async (): Promise<void> => {
     if (!provider) return;
 
-    const newNetwork = await provider.provider?.getNetwork();
-    setNetwork(newNetwork ?? undefined);
+    const chainId = await provider.getChainId();
+    setCurrentNetwork(SupportedNetworks[chainId]);
   }, [provider]);
 
   const switchNetwork = useCallback(
@@ -67,6 +67,6 @@ export const useNetwork = (
   return {
     addNetwork,
     switchNetwork,
-    network,
+    currentNetwork,
   };
 };