refactor: encapsulate current wallet/chain state sync in InterchainStore

Author: 2wheeh

packages/store/__tests__/chain-wallet-store.test.ts

@@ -208,33 +208,6 @@ describe('ChainWalletStore', () => {
       );
     });
 
-    it('should set currentWalletName and currentChainName on successful connect', async () => {
-      const mockAccount: WalletAccount = {
-        address: 'cosmos1abc123',
-        pubkey: new Uint8Array([1, 2, 3]),
-        isNanoLedger: false,
-        algo: 'secp256k1' as Algo,
-      };
-
-      (mockWallet.connect as jest.Mock).mockResolvedValue(undefined);
-      (mockWallet.getAccount as jest.Mock).mockResolvedValue(mockAccount);
-
-      await chainWalletStore.connect();
-
-      expect(mockInterchainStore.setCurrentWalletName).toHaveBeenCalledWith('keplr');
-      expect(mockInterchainStore.setCurrentChainName).toHaveBeenCalledWith('cosmoshub');
-    });
-
-    it('should not set current values on connection error', async () => {
-      const error = new Error('Connection failed');
-      (mockWallet.connect as jest.Mock).mockRejectedValue(error);
-
-      await chainWalletStore.connect();
-
-      expect(mockInterchainStore.setCurrentWalletName).not.toHaveBeenCalled();
-      expect(mockInterchainStore.setCurrentChainName).not.toHaveBeenCalled();
-    });
-
     it('should handle connection errors', async () => {
       const error = new Error('Connection failed');
       (mockWallet.connect as jest.Mock).mockRejectedValue(error);
@@ -291,27 +264,6 @@ describe('ChainWalletStore', () => {
       );
     });
 
-    it('should reset currentWalletName and currentChainName on successful disconnect', async () => {
-      (mockWallet.disconnect as jest.Mock).mockResolvedValue(undefined);
-
-      await chainWalletStore.disconnect();
-
-      expect(mockInterchainStore.setCurrentWalletName).toHaveBeenCalledWith('');
-      expect(mockInterchainStore.setCurrentChainName).toHaveBeenCalledWith('');
-    });
-
-    it('should not reset current values on disconnection error', async () => {
-      const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
-      const error = new Error('Disconnection failed');
-      (mockWallet.disconnect as jest.Mock).mockRejectedValue(error);
-
-      await chainWalletStore.disconnect();
-
-      expect(mockInterchainStore.setCurrentWalletName).not.toHaveBeenCalled();
-      expect(mockInterchainStore.setCurrentChainName).not.toHaveBeenCalled();
-      consoleSpy.mockRestore();
-    });
-
     it('should handle disconnection errors', async () => {
       const consoleSpy = jest.spyOn(console, 'error').mockImplementation();
       const error = new Error('Disconnection failed');

packages/store/src/store/index.ts

@@ -78,6 +78,21 @@ export class InterchainStore {
     } else {
       this.addChainWalletState(walletName, chainName, state);
     }
+
+    switch (state.walletState) {
+      case WalletState.Connected:
+        this.setCurrentWalletName(walletName);
+        this.setCurrentChainName(chainName);
+        break;
+      case WalletState.Disconnected:
+        if (this.state.currentWalletName === walletName && this.state.currentChainName === chainName) {
+          // TODO: for supporting multiple wallet connections, 
+          // we should set these to the previous instead of clearing
+          this.setCurrentWalletName('');
+          this.setCurrentChainName('');
+        }
+        break;
+    }
   }
 
   // 添加新的 chain wallet state

packages/store/src/wallet-manager/chain-wallet-store.ts

@@ -56,8 +56,6 @@ export class ChainWalletStore extends BaseWallet {
       await this.wallet.connect(this.chain.chainId);
       const account = await this.getAccount();
       this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Connected, account });
-      this.store.setCurrentWalletName(this.wallet.info.name);
-      this.store.setCurrentChainName(this.chain.chainName);
     } catch (error) {
       this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Disconnected, errorMessage: (error as any).message });
     }
@@ -73,8 +71,6 @@ export class ChainWalletStore extends BaseWallet {
     try {
       await this.wallet.disconnect(this.chain.chainId);
       this.store.updateChainWalletState(this.wallet.info.name, this.chain.chainName, { walletState: WalletState.Disconnected, account: undefined, errorMessage: '' });
-      this.store.setCurrentWalletName('');
-      this.store.setCurrentChainName('');
     } catch (error) {
       console.error(error);
     }