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

package/src/lib/utils/hooks/{useWallets → useWalletConnectorOptions}/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
-var utils = require('@dynamic-labs/utils');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -14,11 +13,12 @@ require('@dynamic-labs/wallet-book');
 require('../../../../constants/colors.cjs');
 require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+var ConnectorSetupError = require('../errors/ConnectorSetupError.cjs');
 
-const MissingMagicSetupError = new utils.DynamicError('Magic is enabled but @dynamic-labs/magic package is not set up.\nSee https://docs.dynamic.xyz/docs/reduce-bundle-size-with-modular-sdk for more information');
 const magicEmailOtpWalletConnectorKey = 'magicemailotp';
 const magicSocialWalletConnectorKey = 'magicsocial';
 const verifyMagicIsSetup = (projectSettings, walletConnectors) => {
@@ -26,10 +26,8 @@ const verifyMagicIsSetup = (projectSettings, walletConnectors) => {
     const isMagicEnabled = isProviderEnabled.isProviderEnabled((_a = projectSettings.providers) !== null && _a !== void 0 ? _a : [], sdkApi.ProviderEnum.MagicLink);
     const isMagicWalletConnectorPresent = walletConnectors.some(({ key }) => [magicEmailOtpWalletConnectorKey, magicSocialWalletConnectorKey].includes(key));
     if (isMagicEnabled && !isMagicWalletConnectorPresent) {
-        throw MissingMagicSetupError;
+        throw new ConnectorSetupError.ConnectorSetupError('Magic', 'MagicWalletConnectors');
     }
 };
 
-exports.MissingMagicSetupError = MissingMagicSetupError;
-exports.magicEmailOtpWalletConnectorKey = magicEmailOtpWalletConnectorKey;
 exports.verifyMagicIsSetup = verifyMagicIsSetup;

package/src/lib/utils/hooks/{useWallets → useWalletConnectorOptions}/utils/verifyMagicIsSetup/verifyMagicIsSetup.d.ts

@@ -1,6 +1,3 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { DynamicError } from '@dynamic-labs/utils';
-export declare const MissingMagicSetupError: DynamicError;
-export declare const magicEmailOtpWalletConnectorKey = "magicemailotp";
 export declare const verifyMagicIsSetup: (projectSettings: ProjectSettings, walletConnectors: WalletConnector[]) => void;

package/src/lib/utils/hooks/{useWallets → useWalletConnectorOptions}/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -1,5 +1,4 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
-import { DynamicError } from '@dynamic-labs/utils';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -10,11 +9,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../../constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import { ConnectorSetupError } from '../errors/ConnectorSetupError.js';
 
-const MissingMagicSetupError = new DynamicError('Magic is enabled but @dynamic-labs/magic package is not set up.\nSee https://docs.dynamic.xyz/docs/reduce-bundle-size-with-modular-sdk for more information');
 const magicEmailOtpWalletConnectorKey = 'magicemailotp';
 const magicSocialWalletConnectorKey = 'magicsocial';
 const verifyMagicIsSetup = (projectSettings, walletConnectors) => {
@@ -22,8 +22,8 @@ const verifyMagicIsSetup = (projectSettings, walletConnectors) => {
     const isMagicEnabled = isProviderEnabled((_a = projectSettings.providers) !== null && _a !== void 0 ? _a : [], ProviderEnum.MagicLink);
     const isMagicWalletConnectorPresent = walletConnectors.some(({ key }) => [magicEmailOtpWalletConnectorKey, magicSocialWalletConnectorKey].includes(key));
     if (isMagicEnabled && !isMagicWalletConnectorPresent) {
-        throw MissingMagicSetupError;
+        throw new ConnectorSetupError('Magic', 'MagicWalletConnectors');
     }
 };
 
-export { MissingMagicSetupError, magicEmailOtpWalletConnectorKey, verifyMagicIsSetup };
+export { verifyMagicIsSetup };

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyRequiredConnectorsAreSetup/index.d.ts

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

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var verifyMagicIsSetup = require('../verifyMagicIsSetup/verifyMagicIsSetup.cjs');
+var verifyZeroDevIsSetup = require('../verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs');
+
+const verifyRequiredConnectorsAreSetup = (projectSettings, walletConnectors) => {
+    verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, walletConnectors);
+    verifyZeroDevIsSetup.verifyZeroDevIsSetup(projectSettings, walletConnectors);
+};
+
+exports.verifyRequiredConnectorsAreSetup = verifyRequiredConnectorsAreSetup;

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.d.ts

@@ -0,0 +1,3 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const verifyRequiredConnectorsAreSetup: (projectSettings: ProjectSettings, walletConnectors: WalletConnector[]) => void;

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js

@@ -0,0 +1,9 @@
+import { verifyMagicIsSetup } from '../verifyMagicIsSetup/verifyMagicIsSetup.js';
+import { verifyZeroDevIsSetup } from '../verifyZeroDevIsSetup/verifyZeroDevIsSetup.js';
+
+const verifyRequiredConnectorsAreSetup = (projectSettings, walletConnectors) => {
+    verifyMagicIsSetup(projectSettings, walletConnectors);
+    verifyZeroDevIsSetup(projectSettings, walletConnectors);
+};
+
+export { verifyRequiredConnectorsAreSetup };

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/index.d.ts

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

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -0,0 +1,32 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApi = require('@dynamic-labs/sdk-api');
+require('../../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../../../constants/colors.cjs');
+require('../../../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+require('@dynamic-labs/utils');
+require('../../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+var ConnectorSetupError = require('../errors/ConnectorSetupError.cjs');
+
+const zeroDevWalletConnectorKey = 'zerodev';
+const verifyZeroDevIsSetup = (projectSettings, walletConnectors) => {
+    var _a;
+    const isZeroDevEnabled = isProviderEnabled.isProviderEnabled((_a = projectSettings.providers) !== null && _a !== void 0 ? _a : [], sdkApi.ProviderEnum.Zerodev);
+    const isZeroDevWalletConnectorPresent = walletConnectors.some(({ key }) => key === zeroDevWalletConnectorKey);
+    if (isZeroDevEnabled && !isZeroDevWalletConnectorPresent) {
+        throw new ConnectorSetupError.ConnectorSetupError('ZeroDev', 'ZeroDevSmartWalletConnectors');
+    }
+};
+
+exports.verifyZeroDevIsSetup = verifyZeroDevIsSetup;

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.d.ts

@@ -0,0 +1,3 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const verifyZeroDevIsSetup: (projectSettings: ProjectSettings, walletConnectors: WalletConnector[]) => void;

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -0,0 +1,28 @@
+import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '../../../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../../../constants/colors.js';
+import '../../../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import '@dynamic-labs/utils';
+import '../../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import { ConnectorSetupError } from '../errors/ConnectorSetupError.js';
+
+const zeroDevWalletConnectorKey = 'zerodev';
+const verifyZeroDevIsSetup = (projectSettings, walletConnectors) => {
+    var _a;
+    const isZeroDevEnabled = isProviderEnabled((_a = projectSettings.providers) !== null && _a !== void 0 ? _a : [], ProviderEnum.Zerodev);
+    const isZeroDevWalletConnectorPresent = walletConnectors.some(({ key }) => key === zeroDevWalletConnectorKey);
+    if (isZeroDevEnabled && !isZeroDevWalletConnectorPresent) {
+        throw new ConnectorSetupError('ZeroDev', 'ZeroDevSmartWalletConnectors');
+    }
+};
+
+export { verifyZeroDevIsSetup };

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

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -18,10 +19,11 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
+var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
+var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -30,9 +32,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
     const walletsBasedOnAuthMode = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -64,8 +66,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = React.useCallback(() => canHaveMultipleWalletsConnected
+    const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
+    // Keep userWallets in sync whenever linkedWallets changes
+    React.useEffect(() => {
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
+    }, [setUserWallets, wallets]);
+    const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -102,7 +109,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -154,7 +160,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -162,17 +168,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };

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

@@ -1,7 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType, UserProfile } from '../../../shared';
+import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
-import { WalletConnector } from '../../../..';
 type Props = {
     authMode: AuthModeType;
     authToken: string | undefined;
@@ -10,7 +9,7 @@ type Props = {
     setDesktopUri: Dispatch<SetStateAction<string>>;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setQrcodeUri: Dispatch<SetStateAction<string>>;
-    wallets: WalletOption[];
+    walletConnectorOptions: WalletOption[];
     setPrimaryWalletId: (walletId: string) => void;
     primaryWalletId: string | undefined;
     user?: UserProfile;
@@ -19,15 +18,12 @@ type Props = {
 };
 export interface UseWalletConnectors {
     didConnectedStateLoad: boolean;
-    getPrimaryWallet: () => Wallet | null;
-    getSecondaryWallets: () => Wallet[];
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     setPrimaryWallet: (walletId: string) => Promise<void>;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     showQrcodeModal: boolean;
-    walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
 export {};

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

@@ -1,7 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useEffect, useCallback } from 'react';
-import { isEmbeddedConnector, isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { isEmbeddedConnector, isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -14,10 +15,11 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
-import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
+import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -26,9 +28,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
     const walletsBasedOnAuthMode = useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -60,8 +62,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = useCallback(() => canHaveMultipleWalletsConnected
+    const { setUserWallets } = useInternalUserWallets();
+    // Keep userWallets in sync whenever linkedWallets changes
+    useEffect(() => {
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
+    }, [setUserWallets, wallets]);
+    const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -98,7 +105,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -150,7 +156,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -158,17 +164,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };

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

@@ -21,15 +21,15 @@ var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManu
 var findWallet = require('../findWallet/findWallet.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt.decodeJwt(authToken);
     // wallet state should be null while loading all the wallets or when there is no user
-    if (!walletOptions || !decodedJwt) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = findWallet.findWallet(account, walletOptions);
+        const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // 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
@@ -49,11 +49,12 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
                 smartWallet.initializeSmartWallet({
                     account,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions,
+                    walletConnectorOptions,
                 });
             }
             return {
                 address: account.address,
+                authenticated: true,
                 chain: account.chain,
                 connected: false,
                 connector: wallet.walletConnector,

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

@@ -2,7 +2,7 @@ import { Wallet, WalletOption } from '../../../../../shared';
 type CreateWalletsFromWalletOptionsProps = {
     authToken: string;
     primaryWalletId: string | undefined;
-    walletOptions: WalletOption[] | undefined;
+    walletConnectorOptions: WalletOption[] | undefined;
 };
-export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletConnectorOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
 export {};

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

@@ -17,15 +17,15 @@ import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldMa
 import { findWallet } from '../findWallet/findWallet.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt(authToken);
     // wallet state should be null while loading all the wallets or when there is no user
-    if (!walletOptions || !decodedJwt) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = findWallet(account, walletOptions);
+        const wallet = findWallet(account, walletConnectorOptions);
         // 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
@@ -45,11 +45,12 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
                 initializeSmartWallet({
                     account,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions,
+                    walletConnectorOptions,
                 });
             }
             return {
                 address: account.address,
+                authenticated: true,
                 chain: account.chain,
                 connected: false,
                 connector: wallet.walletConnector,

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

@@ -11,16 +11,16 @@ var findWallet = require('../findWallet/findWallet.cjs');
 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, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const initializeSmartWallet = ({ account, verifiedCredentials, walletConnectorOptions, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     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);
+    const ownerWallet = findWallet.findWallet(owner, walletConnectorOptions);
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
-    const smartWallet = findWallet.findWallet(account, walletOptions);
+    const smartWallet = findWallet.findWallet(account, walletConnectorOptions);
     if (!smartWallet) {
         throw new Error('could not find smart wallet from wallet options');
     }

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

@@ -3,8 +3,8 @@ 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, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, }: {
     account: JwtVerifiedCredential;
     verifiedCredentials: JwtVerifiedCredential[];
-    walletOptions: WalletOption[];
+    walletConnectorOptions: WalletOption[];
 }) => Promise<void>;

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

@@ -7,16 +7,16 @@ import { findWallet } from '../findWallet/findWallet.js';
 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, }) => __awaiter(void 0, void 0, void 0, function* () {
+const initializeSmartWallet = ({ account, verifiedCredentials, walletConnectorOptions, }) => __awaiter(void 0, void 0, void 0, function* () {
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
     }
-    const ownerWallet = findWallet(owner, walletOptions);
+    const ownerWallet = findWallet(owner, walletConnectorOptions);
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
-    const smartWallet = findWallet(account, walletOptions);
+    const smartWallet = findWallet(account, walletConnectorOptions);
     if (!smartWallet) {
         throw new Error('could not find smart wallet from wallet options');
     }

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

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

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

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * This takes a userWallets and linkedWallets array, and returns a new userWallets array
+ * updated to match the linkedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the linkedWallets.
+ */
+const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) => {
+    const userWalletsCopy = [...userWallets];
+    /** We will use this to find wallets addresses that were removed */
+    const newWalletsAddresses = new Set();
+    // First pass: add missing wallets and update changed properties
+    for (const authenticatedWallet of authenticatedWallets) {
+        newWalletsAddresses.add(authenticatedWallet.address);
+        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address);
+        // Catch new wallets
+        if (respectiveIndex === -1) {
+            userWalletsCopy.push(authenticatedWallet);
+            continue;
+        }
+        // If already present, just update to match the new state
+        userWalletsCopy[respectiveIndex] = authenticatedWallet;
+        // NOTE: this will actually update the wallet's ID if it changed, which happens when a wallet is signed
+        // It initially has a id in the format "connected-wallet-X", and after being signed it changes to a hash
+    }
+    // This filter is to remove a wallet that was previously added to userWallets but is not present
+    // among the verified credentials wallets anymore
+    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address));
+};
+
+exports.updateUserWalletsFromLinkedWallets = updateUserWalletsFromLinkedWallets;

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

@@ -0,0 +1,8 @@
+import { Wallet } from '../../../../../shared';
+/**
+ * This takes a userWallets and linkedWallets array, and returns a new userWallets array
+ * updated to match the linkedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the linkedWallets.
+ */
+export declare const updateUserWalletsFromLinkedWallets: (userWallets: Wallet[], authenticatedWallets: Wallet[]) => Wallet[];

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

@@ -0,0 +1,30 @@
+/**
+ * This takes a userWallets and linkedWallets array, and returns a new userWallets array
+ * updated to match the linkedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the linkedWallets.
+ */
+const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) => {
+    const userWalletsCopy = [...userWallets];
+    /** We will use this to find wallets addresses that were removed */
+    const newWalletsAddresses = new Set();
+    // First pass: add missing wallets and update changed properties
+    for (const authenticatedWallet of authenticatedWallets) {
+        newWalletsAddresses.add(authenticatedWallet.address);
+        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address);
+        // Catch new wallets
+        if (respectiveIndex === -1) {
+            userWalletsCopy.push(authenticatedWallet);
+            continue;
+        }
+        // If already present, just update to match the new state
+        userWalletsCopy[respectiveIndex] = authenticatedWallet;
+        // NOTE: this will actually update the wallet's ID if it changed, which happens when a wallet is signed
+        // It initially has a id in the format "connected-wallet-X", and after being signed it changes to a hash
+    }
+    // This filter is to remove a wallet that was previously added to userWallets but is not present
+    // among the verified credentials wallets anymore
+    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address));
+};
+
+export { updateUserWalletsFromLinkedWallets };