@dynamic-labs/solana 4.40.0 → 4.40.2

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,11 +1,10 @@
 'use client'
-import { findWalletBookWalletByNameAndChain } from '@dynamic-labs/wallet-book';
 import { getWalletMetadataFromWalletBook } from '@dynamic-labs/wallet-connector-core';
 import { sanitizeName } from '@dynamic-labs/utils';
 import { CoinbaseSolana } from '../CoinbaseSolana/CoinbaseSolana.js';
 import { Solflare } from '../Solflare/Solflare.js';
 import { logger } from '../utils/logger.js';
-import { InjectedWalletBase } from './InjectedWalletBase/InjectedWalletBase.js';
+import { getConnectorConstructorInjectedWallet } from '../utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js';
 import { BackpackSol } from './BackpackSol/BackpackSol.js';
 import { getConnectorConstructorForWalletStandardWallet } from './walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js';
 import { getWalletStandardWallets } from './walletStandard/getWalletStandardWallets/getWalletStandardWallets.js';
@@ -62,32 +61,26 @@ const fetchInjectedWalletConnectors = ({ walletBook, authMode, }) => {
             ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
         return isSolanaWallet && !shouldBeFiltered;
     })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        return class extends InjectedWalletBase {
-            constructor() {
-                super(...arguments);
-                this.name = name;
-                // this is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-        };
-    });
+        .map(([key, wallet]) => getConnectorConstructorInjectedWallet({ key, wallet, walletBook }));
     const walletStandardWallets = getWalletStandardWallets();
     const walletStandardConnectors = walletStandardWallets
         .filter((wallet) => shouldAddWalletStandardConnector(wallet, walletBook, authMode))
         .map((wallet) => {
-        const walletBookWallet = findWalletBookWalletByNameAndChain(walletBook, wallet.name, 'sol');
+        var _a, _b;
+        const [walletBookKey, walletBookWallet] = (_b = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).find(([, walletBookEntry]) => {
+            var _a, _b;
+            return walletBookEntry.name === wallet.name &&
+                ((_b = (_a = walletBookEntry.injectedConfig) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.chain) === 'sol';
+        })) !== null && _b !== void 0 ? _b : [];
         // if the wallet book wallet is found, we want to use it to get the metadata
         // to merge with the wallet standard metadata, specially the supportedHardwareWallets prop
         const walletBookMetadata = walletBookWallet &&
             getWalletMetadataFromWalletBook({
                 walletBook,
                 walletBookWallet,
-                walletKey: `sanitizeName(${wallet.name})sol`,
+                walletKey: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : `${sanitizeName(wallet.name)}sol`,
             });
-        return getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata);
+        return getConnectorConstructorForWalletStandardWallet(wallet, walletBookMetadata, walletBookKey);
     });
     logger.logVerboseTroubleshootingMessage('[SOL fetchInjectedWalletConnectors] walletStandardConnectors', walletStandardConnectors.map((w) => w.name));
     return [...walletBookConnectors, ...walletStandardConnectors];

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.cjs

@@ -7,9 +7,9 @@ var utils = require('@dynamic-labs/utils');
 var InjectedWalletBase = require('../../InjectedWalletBase/InjectedWalletBase.cjs');
 var createSolanaSignerFromWalletStandard = require('../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.cjs');
 
