@solana-mobile/wallet-adapter-mobile 0.9.4 → 0.9.5

package/README.md

@@ -18,6 +18,7 @@ new SolanaMobileWalletAdapter({
     },
     authorizationResultCache: createDefaultAuthorizationResultCache(),
     cluster: WalletAdapterNetwork.Devnet,
+    onWalletNotFound: createDefaultWalletNotFoundHandler(),
 });
 ```
 
@@ -34,6 +35,7 @@ const wallets = useMemo(() => [
        },
         authorizationResultCache: createDefaultAuthorizationResultCache(),
         cluster: WalletAdapterNetwork.Devnet,
+        onWalletNotFound: createDefaultWalletNotFoundHandler(),
     });
     new PhantomWalletAdapter(),
     /* ... other wallets ... */
@@ -88,4 +90,10 @@ Alternatively, you can use the included `createDefaultAuthorizationResultCache()
 
 ### Cluster
 
-Each authorization a dApp makes with a wallet is tied to a particular Solana cluster. If a dApp wants to change the cluster on which to transact, it must seek an authorization for that cluster.
+Each authorization a dApp makes with a wallet is tied to a particular Solana cluster. If a dApp wants to change the cluster on which to transact, it must seek an authorization for that cluster.
+
+### Wallet-not-found handler
+
+When you call `connect()` but no wallet responds within a reasonable amount of time, it is presumed that no compatible wallet is installed. You must supply an `onWalletNotFound` function to handle this case.
+
+Alternatively, you can use the included `createDefaultWalletNotFoundHandler()` method to create a function that opens the Solana Mobile ecosystem wallets webpage.

package/lib/cjs/index.browser.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -31,13 +31,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function getIsSupported() {
-    return (typeof window !== 'undefined' &&
-        window.isSecureContext &&
-        typeof document !== 'undefined' &&
-        /android/i.test(navigator.userAgent));
-}
-
 function toUint8Array(base64EncodedByteArray) {
     return new Uint8Array(window
         .atob(base64EncodedByteArray)
@@ -45,7 +38,14 @@ function toUint8Array(base64EncodedByteArray) {
         .map((c) => c.charCodeAt(0)));
 }
 
-const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
+const SolanaMobileWalletAdapterWalletName = 'Mobile Wallet Adapter';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
     const publicKeyByteArray = toUint8Array(address);
@@ -58,7 +58,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
         ['legacy', 0]);
         this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com';
+        this.url = 'https://solanamobile.com/wallets';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
         this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
@@ -66,6 +66,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
         this._cluster = config.cluster;
+        this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
                 if (authorizationResult) {
@@ -234,7 +235,17 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            try {
+                return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            }
+            catch (e) {
+                if (e instanceof Error &&
+                    e.name === 'SolanaMobileWalletAdapterError' &&
+                    e.code === 'ERROR_WALLET_NOT_FOUND') {
+                    yield this._onWalletNotFound(this);
+                }
+                throw e;
+            }
         });
     }
     assertIsAuthorized() {
@@ -433,7 +444,19 @@ function createDefaultAuthorizationResultCache() {
     };
 }
 
+function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof window !== 'undefined') {
+            window.location.assign(mobileWalletAdapter.url);
+        }
+    });
+}
+function createDefaultWalletNotFoundHandler() {
+    return defaultWalletNotFoundHandler;
+}
+
 exports.SolanaMobileWalletAdapter = SolanaMobileWalletAdapter;
 exports.SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName;
 exports.createDefaultAddressSelector = createDefaultAddressSelector;
 exports.createDefaultAuthorizationResultCache = createDefaultAuthorizationResultCache;
+exports.createDefaultWalletNotFoundHandler = createDefaultWalletNotFoundHandler;

