fix(unlock-app): use eip1193 when recreating wallet provider for wall…

…et connect (#14068)

* use eip1193 to init provider on wallet connect

* clarify provider flow

unlock-app/src/hooks/useProvider.ts

@@ -34,6 +34,7 @@ export const useProvider = (config: any) => {
     getCurrentNetwork() || 1
   )
   const [connected, setConnected] = useState<string | undefined>()
+  const [eip1193, setEip1193] = useState<any | undefined>()
   const { setStorage, clearStorage, getStorage } = useAppStorage()
   const { addNetworkToWallet } = useAddToNetwork(connected)
   const { session: account, refetchSession } = useSession()
@@ -79,24 +80,28 @@ export const useProvider = (config: any) => {
 
   const getNetworkProvider = async (networkId?: number) => {
     const currentNetworkId = Number(network)
-    let pr = provider
+    let existingBrowserProvider = provider
     // If the user is not connected, we open the connect modal
     if (!connected) {
       const response = await openConnectModalAsync()
       await closeConnectModal()
-      pr = response?.provider
+      existingBrowserProvider = response?.provider
     }
-    let walletServiceProvider: ethers.BrowserProvider = pr
+    let walletServiceProvider: ethers.BrowserProvider = existingBrowserProvider
     if (networkId && networkId !== currentNetworkId) {
       const networkConfig = config.networks[networkId]
-      if (pr.isUnlock) {
+      if (existingBrowserProvider.isUnlock) {
         walletServiceProvider = (await UnlockProvider.reconnect(
-          pr,
+          existingBrowserProvider,
           networkConfig
         )) as unknown as ethers.BrowserProvider
       } else {
         await switchBrowserProviderNetwork(networkId)
-        walletServiceProvider = new ethers.BrowserProvider(window.ethereum!)
+        if (getStorage('provider') === 'WALLET_CONNECT') {
+          walletServiceProvider = new ethers.BrowserProvider(eip1193)
+        } else {
+          walletServiceProvider = new ethers.BrowserProvider(window.ethereum!)
+        }
       }
     }
     return walletServiceProvider
@@ -159,33 +164,34 @@ export const useProvider = (config: any) => {
     }
   }
 
-  const connectProvider = async (provider: any) => {
+  const connectProvider = async (eip1193Provider: any) => {
     setLoading(true)
+    setEip1193(eip1193Provider)
     let auth
-    if (provider instanceof ethers.AbstractProvider) {
-      auth = await resetProvider(provider)
+    if (eip1193Provider instanceof ethers.AbstractProvider) {
+      auth = await resetProvider(eip1193Provider)
     } else {
-      if (provider.enable) {
+      if (eip1193Provider.enable) {
         try {
-          await provider.enable()
+          await eip1193Provider.enable()
         } catch {
           console.error('Please check your wallet and try again to connect.')
           setLoading(false)
           return
         }
       }
-      const ethersProvider = new ethers.BrowserProvider(provider)
 
-      if (provider.on) {
-        provider.on('accountsChanged', async () => {
-          await resetProvider(new ethers.BrowserProvider(provider))
+      if (eip1193Provider.on) {
+        eip1193Provider.on('accountsChanged', async () => {
+          await resetProvider(new ethers.BrowserProvider(eip1193Provider))
         })
 
-        provider.on('chainChanged', async () => {
-          await resetProvider(new ethers.BrowserProvider(window.ethereum!))
+        eip1193Provider.on('chainChanged', async () => {
+          await resetProvider(new ethers.BrowserProvider(eip1193Provider))
         })
       }
-      auth = await resetProvider(ethersProvider)
+
+      auth = await resetProvider(new ethers.BrowserProvider(eip1193Provider))
     }
 
     setLoading(false)