-const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}) => {
+const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}, walletBookKey = undefined) => {
     const sanitizedName = utils.sanitizeName(wallet.name);
-    return class extends InjectedWalletBase.InjectedWalletBase {
+    const ConnectorConstructor = class extends InjectedWalletBase.InjectedWalletBase {
         constructor(props) {
             super(Object.assign(Object.assign({}, props), { metadata: Object.assign(Object.assign({}, walletBookMetadata), { groupKey: sanitizedName, icon: wallet.icon, id: sanitizedName, name: wallet.name }) }));
             this.name = wallet.name;
@@ -23,6 +23,11 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             return this._provider;
         }
     };
+    Object.defineProperty(ConnectorConstructor, 'key', {
+        value: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : sanitizedName,
+        writable: false,
+    });
+    return ConnectorConstructor;
 };
 
 exports.getConnectorConstructorForWalletStandardWallet = getConnectorConstructorForWalletStandardWallet;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.d.ts

@@ -1,3 +1,3 @@
 import { Wallet } from '@wallet-standard/base';
 import { WalletConnectorConstructor, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
-export declare const getConnectorConstructorForWalletStandardWallet: (wallet: Wallet, walletBookMetadata?: Partial<WalletMetadata>) => WalletConnectorConstructor;
+export declare const getConnectorConstructorForWalletStandardWallet: (wallet: Wallet, walletBookMetadata?: Partial<WalletMetadata>, walletBookKey?: string | undefined) => WalletConnectorConstructor;

package/src/injected/walletStandard/getConnectorConstructorForWalletStandardWallet/getConnectorConstructorForWalletStandardWallet.js

@@ -3,9 +3,9 @@ import { sanitizeName } from '@dynamic-labs/utils';
 import { InjectedWalletBase } from '../../InjectedWalletBase/InjectedWalletBase.js';
 import { createSolanaSignerFromWalletStandard } from '../createSolanaSignerFromWalletStandard/createSolanaSignerFromWalletStandard.js';
 
-const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}) => {
+const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetadata = {}, walletBookKey = undefined) => {
     const sanitizedName = sanitizeName(wallet.name);
-    return class extends InjectedWalletBase {
+    const ConnectorConstructor = class extends InjectedWalletBase {
         constructor(props) {
             super(Object.assign(Object.assign({}, props), { metadata: Object.assign(Object.assign({}, walletBookMetadata), { groupKey: sanitizedName, icon: wallet.icon, id: sanitizedName, name: wallet.name }) }));
             this.name = wallet.name;
@@ -19,6 +19,11 @@ const getConnectorConstructorForWalletStandardWallet = (wallet, walletBookMetada
             return this._provider;
         }
     };
+    Object.defineProperty(ConnectorConstructor, 'key', {
+        value: walletBookKey !== null && walletBookKey !== void 0 ? walletBookKey : sanitizedName,
+        writable: false,
+    });
+    return ConnectorConstructor;
 };
 
 export { getConnectorConstructorForWalletStandardWallet };

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.cjs

@@ -0,0 +1,46 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var InjectedWalletBase = require('../../injected/InjectedWalletBase/InjectedWalletBase.cjs');
+
+const getConnectorConstructorInjectedWallet = ({ key, wallet, walletBook, }) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    /**
+     * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+     * Therefore, in order to tell whether this Sol wallet supports wallet connect, we will have to find the wallet book
+     * entry that has the wallet connect data for it.
+     */
+    let walletConnectWalletBookEntry = undefined;
+    if (wallet.group) {
+        walletConnectWalletBookEntry = Object.values(walletBook.wallets).find((entry) => {
+            var _a;
+            return entry.walletConnect &&
+                entry.group === wallet.group &&
+                (
+                // Disregard if the wallet connect data does not support Solana. WC chains are prefixed with 'solana:'
+                // as they follow CAIP-2 format
+                (_a = entry.chains) === null || _a === void 0 ? void 0 : _a.some((chain) => chain.includes('solana:')));
+        });
+    }
+    const InjectedWalletConstructor = class extends InjectedWalletBase.InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.walletName = name;
+            this.name = name;
+            this.walletConnectWalletBookEntry = walletConnectWalletBookEntry;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+    };
+    // Add this key so we can later tell which wallet each constructor is for
+    Object.defineProperty(InjectedWalletConstructor, 'key', {
+        value: key,
+        writable: false,
+    });
+    return InjectedWalletConstructor;
+};
+
+exports.getConnectorConstructorInjectedWallet = getConnectorConstructorInjectedWallet;

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.d.ts