package/lib/cjs/index.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -31,13 +31,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function getIsSupported() {
-    return (typeof window !== 'undefined' &&
-        window.isSecureContext &&
-        typeof document !== 'undefined' &&
-        /android/i.test(navigator.userAgent));
-}
-
 function toUint8Array(base64EncodedByteArray) {
     return new Uint8Array(window
         .atob(base64EncodedByteArray)
@@ -45,7 +38,14 @@ function toUint8Array(base64EncodedByteArray) {
         .map((c) => c.charCodeAt(0)));
 }
 
-const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
+const SolanaMobileWalletAdapterWalletName = 'Mobile Wallet Adapter';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
     const publicKeyByteArray = toUint8Array(address);
@@ -58,7 +58,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
         ['legacy', 0]);
         this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com';
+        this.url = 'https://solanamobile.com/wallets';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
         this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
@@ -66,6 +66,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
         this._cluster = config.cluster;
+        this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
                 if (authorizationResult) {
@@ -234,7 +235,17 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            try {
+                return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            }
+            catch (e) {
+                if (e instanceof Error &&
+                    e.name === 'SolanaMobileWalletAdapterError' &&
+                    e.code === 'ERROR_WALLET_NOT_FOUND') {
+                    yield this._onWalletNotFound(this);
+                }
+                throw e;
+            }
         });
     }
     assertIsAuthorized() {
@@ -433,7 +444,19 @@ function createDefaultAuthorizationResultCache() {
     };
 }
 
+function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof window !== 'undefined') {
+            window.location.assign(mobileWalletAdapter.url);
+        }
+    });
+}
+function createDefaultWalletNotFoundHandler() {
+    return defaultWalletNotFoundHandler;
+}
+
 exports.SolanaMobileWalletAdapter = SolanaMobileWalletAdapter;
 exports.SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName;
 exports.createDefaultAddressSelector = createDefaultAddressSelector;
 exports.createDefaultAuthorizationResultCache = createDefaultAuthorizationResultCache;
+exports.createDefaultWalletNotFoundHandler = createDefaultWalletNotFoundHandler;

package/lib/cjs/index.native.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
-var reactNative = require('react-native');
 var jsBase64 = require('js-base64');
+var reactNative = require('react-native');
 var AsyncStorage = require('@react-native-async-storage/async-storage');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,7 +42,7 @@ function getIsSupported() {
     return reactNative.Platform.OS === 'android';
 }
 
-const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+const SolanaMobileWalletAdapterWalletName = 'Mobile Wallet Adapter';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
     const publicKeyByteArray = jsBase64.toUint8Array(address);
@@ -55,7 +55,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
         ['legacy', 0]);
         this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com';
+        this.url = 'https://solanamobile.com/wallets';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
         this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
@@ -63,6 +63,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
         this._cluster = config.cluster;
+        this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
                 if (authorizationResult) {
@@ -231,7 +232,17 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            try {
+                return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+            }
+            catch (e) {
+                if (e instanceof Error &&
+                    e.name === 'SolanaMobileWalletAdapterError' &&
+                    e.code === 'ERROR_WALLET_NOT_FOUND') {
+                    yield this._onWalletNotFound(this);
+                }
+                throw e;
+            }
         });
     }
     assertIsAuthorized() {
@@ -415,7 +426,19 @@ function createDefaultAuthorizationResultCache() {
     };
 }
 
+function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof window !== 'undefined') {
+            window.location.assign(mobileWalletAdapter.url);
+        }
+    });
+}
+function createDefaultWalletNotFoundHandler() {
+    return defaultWalletNotFoundHandler;
+}
+
 exports.SolanaMobileWalletAdapter = SolanaMobileWalletAdapter;
 exports.SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName;
 exports.createDefaultAddressSelector = createDefaultAddressSelector;
 exports.createDefaultAuthorizationResultCache = createDefaultAuthorizationResultCache;
+exports.createDefaultWalletNotFoundHandler = createDefaultWalletNotFoundHandler;

package/lib/esm/index.browser.mjs

