Merge pull request #53 from oasisprotocol/ml/request-accounts-after-s…

…witching-network Auto request accounts after switching network
oasisprotocol · Mar 20, 2024 · 7b995bf · 7b995bf
2 parents f0bfd1c + 3362397
commit 7b995bf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/frontend/src/components/ConnectWallet/index.tsx b/frontend/src/components/ConnectWallet/index.tsx
@@ -40,28 +40,29 @@ export const ConnectWallet: FC<Props> = ({ mobileSticky }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  const handleSwitchNetwork = async () => {
+  const handleConnectWallet = async () => {
     setIsLoading(true)
     try {
-      await switchNetwork()
-      setIsUnknownNetwork(false)
+      await connectWallet()
     } catch (ex) {
-      setAppError(ex as Error)
+      if (ex instanceof UnknownNetworkError) {
+        setIsUnknownNetwork(true)
+      } else {
+        setAppError(ex as Error)
+      }
     } finally {
       setIsLoading(false)
     }
   }
 
-  const handleConnectWallet = async () => {
+  const handleSwitchNetwork = async () => {
     setIsLoading(true)
     try {
-      await connectWallet()
+      await switchNetwork()
+      setIsUnknownNetwork(false)
+      handleConnectWallet()
     } catch (ex) {
-      if (ex instanceof UnknownNetworkError) {
-        setIsUnknownNetwork(true)
-      } else {
-        setAppError(ex as Error)
-      }
+      setAppError(ex as Error)
     } finally {
       setIsLoading(false)
     }

diff --git a/frontend/src/providers/Web3Provider.tsx b/frontend/src/providers/Web3Provider.tsx
@@ -110,8 +110,11 @@ export const Web3ContextProvider: FC<PropsWithChildren> = ({ children }) => {
 
   const _chainChanged = useCallback(() => {
     // TODO: Integrate seamlessly, so that page reload is not needed
-    window.location.reload()
-  }, [])
+
+    if (state.isConnected) {
+      window.location.reload()
+    }
+  }, [state.isConnected])
 
   const _connect = useCallback(() => _connectionChanged(true), [])
   const _disconnect = useCallback(() => _connectionChanged(false), [])