fix token prompt + network switching

algorandfoundation · Jan 29, 2025 · 81f3f1f · 81f3f1f
1 parent ad95764
commit 81f3f1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/features/common/components/platform-provider.tsx b/src/features/common/components/platform-provider.tsx
@@ -30,7 +30,7 @@ export function PlatformProvider({ children }: PropsWithChildren) {
   // The DataProvider key prop is super important it governs if the provider is reinitialized
   const dataProvider = shouldPromptForTokens ? (
     <DataProvider key={`${key}-tokenprompt`} networkConfig={networkConfig}>
-      {children}
+      <WalletProvider networkConfig={networkConfig}>{children}</WalletProvider>
     </DataProvider>
   ) : (
     <DataProvider key={key} networkConfig={networkConfig}>

diff --git a/src/features/network/components/network-select.tsx b/src/features/network/components/network-select.tsx
@@ -17,13 +17,13 @@ export function NetworkSelect({ showLabel = true }: NetworkSelectProps) {
   const location = useLocation()
 
   const handleNetworkChange = useCallback(
-    (newNetworkId: string) => {
+    async (newNetworkId: string) => {
       const currentPath = location.pathname
-      setSelectedNetwork(newNetworkId)
       if (currentNetworkId) {
         const newUrl = currentPath.replace(currentNetworkId, newNetworkId)
         navigate(newUrl)
       }
+      await setSelectedNetwork(newNetworkId)
     },
     [currentNetworkId, location.pathname, navigate, setSelectedNetwork]
   )

diff --git a/src/features/network/data/index.ts b/src/features/network/data/index.ts
@@ -330,7 +330,7 @@ export const useSetSelectedNetwork = () => {
 
   return useCallback(
     async (selectedNetwork: string) => {
-      disconnectAllWallets()
+      await disconnectAllWallets()
       setStorageNetwork(selectedNetwork)
       // Refresh selected network atom value
       settingsStore.set(selectedNetworkAtomId)