@@ -1,6 +1,6 @@
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
-import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -27,13 +27,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function getIsSupported() {
-    return (typeof window !== 'undefined' &&
-        window.isSecureContext &&
-        typeof document !== 'undefined' &&
-        /android/i.test(navigator.userAgent));
-}
-
 function toUint8Array(base64EncodedByteArray) {
     return new Uint8Array(window
         .atob(base64EncodedByteArray)
@@ -41,7 +34,14 @@ function toUint8Array(base64EncodedByteArray) {
         .map((c) => c.charCodeAt(0)));
 }
 
-const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
+const SolanaMobileWalletAdapterWalletName = 'Mobile Wallet Adapter';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
     const publicKeyByteArray = toUint8Array(address);
@@ -54,7 +54,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
         ['legacy', 0]);
         this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com';
+        this.url = 'https://solanamobile.com/wallets';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
         this._readyState = getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported;
@@ -62,6 +62,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
         this._cluster = config.cluster;
+        this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
                 if (authorizationResult) {
@@ -230,7 +231,17 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield transact(callback, config);
+            try {
+                return yield transact(callback, config);
+            }
+            catch (e) {
+                if (e instanceof Error &&
+                    e.name === 'SolanaMobileWalletAdapterError' &&
+                    e.code === 'ERROR_WALLET_NOT_FOUND') {
+                    yield this._onWalletNotFound(this);
+                }
+                throw e;
+            }
         });
     }
     assertIsAuthorized() {
@@ -429,4 +440,15 @@ function createDefaultAuthorizationResultCache() {
     };
 }
 
-export { SolanaMobileWalletAdapter, SolanaMobileWalletAdapterWalletName, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof window !== 'undefined') {
+            window.location.assign(mobileWalletAdapter.url);
+        }
+    });
+}
+function createDefaultWalletNotFoundHandler() {
+    return defaultWalletNotFoundHandler;
+}
+
+export { SolanaMobileWalletAdapter, SolanaMobileWalletAdapterWalletName, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };

package/lib/esm/index.mjs

@@ -1,6 +1,6 @@
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
-import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -27,13 +27,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-function getIsSupported() {
-    return (typeof window !== 'undefined' &&
-        window.isSecureContext &&
-        typeof document !== 'undefined' &&
-        /android/i.test(navigator.userAgent));
-}
-
 function toUint8Array(base64EncodedByteArray) {
     return new Uint8Array(window
         .atob(base64EncodedByteArray)
@@ -41,7 +34,14 @@ function toUint8Array(base64EncodedByteArray) {
         .map((c) => c.charCodeAt(0)));
 }
 
-const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
+const SolanaMobileWalletAdapterWalletName = 'Mobile Wallet Adapter';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
 function getPublicKeyFromAddress(address) {
     const publicKeyByteArray = toUint8Array(address);
@@ -54,7 +54,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
         ['legacy', 0]);
         this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com';
+        this.url = 'https://solanamobile.com/wallets';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
         this._readyState = getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported;
@@ -62,6 +62,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
         this._cluster = config.cluster;
+        this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
                 if (authorizationResult) {
@@ -230,7 +231,17 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield transact(callback, config);
+            try {
+                return yield transact(callback, config);
+            }
+            catch (e) {
+                if (e instanceof Error &&
+                    e.name === 'SolanaMobileWalletAdapterError' &&
+                    e.code === 'ERROR_WALLET_NOT_FOUND') {
+                    yield this._onWalletNotFound(this);
+                }
+                throw e;
+            }
         });
     }
     assertIsAuthorized() {
@@ -429,4 +440,15 @@ function createDefaultAuthorizationResultCache() {
     };
 }
 
-export { SolanaMobileWalletAdapter, SolanaMobileWalletAdapterWalletName, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof window !== 'undefined') {
+            window.location.assign(mobileWalletAdapter.url);
+        }
+    });
+}
+function createDefaultWalletNotFoundHandler() {
+    return defaultWalletNotFoundHandler;
+}
+
+export { SolanaMobileWalletAdapter, SolanaMobileWalletAdapterWalletName, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };

package/lib/types/index.browser.d.mts