@@ -0,0 +1,9 @@
+import { WalletBookSchema, WalletSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+type GetConnectorConstructorInjectedWalletProps = {
+    key: string;
+    wallet: WalletSchema;
+    walletBook: WalletBookSchema;
+};
+export declare const getConnectorConstructorInjectedWallet: ({ key, wallet, walletBook, }: GetConnectorConstructorInjectedWalletProps) => WalletConnectorConstructor;
+export {};

package/src/utils/getConnectorConstructorInjectedWallet/getConnectorConstructorInjectedWallet.js

@@ -0,0 +1,42 @@
+'use client'
+import { InjectedWalletBase } from '../../injected/InjectedWalletBase/InjectedWalletBase.js';
+
+const getConnectorConstructorInjectedWallet = ({ key, wallet, walletBook, }) => {
+    const { shortName } = wallet;
+    const name = shortName || wallet.name;
+    /**
+     * For historical reasons, all wallet connect data for wallets reside in the EVM entry for the wallet in wallet book.
+     * Therefore, in order to tell whether this Sol wallet supports wallet connect, we will have to find the wallet book
+     * entry that has the wallet connect data for it.
+     */
+    let walletConnectWalletBookEntry = undefined;
+    if (wallet.group) {
+        walletConnectWalletBookEntry = Object.values(walletBook.wallets).find((entry) => {
+            var _a;
+            return entry.walletConnect &&
+                entry.group === wallet.group &&
+                (
+                // Disregard if the wallet connect data does not support Solana. WC chains are prefixed with 'solana:'
+                // as they follow CAIP-2 format
+                (_a = entry.chains) === null || _a === void 0 ? void 0 : _a.some((chain) => chain.includes('solana:')));
+        });
+    }
+    const InjectedWalletConstructor = class extends InjectedWalletBase {
+        constructor() {
+            super(...arguments);
+            this.walletName = name;
+            this.name = name;
+            this.walletConnectWalletBookEntry = walletConnectWalletBookEntry;
+            // this is the key from the wallet book entry so that we don't purely rely on the normalized name
+            this.overrideKey = key;
+        }
+    };
+    // Add this key so we can later tell which wallet each constructor is for
+    Object.defineProperty(InjectedWalletConstructor, 'key', {
+        value: key,
+        writable: false,
+    });
+    return InjectedWalletConstructor;
+};
+
+export { getConnectorConstructorInjectedWallet };

package/src/utils/getConnectorConstructorInjectedWallet/index.d.ts

@@ -0,0 +1 @@
+export { getConnectorConstructorInjectedWallet } from './getConnectorConstructorInjectedWallet';

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.cjs

@@ -4,14 +4,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../_virtual/_tslib.cjs');
-var bs58 = require('bs58');
-var utils$1 = require('@walletconnect/utils');
 var web3_js = require('@solana/web3.js');
+var utils$1 = require('@walletconnect/utils');
+var bs58 = require('bs58');
 var EventEmitter = require('eventemitter3');
 var solanaCore = require('@dynamic-labs/solana-core');
 var utils = require('@dynamic-labs/utils');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var walletConnect = require('@dynamic-labs/wallet-connect');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var logger = require('../../utils/logger.cjs');
 var createSolanaSignerForWalletConnect = require('./createSolanaSignerForWalletConnect/createSolanaSignerForWalletConnect.cjs');
 
@@ -34,6 +34,9 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
         if (storedChainId) {
             this.setNetworkId(storedChainId);
         }
+        if (opts.overrideKey) {
+            this.overrideKey = opts.overrideKey;
+        }
         if (!opts.projectId) {
             throw new utils.DynamicError('WalletConnect project ID is required');
         }
@@ -47,10 +50,10 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
      * immediately available.
      */
     get signClient() {
-        if (!this.signClientReference) {
+        if (!SolanaWalletConnectConnector.signClientReference) {
             throw new utils.DynamicError('Failed to access sign client for Wallet Connect Solana: Sign client not initialized');
         }
-        return this.signClientReference;
+        return SolanaWalletConnectConnector.signClientReference;
     }
     getSupportedNetworks() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -92,15 +95,21 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             if (this.isInitialized) {
                 return;
             }
+            logger.logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] init called');
             this.isInitialized = true;
+            if (SolanaWalletConnectConnector.signClientPromise) {
+                yield SolanaWalletConnectConnector.signClientPromise;
+                this.setupWCEventListeners();
+                return;
+            }
             const { appLogoUrl, appName, projectId } = this.constructorProps;
-            logger.logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] init called');
-            this.signClientPromise = walletConnect.getSignClientSingleton({
+            SolanaWalletConnectConnector.signClientPromise = walletConnect.getSignClientSingleton({
                 appIcon: appLogoUrl !== null && appLogoUrl !== void 0 ? appLogoUrl : '',
                 appName: appName !== null && appName !== void 0 ? appName : '',
                 projectId,
             });
-            this.signClientReference = yield this.signClientPromise;
+            SolanaWalletConnectConnector.signClientReference =
+                yield SolanaWalletConnectConnector.signClientPromise;
             this.setupWCEventListeners();
         });
     }
@@ -178,8 +187,11 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
     }
     getAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             logger.logger.debug('[SolanaWalletConnect] getAddress', opts);
