fix issue with walletSelector calling wallet() when it isnt ready still

wpdas · Feb 9, 2024 · 0179f22 · 0179f22
1 parent bd5987b
commit 0179f22
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wpdas/naxios",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Promise based NEAR Contract and NEAR Wallet client for browser",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/managers/wallet-manager.ts b/src/managers/wallet-manager.ts
@@ -72,19 +72,21 @@ export class WalletManager {
 
   private async setupData() {
     // Initialize Wallet
-    const wallet = await this.walletSelector.wallet()
-    this.wallet = wallet
+    if (this.walletSelector) {
+      const wallet = await this.walletSelector.wallet()
+      this.wallet = wallet
 
-    const walletState = this.walletSelector.store.getState()
-    const accounts = walletState.accounts
-    this.accounts = accounts
+      const walletState = this.walletSelector.store.getState()
+      const accounts = walletState.accounts
+      this.accounts = accounts
 
-    // Set main account Id
-    this.accountId = accounts[0].accountId
+      // Set main account Id
+      this.accountId = accounts[0].accountId
 
-    // Others
-    this.recentlySignedInWallets = walletState.recentlySignedInWallets
-    this.selectedWalletId = walletState.selectedWalletId
+      // Others
+      this.recentlySignedInWallets = walletState.recentlySignedInWallets
+      this.selectedWalletId = walletState.selectedWalletId
+    }
   }
 
   /**