Reconnect WC v2

safe-global · Aug 1, 2023 · 0f17711 · 0f17711
1 parent 063194c
commit 0f17711
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/utils/__tests__/wallet.test.ts b/src/utils/__tests__/wallet.test.ts
@@ -35,15 +35,23 @@ describe('utils/wallet', () => {
     expect(result).toBe(true)
   })
 
-  it('should check if WalletConnect is unlocked', async () => {
+  it('should check if WalletConnect v1 is unlocked', async () => {
     window.localStorage.setItem('walletconnect', 'true')
 
     expect(await isWalletUnlocked(WalletNames.WALLET_CONNECT)).toBe(true)
-    expect(await isWalletUnlocked(WalletNames.WALLET_CONNECT_V2)).toBe(true)
 
     window.localStorage.removeItem('walletconnect')
 
     expect(await isWalletUnlocked(WalletNames.WALLET_CONNECT)).toBe(false)
+  })
+
+  it('should check if WalletConnect v2 is unlocked', async () => {
+    window.localStorage.setItem('wc@2:client:0.3//session', '[{"topic":"123"}]')
+
+    expect(await isWalletUnlocked(WalletNames.WALLET_CONNECT_V2)).toBe(true)
+
+    window.localStorage.removeItem('wc@2:client:0.3//session')
+
     expect(await isWalletUnlocked(WalletNames.WALLET_CONNECT_V2)).toBe(false)
   })
 

diff --git a/src/utils/wallets.ts b/src/utils/wallets.ts
@@ -37,8 +37,14 @@ export const isWalletUnlocked = async (walletName: string): Promise<boolean> =>
     return (await window.ethereum?._metamask?.isUnlocked?.()) || false
   }
 
-  // Wallet connect creates a localStorage entry when connected and removes it when disconnected
-  if (walletName === WalletNames.WALLET_CONNECT || walletName === WalletNames.WALLET_CONNECT_V2) {
+  // WalletConnect v2
+  if (walletName === WalletNames.WALLET_CONNECT_V2) {
+    const wcSession = window.localStorage.getItem('wc@2:client:0.3//session')
+    return !!wcSession && wcSession !== '[]'
+  }
+
+  // WalletConnect v1 creates a localStorage entry when connected and removes it when disconnected
+  if (walletName === WalletNames.WALLET_CONNECT) {
     return window.localStorage.getItem('walletconnect') !== null
   }