@dynamic-labs/sdk-react-core 0.19.3 → 1.0.0-alpha.1

package/src/lib/utils/hooks/useSocialAccounts/useSocialAccounts.cjs

@@ -69,7 +69,7 @@ const useSocialAccounts = ({ sessionTimeout } = {
         return true;
     };
     const linkSocialAccount = (provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        connectSocialAccount(provider, checkValidOAuthLinking);
+        connectSocialAccount({ provider, validator: checkValidOAuthLinking });
     });
     const unlinkSocialAccount = (provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _b;

package/src/lib/utils/hooks/useSocialAccounts/useSocialAccounts.js

@@ -65,7 +65,7 @@ const useSocialAccounts = ({ sessionTimeout } = {
         return true;
     };
     const linkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
-        connectSocialAccount(provider, checkValidOAuthLinking);
+        connectSocialAccount({ provider, validator: checkValidOAuthLinking });
     });
     const unlinkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.cjs

@@ -125,10 +125,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
         }
     });
-    const signInAccount = (provider, code, verifier, state) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const signInAccount = (provider, code, verifier, state, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _b;
         try {
             const jwt = yield api.signInOAuth(environmentId, provider, {
+                captchaToken,
                 code,
                 codeVerifier: verifier,
                 state,
@@ -170,7 +171,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             handleError(types.SocialOAuthErrorCode.GENERAL_ERROR, error);
         }
     });
-    const connectSocialAccount = (provider, validator) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectSocialAccount = ({ provider, validator, captchaToken, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _c, _d;
         clearInterval(authWindowInterval.current);
         clearError();
@@ -253,7 +254,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             if (authMode === 'signin') {
-                yield signInAccount(provider, code, verifier, state);
+                yield signInAccount(provider, code, verifier, state, captchaToken);
             }
             else {
                 yield linkAccount(provider, code, verifier, state);

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.d.ts

@@ -10,7 +10,11 @@ type UseSocialAuthProps = {
 };
 export declare const useSocialAuth: ({ sessionTimeout, authMode, onSettled, onError, }: UseSocialAuthProps) => {
     readonly checkValidProvider: (provider: ProviderEnum) => boolean;
-    readonly connectSocialAccount: (provider: ProviderEnum, validator?: ((provider: ProviderEnum) => boolean) | undefined) => Promise<void>;
+    readonly connectSocialAccount: ({ provider, validator, captchaToken, }: {
+        provider: ProviderEnum;
+        validator?: ((provider: ProviderEnum) => boolean) | undefined;
+        captchaToken?: string | undefined;
+    }) => Promise<void>;
     readonly error: SocialOAuthError | undefined;
     readonly handleError: (code: SocialOAuthErrorCode, message: string) => void;
     readonly isProcessing: boolean;

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.js

@@ -121,10 +121,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
         }
     });
-    const signInAccount = (provider, code, verifier, state) => __awaiter(void 0, void 0, void 0, function* () {
+    const signInAccount = (provider, code, verifier, state, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;
         try {
             const jwt = yield signInOAuth(environmentId, provider, {
+                captchaToken,
                 code,
                 codeVerifier: verifier,
                 state,
@@ -166,7 +167,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             handleError(SocialOAuthErrorCode.GENERAL_ERROR, error);
         }
     });
-    const connectSocialAccount = (provider, validator) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectSocialAccount = ({ provider, validator, captchaToken, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _c, _d;
         clearInterval(authWindowInterval.current);
         clearError();
@@ -249,7 +250,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             if (authMode === 'signin') {
-                yield signInAccount(provider, code, verifier, state);
+                yield signInAccount(provider, code, verifier, state, captchaToken);
             }
             else {
                 yield linkAccount(provider, code, verifier, state);

package/src/lib/utils/hooks/useValidateSession/useValidateSession.cjs

@@ -61,7 +61,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldBridge: currentWalletConnectV1Bridge,
         });
     });
-    const hasWCV1Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    // Pera Wallet uses WC v1 and sets a 'walletconnect' key in localStorage
+    // so we can't just check for a key starting with 'walletconnect'
+    const hasWCV1Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('walletconnect-') || key.startsWith('walletlink'));
     const hasWCV2Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('wc@2'));
     const handleConnectorVersionOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!wcVersion ||

package/src/lib/utils/hooks/useValidateSession/useValidateSession.js

@@ -57,7 +57,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldBridge: currentWalletConnectV1Bridge,
         });
     });
-    const hasWCV1Data = LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    // Pera Wallet uses WC v1 and sets a 'walletconnect' key in localStorage
+    // so we can't just check for a key starting with 'walletconnect'
+    const hasWCV1Data = LocalStorage.getKeys().some((key) => key.startsWith('walletconnect-') || key.startsWith('walletlink'));
     const hasWCV2Data = LocalStorage.getKeys().some((key) => key.startsWith('wc@2'));
     const handleConnectorVersionOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!wcVersion ||

package/src/lib/utils/hooks/useWalletConnectorEvent/useWalletConnectorEvent.cjs

