@aptos-labs/wallet-adapter-core 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @aptos-labs/wallet-adapter-core
 
+## 2.3.0
+
+### Minor Changes
+
+- bb1595e: Fix deeplink redirect
+- 1605d28: Support ReadonlyArray of Wallets in AptosWalletAdapterProvider and WalletCore
+
 ## 2.2.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -122,7 +122,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     private _network;
     private _connecting;
     private _connected;
-    constructor(plugins: Wallet[]);
+    constructor(plugins: ReadonlyArray<Wallet>);
     private scopePollingDetectionStrategy;
     private doesWalletExist;
     private clearData;
@@ -131,7 +131,7 @@ declare class WalletCore extends EventEmitter<WalletCoreEvents> {
     setAccount(account: AccountInfo | null): void;
     setNetwork(network: NetworkInfo | null): void;
     isConnected(): boolean;
-    get wallets(): Wallet[];
+    get wallets(): ReadonlyArray<Wallet>;
     /**
      * Getter for the current connected wallet
      * @return wallet info

package/dist/index.js

@@ -340,9 +340,8 @@ var WalletCore = class extends import_eventemitter3.default {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
       );
-      if (!selectedWallet || selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+      if (!selectedWallet)
         return;
-      }
       if (this._connected) {
         if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
           return;
@@ -353,10 +352,11 @@ var WalletCore = class extends import_eventemitter3.default {
           const url = encodeURIComponent(window.location.href);
           const location = selectedWallet.deeplinkProvider({ url });
           window.location.href = location;
-        } else {
-          return;
         }
       }
+      if (selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+        return;
+      }
       this._connecting = true;
       this.setWallet(selectedWallet);
       const account = await selectedWallet.connect();

package/dist/index.mjs

@@ -299,9 +299,8 @@ var WalletCore = class extends EventEmitter {
       const selectedWallet = (_a = this._wallets) == null ? void 0 : _a.find(
         (wallet) => wallet.name === walletName
       );
-      if (!selectedWallet || selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+      if (!selectedWallet)
         return;
-      }
       if (this._connected) {
         if (((_b = this.wallet) == null ? void 0 : _b.name) === walletName)
           return;
@@ -312,10 +311,11 @@ var WalletCore = class extends EventEmitter {
           const url = encodeURIComponent(window.location.href);
           const location = selectedWallet.deeplinkProvider({ url });
           window.location.href = location;
-        } else {
-          return;
         }
       }
+      if (selectedWallet.readyState !== "Installed" /* Installed */ && selectedWallet.readyState !== "Loadable" /* Loadable */) {
+        return;
+      }
       this._connecting = true;
       this.setWallet(selectedWallet);
       const account = await selectedWallet.connect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-labs/wallet-adapter-core",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Aptos Wallet Adapter Core",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/WalletCore.ts

@@ -39,7 +39,7 @@ import {
 import { getNameByAddress } from "./ans";
 
 export class WalletCore extends EventEmitter<WalletCoreEvents> {
-  private _wallets: Wallet[] = [];
+  private _wallets: ReadonlyArray<Wallet> = [];
   private _wallet: Wallet | null = null;
   private _account: AccountInfo | null = null;
   private _network: NetworkInfo | null = null;
@@ -47,7 +47,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
   private _connecting: boolean = false;
   private _connected: boolean = false;
 
-  constructor(plugins: Wallet[]) {
+  constructor(plugins: ReadonlyArray<Wallet>) {
     super();
     this._wallets = plugins;
     this.scopePollingDetectionStrategy();
@@ -123,7 +123,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     return this._connected;
   }
 
-  get wallets(): Wallet[] {
+  get wallets(): ReadonlyArray<Wallet> {
     return this._wallets;
   }
 
@@ -187,13 +187,7 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         (wallet: Wallet) => wallet.name === walletName
       );
 
-      if (
-        !selectedWallet ||
-        (selectedWallet.readyState !== WalletReadyState.Installed &&
-          selectedWallet.readyState !== WalletReadyState.Loadable)
-      ) {
-        return;
-      }
+      if (!selectedWallet) return;
 
       if (this._connected) {
         // if the selected wallet is already connected, we don't need to connect again
@@ -201,16 +195,24 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
 
         await this.disconnect();
       }
+
+      // check if we are in a redirectable view (i.e on mobile AND not in an in-app browser) and
+      // since wallet readyState can be NotDetected, we check it before the next check
       if (isRedirectable()) {
         // use wallet deep link
         if (selectedWallet.deeplinkProvider) {
           const url = encodeURIComponent(window.location.href);
           const location = selectedWallet.deeplinkProvider({ url });
           window.location.href = location;
-        } else {
-          return;
         }
       }
+      if (
+        selectedWallet.readyState !== WalletReadyState.Installed &&
+        selectedWallet.readyState !== WalletReadyState.Loadable
+      ) {
+        return;
+      }
+
       this._connecting = true;
       this.setWallet(selectedWallet);
       const account = await selectedWallet.connect();