@@ -22,6 +22,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private _authorizationResultCache;
     private _connecting;
     private _cluster;
+    private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
@@ -30,6 +31,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         appIdentity: AppIdentity;
         authorizationResultCache: AuthorizationResultCache;
         cluster: Cluster;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
@@ -52,5 +54,6 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
-export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+declare function createDefaultWalletNotFoundHandler(): (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };
 //# sourceMappingURL=index.browser.d.mts.map

package/lib/types/index.browser.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/createDefaultWalletNotFoundHandler.ts"],"names":[],"mappings":""}

package/lib/types/index.browser.d.ts

@@ -22,6 +22,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private _authorizationResultCache;
     private _connecting;
     private _cluster;
+    private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
@@ -30,6 +31,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         appIdentity: AppIdentity;
         authorizationResultCache: AuthorizationResultCache;
         cluster: Cluster;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
@@ -52,5 +54,6 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
-export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+declare function createDefaultWalletNotFoundHandler(): (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };
 //# sourceMappingURL=index.browser.d.ts.map

package/lib/types/index.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/createDefaultWalletNotFoundHandler.ts"],"names":[],"mappings":""}

package/lib/types/index.d.mts

@@ -22,6 +22,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private _authorizationResultCache;
     private _connecting;
     private _cluster;
+    private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
@@ -30,6 +31,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         appIdentity: AppIdentity;
         authorizationResultCache: AuthorizationResultCache;
         cluster: Cluster;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
@@ -52,5 +54,6 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
-export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+declare function createDefaultWalletNotFoundHandler(): (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };
 //# sourceMappingURL=index.d.mts.map

package/lib/types/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/createDefaultWalletNotFoundHandler.ts"],"names":[],"mappings":""}

package/lib/types/index.d.ts

@@ -22,6 +22,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private _authorizationResultCache;
     private _connecting;
     private _cluster;
+    private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
@@ -30,6 +31,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         appIdentity: AppIdentity;
         authorizationResultCache: AuthorizationResultCache;
         cluster: Cluster;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
@@ -52,5 +54,6 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
-export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+declare function createDefaultWalletNotFoundHandler(): (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };
 //# sourceMappingURL=index.d.ts.map

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/createDefaultWalletNotFoundHandler.ts"],"names":[],"mappings":""}

package/lib/types/index.native.d.ts

@@ -22,6 +22,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private _authorizationResultCache;
     private _connecting;
     private _cluster;
+    private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
@@ -30,6 +31,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         appIdentity: AppIdentity;
         authorizationResultCache: AuthorizationResultCache;
         cluster: Cluster;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
@@ -52,5 +54,6 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
-export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache };
+declare function createDefaultWalletNotFoundHandler(): (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+export { AuthorizationResultCache, AddressSelector, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAddressSelector, createDefaultAuthorizationResultCache, createDefaultWalletNotFoundHandler };
 //# sourceMappingURL=index.native.d.ts.map

package/lib/types/index.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/base64Utils.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/getIsSupported.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/base64Utils.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAddressSelector.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/createDefaultWalletNotFoundHandler.ts","../../src/__forks__/react-native/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/getIsSupported.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/wallet-adapter-mobile",
     "description": "An adapter for mobile wallet apps that conform to the Solana Mobile Wallet Adapter protocol",
-    "version": "0.9.4",
+    "version": "0.9.5",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
     "license": "Apache-2.0",
@@ -41,7 +41,7 @@
     },
     "dependencies": {
         "@react-native-async-storage/async-storage": "^1.17.7",
-        "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^0.9.4",
+        "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^0.9.5",
         "@solana/wallet-adapter-base": "^0.9.17",
         "js-base64": "^3.7.2"
     },
@@ -51,5 +51,5 @@
         "cross-env": "^7.0.3",
         "shx": "^0.3.4"
     },
-    "gitHead": "83d9987d68083fe62de95a094bea10faa1bce5ea"
+    "gitHead": "d3da860526efa336e0bd4c4d680f0f38b1d8f146"
 }