@@ -30,7 +30,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
             return () => emitter.off(eventName, callback);
         });
         return () => unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [eventEmitters, eventName]);
 };
 

package/src/lib/utils/hooks/useWalletConnectorEvent/useWalletConnectorEvent.js

@@ -26,7 +26,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
             return () => emitter.off(eventName, callback);
         });
         return () => unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [eventEmitters, eventName]);
 };
 

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var sdkApi = require('@dynamic-labs/sdk-api');
 var decodeJwt = require('../../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -15,10 +16,10 @@ require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
 require('../../../../../shared/consts/index.cjs');
-var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+var findWallet = require('../findWallet/findWallet.cjs');
+var smartWallet = require('../smartWallet/smartWallet.cjs');
 
 const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt.decodeJwt(authToken);
@@ -28,8 +29,7 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = walletOptions.find((wallet) => account.walletName &&
-            isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+        const wallet = findWallet.findWallet(account, walletOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
         // supports wallet W
@@ -40,7 +40,18 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
             shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // this account is the owner of a smart wallet, and should not be surfaced
+        if (smartWallet.isOwnerOfASmartWallet(account, decodedJwt.verifiedCredentials)) {
+            return null;
+        }
         if (account.address && account.chain) {
+            if (account.walletProvider === sdkApi.WalletProviderEnum.SmartContractWallet) {
+                smartWallet.initializeSmartWallet({
+                    account,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletOptions,
+                });
+            }
             return {
                 address: account.address,
                 chain: account.chain,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -1,3 +1,4 @@
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api';
 import { decodeJwt } from '../../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -11,10 +12,10 @@ import '../../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../../../shared/consts/index.js';
-import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import { findWallet } from '../findWallet/findWallet.js';
+import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
 const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt(authToken);
@@ -24,8 +25,7 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = walletOptions.find((wallet) => account.walletName &&
-            isSameWalletName(wallet.name, account.walletName));
+        const wallet = findWallet(account, walletOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
         // supports wallet W
@@ -36,7 +36,18 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
             shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // this account is the owner of a smart wallet, and should not be surfaced
+        if (isOwnerOfASmartWallet(account, decodedJwt.verifiedCredentials)) {
+            return null;
+        }
         if (account.address && account.chain) {
+            if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
+                initializeSmartWallet({
+                    account,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletOptions,
+                });
+            }
             return {
                 address: account.address,
                 chain: account.chain,

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+
+exports.findWallet = findWallet;

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.d.ts

@@ -0,0 +1,3 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
+import { WalletOption } from '../../../../../shared';
+export declare const findWallet: (account: JwtVerifiedCredential, walletOptions: WalletOption[]) => WalletOption | undefined;

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.js

@@ -0,0 +1,5 @@
+import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName(wallet.name, account.walletName));
+
+export { findWallet };

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/index.d.ts

@@ -0,0 +1 @@
+export * from './findWallet';

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/index.d.ts

@@ -0,0 +1 @@
+export * from './smartWallet';

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs

@@ -0,0 +1,36 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var findWallet = require('../findWallet/findWallet.cjs');
+
+// assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
+// the associated eoa account
+const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
+const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
+const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
+const initializeSmartWallet = ({ account, verifiedCredentials, walletOptions, }) => {
+    const owner = findOwner(account, verifiedCredentials);
+    if (!owner) {
+        throw new Error('could not find associated eoa account for smart wallet');
+    }
+    const ownerWallet = findWallet.findWallet(owner, walletOptions);
+    if (!ownerWallet) {
+        throw new Error('could not find owner wallet from wallet options');
+    }
+    const smartWallet = findWallet.findWallet(account, walletOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!walletConnectorCore.isSmartWalletConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    connector.setEoaConnector(ownerWallet.walletConnector);
+};
+
+exports.findOwner = findOwner;
+exports.findSmartWallet = findSmartWallet;
+exports.initializeSmartWallet = initializeSmartWallet;
+exports.isOwnerOfASmartWallet = isOwnerOfASmartWallet;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.d.ts

@@ -0,0 +1,10 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
+import { WalletOption } from '../../../../../shared';
+export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
+export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
+export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletOptions, }: {
+    account: JwtVerifiedCredential;
+    verifiedCredentials: JwtVerifiedCredential[];
+    walletOptions: WalletOption[];
+}) => void;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js

@@ -0,0 +1,29 @@
+import { isSmartWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { findWallet } from '../findWallet/findWallet.js';
+
+// assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
+// the associated eoa account
+const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
+const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
+const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
+const initializeSmartWallet = ({ account, verifiedCredentials, walletOptions, }) => {
+    const owner = findOwner(account, verifiedCredentials);
+    if (!owner) {
+        throw new Error('could not find associated eoa account for smart wallet');
+    }
+    const ownerWallet = findWallet(owner, walletOptions);
+    if (!ownerWallet) {
+        throw new Error('could not find owner wallet from wallet options');
+    }
+    const smartWallet = findWallet(account, walletOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!isSmartWalletConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    connector.setEoaConnector(ownerWallet.walletConnector);
+};
+
+export { findOwner, findSmartWallet, initializeSmartWallet, isOwnerOfASmartWallet };

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs

@@ -18,7 +18,7 @@ require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -90,7 +90,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         else if (multiWalletWidgetState === 'idle' && !newWallet) {
             if (user) {
                 setMultiWalletWidgetState('detected_new_wallet');
-                setSelectedWalletConnector(primaryWallet.connector);
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
                 yield computeConnectedStateForWallets();
                 return;
             }
@@ -150,7 +150,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnector(primaryWallet.connector);
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
             }
             return;
         }
@@ -162,7 +162,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         setMultiWalletWidgetState,
         primaryWallet,
         secondaryWallets,
-        setSelectedWalletConnector,
+        setSelectedWalletConnectorKey,
         setSelectedWalletWithAction,
         setPrimaryWalletId,
     ]);

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.d.ts

@@ -2,6 +2,7 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
+import { IDynamicContext } from '../../../context/DynamicContext/types';
 export type UseWalletEventListenersArgs = {
     computeConnectedStateForWallets(): Promise<void>;
     handleLogOut(): Promise<void>;
@@ -13,13 +14,13 @@ export type UseWalletEventListenersArgs = {
     selectedWalletWithAction: WalletWithAction | null;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setPrimaryWalletId(walletId: string): void;
-    setSelectedWalletConnector(connector: WalletConnector | null): void;
+    setSelectedWalletConnectorKey: IDynamicContext['setSelectedWalletConnectorKey'];
     setSelectedWalletWithAction(walletWithAction: WalletWithAction | null): void;
     user: UserProfile | undefined;
     authMode: AuthModeType;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector, shouldCallCallback?: boolean) => Promise<void>;
 };
-export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => {
+export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
     network: string | number | undefined;
     setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.js

@@ -14,7 +14,7 @@ import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
 
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
     const [network, setNetwork] = useState(undefined);
     useEffect(() => {
@@ -86,7 +86,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         else if (multiWalletWidgetState === 'idle' && !newWallet) {
             if (user) {
                 setMultiWalletWidgetState('detected_new_wallet');
-                setSelectedWalletConnector(primaryWallet.connector);
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
                 yield computeConnectedStateForWallets();
                 return;
             }
@@ -146,7 +146,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnector(primaryWallet.connector);
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
             }
             return;
         }
@@ -158,7 +158,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         setMultiWalletWidgetState,
         primaryWallet,
         secondaryWallets,
-        setSelectedWalletConnector,
+        setSelectedWalletConnectorKey,
         setSelectedWalletWithAction,
         setPrimaryWalletId,
     ]);

package/src/lib/utils/hooks/useWalletItemActions/useWalletItemActions.cjs

@@ -26,11 +26,12 @@ var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useCon
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
 require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { setError } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
@@ -39,27 +40,27 @@ const useWalletItemActions = () => {
     const handleCustodialWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const twoStepAuthentication = requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector);
         if (twoStepAuthentication) {
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             yield onlyConnectUser({
                 walletConnector,
             });
         }
         else {
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setView('pending-signature');
     });
     const handleMobileWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
         }
@@ -89,7 +90,7 @@ const useWalletItemActions = () => {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setShowAuthFlow(false);
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
     });
     const openWallet = (walletKey, handlers) => {
         const { openMobileWallet = handleMobileWalletClick, openCustodialWallet = handleCustodialWalletClick, openExtensionWallet = handleInstalledExtensionClick, } = handlers || {};

package/src/lib/utils/hooks/useWalletItemActions/useWalletItemActions.js

@@ -22,11 +22,12 @@ import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useC
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
 import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, wallets, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
     const { setError } = useErrorContext();
     const { setView } = useViewContext();
@@ -35,27 +36,27 @@ const useWalletItemActions = () => {
     const handleCustodialWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         const twoStepAuthentication = requiresTwoStepAuthentication(walletConnector);
         if (twoStepAuthentication) {
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             yield onlyConnectUser({
                 walletConnector,
             });
         }
         else {
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setView('pending-signature');
     });
     const handleMobileWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
         }
@@ -85,7 +86,7 @@ const useWalletItemActions = () => {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setShowAuthFlow(false);
-        setSelectedWalletConnector(walletConnector);
+        setSelectedWalletConnectorKey(walletConnector.key);
     });
     const openWallet = (walletKey, handlers) => {
         const { openMobileWallet = handleMobileWalletClick, openCustodialWallet = handleCustodialWalletClick, openExtensionWallet = handleInstalledExtensionClick, } = handlers || {};

package/src/lib/utils/hooks/useWallets/useWallets.cjs

@@ -33,7 +33,6 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
     }, [
         appLogoUrl,
         appName,
-        networkConfigurations,
         projectSettings,
         walletConnectorsProp,
         walletConnectV1Bridge,

package/src/lib/utils/hooks/useWallets/useWallets.js

@@ -29,7 +29,6 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
     }, [
         appLogoUrl,
         appName,
-        networkConfigurations,
         projectSettings,
         walletConnectorsProp,
         walletConnectV1Bridge,