fix: initial chain

Scaffold-Stark · Oct 9, 2024 · c5af2c0 · c5af2c0
1 parent ad59b41
commit c5af2c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/nextjs/components/ScaffoldAppWithProviders.tsx b/packages/nextjs/components/ScaffoldAppWithProviders.tsx
@@ -64,6 +64,7 @@ export const ScaffoldAppWithProviders = ({ children }: { children: React.ReactNo
         if (lastSelectedChain == ChainType.Ethereum) {
           if (lastEVMChain) {
             setTargetNetwork(lastEVMChain);
+            setLastEVMChain(lastEVMChain);
           }
         }
         setCurrentChain(lastSelectedChain);
@@ -78,6 +79,7 @@ export const ScaffoldAppWithProviders = ({ children }: { children: React.ReactNo
           <RainbowKitProvider
             avatar={BlockieAvatar}
             theme={mounted ? (isDarkMode ? darkTheme() : lightTheme()) : lightTheme()}
+            initialChain={lastEVMChain ? lastEVMChain.id : undefined}
           >
             <ScaffoldCrossChainApp>{children}</ScaffoldCrossChainApp>
           </RainbowKitProvider>

diff --git a/packages/nextjs/components/Wallet/SelectNetworkModal.tsx b/packages/nextjs/components/Wallet/SelectNetworkModal.tsx
@@ -31,8 +31,8 @@ export default function SelectNetWorkModal() {
     isError: isSwitchingError,
     isSuccess: isSwitchingSuccess,
   } = useSwitchChain();
-  const { isConnected } = useAccount();
-  const { currentChain } = useGlobalState(state => state);
+  const { isConnected: isEVMConnected } = useAccount();
+  const { currentChain, setLastEVMChain: setLastEVMChainGlobalState } = useGlobalState(state => state);
   const setCurrentChain = useGlobalState(state => state.setCurrentChain);
 
   const [open, setOpen] = useState<boolean>(false);
@@ -92,11 +92,12 @@ export default function SelectNetWorkModal() {
   const handleEthereumNetworkClick = (network: ChainWithAttributes) => {
     setEthActiveNetwork(network);
     setCurrentChain(ChainType.Ethereum);
-    if (isConnected) {
+    if (isEVMConnected) {
       switchChain?.({ chainId: network.id });
     }
     setTargetNetwork(network);
     setLastEVMChain(network);
+    setLastEVMChainGlobalState(network);
   };
 
   const handleStarknetClick = () => {

diff --git a/packages/nextjs/dynamic/services/store/global.ts b/packages/nextjs/dynamic/services/store/global.ts
@@ -1,3 +1,4 @@
+import { ChainWithAttributes } from "@scaffold-eth-2/utils/scaffold-eth";
 import { create } from "zustand";
 
 /**
@@ -11,10 +12,14 @@ import { create } from "zustand";
 
 export type GlobalState = {
   currentChain: string;
+  lastEVMChain: ChainWithAttributes | null;
   setCurrentChain: (newSelectedChain: string) => void;
+  setLastEVMChain: (newLastEVMChain: ChainWithAttributes) => void;
 };
 
 export const useGlobalState = create<GlobalState>((set: any) => ({
   currentChain: "",
+  lastEVMChain: null,
   setCurrentChain: (newSelectedChain: string): void => set(() => ({ currentChain: newSelectedChain })),
+  setLastEVMChain: (newLastEVMChain: ChainWithAttributes): void => set(() => ({ lastEVMChain: newLastEVMChain })),
 }));