@aptos-labs/wallet-adapter-core 5.1.0 → 5.1.2

package/src/WalletCore.ts

@@ -486,6 +486,26 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
    * @param walletName. The wallet name we want to connect with.
    */
   async connect(walletName: string): Promise<void | string> {
+    // First, handle mobile case
+    // Check if we are in a redirectable view (i.e on mobile AND not in an in-app browser)
+    if (isRedirectable()) {
+      const selectedWallet = this._standard_not_detected_wallets.find(
+        (wallet: AdapterNotDetectedWallet) => wallet.name === walletName
+      );
+
+      if (selectedWallet) {
+        // If wallet has a deeplinkProvider property, use it
+        const uninstalledWallet =
+          selectedWallet as unknown as AptosStandardSupportedWallet;
+        if (uninstalledWallet.deeplinkProvider) {
+          const url = encodeURIComponent(window.location.href);
+          const location = uninstalledWallet.deeplinkProvider.concat(url);
+          window.location.href = location;
+          return;
+        }
+      }
+    }
+
     // Checks the wallet exists in the detected wallets array
     const allDetectedWallets = this._standard_wallets;
 
@@ -504,33 +524,6 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
         ).message;
     }
 
-    // Check if we are in a redirectable view (i.e on mobile AND not in an in-app browser)
-    // Ignore if wallet is installed (iOS extension)
-    if (isRedirectable()) {
-      if (selectedWallet.readyState === WalletReadyState.Installed) {
-        // If wallet has a openInMobileApp method, use it
-        if (selectedWallet.features["aptos:openInMobileApp"]?.openInMobileApp) {
-          selectedWallet.features["aptos:openInMobileApp"]?.openInMobileApp();
-          return;
-        }
-      }
-
-      if (selectedWallet.readyState === WalletReadyState.NotDetected) {
-        // If wallet has a deeplinkProvider property, i.e wallet is on the internal registry, use it
-        const uninstalledWallet =
-          selectedWallet as unknown as AptosStandardSupportedWallet;
-        if (uninstalledWallet.deeplinkProvider) {
-          const url = encodeURIComponent(window.location.href);
-          const location = uninstalledWallet.deeplinkProvider.concat(url);
-          window.location.href = location;
-          return;
-        }
-      }
-    }
-
-    // If true, the wallet was redirected to the mobile app's browser.
-    if (this.redirectIfRedirectable(selectedWallet)) return;
-
     await this.connectWallet(selectedWallet, async () => {
       const response = await selectedWallet.features["aptos:connect"].connect();
       if (response.status === UserResponseStatus.REJECTED) {
@@ -564,26 +557,27 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     );
 
     if (!selectedWallet) {
-      throw new WalletNotFoundError(`Wallet ${walletName} not found`);
+      throw new WalletNotFoundError(`Wallet ${walletName} not found`).message;
     }
 
     if (!selectedWallet.features["aptos:signIn"]) {
       throw new WalletNotSupportedMethod(
         `aptos:signIn is not supported by ${walletName}`
-      );
+      ).message;
     }
 
     return await this.connectWallet(selectedWallet, async () => {
       if (!selectedWallet.features["aptos:signIn"]) {
         throw new WalletNotSupportedMethod(
           `aptos:signIn is not supported by ${selectedWallet.name}`
-        );
+        ).message;
       }
 
       const response =
         await selectedWallet.features["aptos:signIn"].signIn(input);
       if (response.status === UserResponseStatus.REJECTED) {
-        throw new WalletConnectionError("User has rejected the request");
+        throw new WalletConnectionError("User has rejected the request")
+          .message;
       }
 
       return { account: response.args.account, output: response.args };
@@ -625,39 +619,6 @@ export class WalletCore extends EventEmitter<WalletCoreEvents> {
     }
   }
 
-  /**
-   * If the wallet is in a Mobile browser, it should be redirected to the Mobile wallet's browser.
-   * 1. Check if we are in a redirectable view (i.e on mobile AND not in an in-app browser)
-   * 2. Ignore if wallet is installed (iOS extension)
-   *
-   * @returns boolean true if the wallet was redirected, false otherwise.
-   */
-  private redirectIfRedirectable(selectedWallet: AdapterWallet): boolean {
-    if (isRedirectable()) {
-      if (selectedWallet.readyState === WalletReadyState.Installed) {
-        // If wallet has a openInMobileApp method, use it
-        if (selectedWallet.features["aptos:openInMobileApp"]?.openInMobileApp) {
-          selectedWallet.features["aptos:openInMobileApp"]?.openInMobileApp();
-          return true;
-        }
-      }
-
-      if (selectedWallet.readyState === WalletReadyState.NotDetected) {
-        // If wallet has a deeplinkProvider property, i.e wallet is on the internal registry, use it
-        const uninstalledWallet =
-          selectedWallet as unknown as AptosStandardSupportedWallet;
-        if (uninstalledWallet.deeplinkProvider) {
-          const url = encodeURIComponent(window.location.href);
-          const location = uninstalledWallet.deeplinkProvider.concat(url);
-          window.location.href = location;
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-
   /**
    * Disconnect the current connected wallet. On success, we clear the
    * current account, current network and LocalStorage data.

package/src/version.ts

@@ -1 +1 @@
-export const WALLET_ADAPTER_CORE_VERSION = "5.1.0";
+export const WALLET_ADAPTER_CORE_VERSION = "5.1.2";