+            if (this.session) {
+                return this.getActiveAddress();
+            }
             /**
              * In mobile/Safari, if the user just navigates back after the deeplink prompt the connection
              * is not rejected, so the previous connection URI is still valid and we can use it to handle the connection
@@ -189,24 +201,13 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
                 this.displayUri(opts);
                 return;
             }
-            /**
-             * If we are already connected to a session, we need to end it first
-             */
-            yield this.endSession();
             logger.logger.logVerboseTroubleshootingMessage('[WalletConnectConnector] getAddress', {
                 inAppBrowserUrl: (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl,
                 isMobile: utils.isMobile(),
                 mobileExperience: this.mobileExperience,
             });
-            if (utils.isMobile() &&
-                ((_b = this.metadata) === null || _b === void 0 ? void 0 : _b.inAppBrowserUrl) &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserCompiledTemplate = utils.template(this.metadata.inAppBrowserUrl);
-                const { href } = utils.PlatformService.getUrl();
-                const deepLink = inAppBrowserCompiledTemplate({
-                    encodedDappURI: encodeURIComponent(href),
-                });
-                utils.PlatformService.openURL(deepLink);
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
             logger.logger.debug('[SolanaWalletConnect] getAddress - connecting to WalletConnect');
@@ -249,16 +250,29 @@ class SolanaWalletConnectConnector extends solanaCore.SolanaWalletConnector {
             }
             const chainHash = (_c = (_b = this.getSelectedNetwork()) === null || _b === void 0 ? void 0 : _b.genesisHash) !== null && _c !== void 0 ? _c : this.solNetworks[0].genesisHash;
             const chainId = `solana:${chainHash}`;
-            const requestPromise = this.signClient.request({
-                chainId,
-                request: {
-                    method,
-                    params,
-                },
-                topic: this.session.topic,
-            });
-            this.deepLinkIfApplicable({ method });
-            return requestPromise;
+            try {
+                const requestPromise = this.signClient.request({
+                    chainId,
+                    request: {
+                        method,
+                        params,
+                    },
+                    topic: this.session.topic,
+                });
+                this.deepLinkIfApplicable({ method });
+                return yield requestPromise;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                // If they are throwing a generic error, lets end session to ensure the user will be prompted to reconnect
+                // on the next attempt. This should fix the issue.
+                // Yes their error message has a typo on "occured"
+                if (error.message === 'An error has occured. Please, try again.') {
+                    yield this.endSession();
+                    throw new utils.DynamicError('Wallet connection lost. Please, try again.');
+                }
+                throw error;
+            }
         });
     }
     deepLinkIfApplicable(params) {

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.d.ts

@@ -1,6 +1,6 @@
+import { SendOptions, Transaction, VersionedTransaction } from '@solana/web3.js';
 import SignClient from '@walletconnect/sign-client';
 import type { SessionTypes } from '@walletconnect/types';
-import { SendOptions, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { ISolanaSigner, SolanaWalletConnector, SolanaWalletConnectorOpts } from '@dynamic-labs/solana-core';
 import { DeepLinkVariant, GetAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 export type SolanaWalletConnectConnectorOpts = SolanaWalletConnectorOpts & {
@@ -9,11 +9,12 @@ export type SolanaWalletConnectConnectorOpts = SolanaWalletConnectorOpts & {
     deepLinkPreference?: DeepLinkVariant;
     appLogoUrl?: string;
     appName?: string;
+    overrideKey?: string;
 };
 export declare class SolanaWalletConnectConnector extends SolanaWalletConnector implements IWalletConnectConnector {
     name: string;
-    private signClientReference;
-    private signClientPromise;
+    static signClientReference: SignClient | undefined;
+    static signClientPromise: Promise<SignClient> | undefined;
     /**
      * When a WalletConnect connection is initiated, we store the connection URI
      * so we can use it to handle the URI for wallet app connection and still have

package/src/walletConnect/SolanaWalletConnectConnector/SolanaWalletConnectConnector.js

@@ -1,13 +1,13 @@
 'use client'
 import { __awaiter } from '../../../_virtual/_tslib.js';
-import bs58 from 'bs58';
-import { SDK_ERRORS } from '@walletconnect/utils';
 import { PublicKey, VersionedTransaction, Transaction } from '@solana/web3.js';
+import { SDK_ERRORS } from '@walletconnect/utils';
+import bs58 from 'bs58';
 import EventEmitter from 'eventemitter3';
 import { SolanaWalletConnector, isVersionedTransaction } from '@dynamic-labs/solana-core';
-import { StorageService, DynamicError, filterDuplicates, isMobile, template, PlatformService, bufferToBase64 } from '@dynamic-labs/utils';
-import { performPlatformSpecificConnectionMethod, getDeepLink, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { StorageService, DynamicError, filterDuplicates, isMobile, PlatformService, bufferToBase64 } from '@dynamic-labs/utils';
 import { getSignClientSingleton } from '@dynamic-labs/wallet-connect';
+import { performPlatformSpecificConnectionMethod, getDeepLink, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { logger } from '../../utils/logger.js';
 import { createSolanaSignerForWalletConnect } from './createSolanaSignerForWalletConnect/createSolanaSignerForWalletConnect.js';
 
@@ -25,6 +25,9 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
         if (storedChainId) {
             this.setNetworkId(storedChainId);
         }
+        if (opts.overrideKey) {
+            this.overrideKey = opts.overrideKey;
+        }
         if (!opts.projectId) {
             throw new DynamicError('WalletConnect project ID is required');
         }
@@ -38,10 +41,10 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
      * immediately available.
      */
     get signClient() {
-        if (!this.signClientReference) {
+        if (!SolanaWalletConnectConnector.signClientReference) {
             throw new DynamicError('Failed to access sign client for Wallet Connect Solana: Sign client not initialized');
         }
-        return this.signClientReference;
+        return SolanaWalletConnectConnector.signClientReference;
     }
     getSupportedNetworks() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -83,15 +86,21 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             if (this.isInitialized) {
                 return;
             }
+            logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] init called');
             this.isInitialized = true;
+            if (SolanaWalletConnectConnector.signClientPromise) {
+                yield SolanaWalletConnectConnector.signClientPromise;
+                this.setupWCEventListeners();
+                return;
+            }
             const { appLogoUrl, appName, projectId } = this.constructorProps;
-            logger.logVerboseTroubleshootingMessage('[SolanaWalletConnect] init called');
-            this.signClientPromise = getSignClientSingleton({
+            SolanaWalletConnectConnector.signClientPromise = getSignClientSingleton({
                 appIcon: appLogoUrl !== null && appLogoUrl !== void 0 ? appLogoUrl : '',
                 appName: appName !== null && appName !== void 0 ? appName : '',
                 projectId,
             });
-            this.signClientReference = yield this.signClientPromise;
+            SolanaWalletConnectConnector.signClientReference =
+                yield SolanaWalletConnectConnector.signClientPromise;
             this.setupWCEventListeners();
         });
     }
@@ -169,8 +178,11 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
     }
     getAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             logger.debug('[SolanaWalletConnect] getAddress', opts);
+            if (this.session) {
+                return this.getActiveAddress();
+            }
             /**
              * In mobile/Safari, if the user just navigates back after the deeplink prompt the connection
              * is not rejected, so the previous connection URI is still valid and we can use it to handle the connection
@@ -180,24 +192,13 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
                 this.displayUri(opts);
                 return;
             }
-            /**
-             * If we are already connected to a session, we need to end it first
-             */
-            yield this.endSession();
             logger.logVerboseTroubleshootingMessage('[WalletConnectConnector] getAddress', {
                 inAppBrowserUrl: (_a = this.metadata) === null || _a === void 0 ? void 0 : _a.inAppBrowserUrl,
                 isMobile: isMobile(),
                 mobileExperience: this.mobileExperience,
             });
-            if (isMobile() &&
-                ((_b = this.metadata) === null || _b === void 0 ? void 0 : _b.inAppBrowserUrl) &&
-                this.mobileExperience === 'in-app-browser') {
-                const inAppBrowserCompiledTemplate = template(this.metadata.inAppBrowserUrl);
-                const { href } = PlatformService.getUrl();
-                const deepLink = inAppBrowserCompiledTemplate({
-                    encodedDappURI: encodeURIComponent(href),
-                });
-                PlatformService.openURL(deepLink);
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
             logger.debug('[SolanaWalletConnect] getAddress - connecting to WalletConnect');
@@ -240,16 +241,29 @@ class SolanaWalletConnectConnector extends SolanaWalletConnector {
             }
             const chainHash = (_c = (_b = this.getSelectedNetwork()) === null || _b === void 0 ? void 0 : _b.genesisHash) !== null && _c !== void 0 ? _c : this.solNetworks[0].genesisHash;
             const chainId = `solana:${chainHash}`;
-            const requestPromise = this.signClient.request({
-                chainId,
-                request: {
-                    method,
-                    params,
-                },
-                topic: this.session.topic,
-            });
-            this.deepLinkIfApplicable({ method });
-            return requestPromise;
+            try {
+                const requestPromise = this.signClient.request({
+                    chainId,
+                    request: {
+                        method,
+                        params,
+                    },
+                    topic: this.session.topic,
+                });
+                this.deepLinkIfApplicable({ method });
+                return yield requestPromise;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                // If they are throwing a generic error, lets end session to ensure the user will be prompted to reconnect
+                // on the next attempt. This should fix the issue.
+                // Yes their error message has a typo on "occured"
+                if (error.message === 'An error has occured. Please, try again.') {
+                    yield this.endSession();
+                    throw new DynamicError('Wallet connection lost. Please, try again.');
+                }
+                throw error;
+            }
         });
     }
     deepLinkIfApplicable(params) {

package/src/walletConnect/utils/addSolanaWalletConnectConnectors/addSolanaWalletConnectConnectors.cjs

@@ -0,0 +1,64 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var SolanaWalletConnectConnector = require('../../SolanaWalletConnectConnector/SolanaWalletConnectConnector.cjs');
+
+/**
+ * Adds Solana WalletConnect connectors to the list of connectors, avoiding duplicates
+ * by checking what connectors are already present
+ */
+const addSolanaWalletConnectConnectors = ({ walletBook, connectors: currentConnectors, }) => {
+    var _a;
+    const walletEntries = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {});
+    const allWcConstructors = walletEntries
+        .filter(([, wallet]) => {
+        var _a;
+        return wallet.walletConnect &&
+            (
+            // Exclude wallets that don't support Solana
+            (_a = wallet.chains) === null || _a === void 0 ? void 0 : _a.some((chain) => chain.includes('solana:')));
+    })
+        .map(([key, wallet]) => {
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        const SolanaWalletConnectConnectorConstructor = class extends SolanaWalletConnectConnector.SolanaWalletConnectConnector {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { metadata: walletConnectorCore.getWalletMetadataFromWalletBook({
+                        walletBookWallet: wallet,
+                        walletKey: key,
+                    }), overrideKey: key, walletName: name }));
+                this.overrideKey = key;
+            }
+        };
+        const entryKeysWithSameGroup = walletEntries
+            .filter(([, { group }]) => group && group === wallet.group)
+            .map(([key]) => key);
+        // We store the key and the keys of all other entries in the same group
+        // so that we can filter out from the WC connectors we just built both the ones
+        // whose key is already present in the current connectors and the ones whose key is in the same group
+        // as one of the current connectors.
+        // We need to check the groups as well because the wallet book entry that we use to create the Sol WC
+        // connector might be coming from the EVM wallet book entry (due to historical reasons, that's the entry
+        // that has the WC data)
+        Object.defineProperty(SolanaWalletConnectConnectorConstructor, 'key', {
+            value: key,
+            writable: false,
+        });
+        Object.defineProperty(SolanaWalletConnectConnectorConstructor, 'groupedKeys', {
+            value: entryKeysWithSameGroup,
+            writable: false,
+        });
+        return SolanaWalletConnectConnectorConstructor;
+    });
+    const filteredWcConstructors = allWcConstructors.filter((constructor) => currentConnectors.every((existingConnector) => 
+    // @ts-expect-error - the key type is not defined for the constructor
+    existingConnector['key'] !== constructor['key'] &&
+        // @ts-expect-error - the key type is not defined for the constructor
+        !constructor['groupedKeys'].includes(existingConnector['key'])));
+    return [...currentConnectors, ...filteredWcConstructors];
+};
+
+exports.addSolanaWalletConnectConnectors = addSolanaWalletConnectConnectors;

package/src/walletConnect/utils/addSolanaWalletConnectConnectors/addSolanaWalletConnectConnectors.d.ts

@@ -0,0 +1,12 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
+type FetchSolanaWalletConnectWalletsProps = {
+    walletBook: WalletBookSchema;
+    connectors: WalletConnectorConstructor[];
+};
+/**
+ * Adds Solana WalletConnect connectors to the list of connectors, avoiding duplicates
+ * by checking what connectors are already present
+ */
+export declare const addSolanaWalletConnectConnectors: ({ walletBook, connectors: currentConnectors, }: FetchSolanaWalletConnectWalletsProps) => Array<WalletConnectorConstructor>;
+export {};