From a5f7dec26d2bf34c5f8c8b047d9c907d32920fdd Mon Sep 17 00:00:00 2001 From: Noah Saso Date: Sat, 23 Dec 2023 01:03:32 -0800 Subject: [PATCH] Don't treat non-existent wallets as if they were connected. --- packages/core/src/bases/state.ts | 4 +--- packages/core/src/repository.ts | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/src/bases/state.ts b/packages/core/src/bases/state.ts index 2feffa6fc..c97185211 100644 --- a/packages/core/src/bases/state.ts +++ b/packages/core/src/bases/state.ts @@ -90,9 +90,7 @@ export class StateBase { } get isWalletOnceConnect() { - return ( - this.isWalletConnected || this.isWalletNotExist || this.isWalletError - ); + return this.isWalletConnected || this.isWalletError; } get isWalletConnecting() { diff --git a/packages/core/src/repository.ts b/packages/core/src/repository.ts index f9a0922cd..3a388110a 100644 --- a/packages/core/src/repository.ts +++ b/packages/core/src/repository.ts @@ -97,7 +97,9 @@ export class WalletRepo extends StateBase { ); return void 0; } - return this.wallets.find((w) => !w.isWalletDisconnected); + return this.wallets.find( + (w) => !w.isWalletNotExist && !w.isWalletDisconnected + ); } getWallet = (walletName: WalletName): ChainWalletBase | undefined => {