@dynamic-labs/sdk-react-core 0.17.0-RC.1 → 0.17.0-RC.11

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

@@ -5,14 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var yup = require('yup');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var index = require('../../../shared/utils/functions/getValueByKey/index.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var index$1 = require('../../../shared/consts/index.cjs');
 var fieldsConfig = require('../../../views/CollectUserDataView/fieldsConfig.cjs');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
@@ -48,7 +50,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             return;
         try {
             if (!(userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId))
-                throw new multiWallet.DynamicError('Invalid environment ID');
+                throw new utils.DynamicError('Invalid environment ID');
             setFetch(true);
             let updatedUserFields = values;
             if (enforcePolicies) {
@@ -60,10 +62,10 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         catch (e) {
             logger.logger.error(e);
             onError === null || onError === void 0 ? void 0 : onError(e);
-            if (e.name === 'EmailAlreadyExistsError') {
+            if (e instanceof utils.EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
-            else if (e.name === 'UsernameAlreadyExistsError') {
+            else if (e instanceof utils.UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else {

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

@@ -1,14 +1,16 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useCallback } from 'react';
 import { object } from 'yup';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { getValueByKey } from '../../../shared/utils/functions/getValueByKey/index.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { countryCodes, tShirtSizes, teamNames } from '../../../shared/consts/index.js';
 import { fieldsConfig } from '../../../views/CollectUserDataView/fieldsConfig.js';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
@@ -56,10 +58,10 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         catch (e) {
             logger.error(e);
             onError === null || onError === void 0 ? void 0 : onError(e);
-            if (e.name === 'EmailAlreadyExistsError') {
+            if (e instanceof EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
-            else if (e.name === 'UsernameAlreadyExistsError') {
+            else if (e instanceof UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else {

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

@@ -3,18 +3,21 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
+require('@dynamic-labs/multi-wallet');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
 var setToLS = require('../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
+require('ethers');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
@@ -41,7 +44,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         let Jwt;
         const nonce = consumeNonce();
         if (nonce === undefined)
-            throw new multiWallet.DynamicError('Missing nonce');
+            throw new utils.DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
             displayTermsOfService,
             environmentId,
@@ -59,7 +62,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             Jwt = yield api.linkWallet(environmentId, verifyArgs, authToken);
         }
         if (Jwt === undefined)
-            throw new multiWallet.DynamicError('Could not obtain a valid JWT');
+            throw new utils.DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
         return Jwt;
     });
@@ -86,7 +89,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const handleError = (e, walletConnector) => {
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
-        if (e.name === 'WalletUsedError') {
+        if (e instanceof utils.WalletUsedError) {
             setShowAuthFlow(true);
             setView('wallet-used');
             setIsSingleWalletAccount(false);
@@ -96,16 +99,16 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             return;
         }
         walletConnector.endSession();
-        if (e.name === 'ChainalysisError') {
+        if (e instanceof utils.ChainalysisError) {
             setView('chainalysis-blocked-wallet');
             return;
         }
-        if (e.name === 'NoAccessError') {
+        if (e instanceof utils.NoAccessError) {
             setView('no-access');
             return;
         }
         if (connectedWallet && authMode === 'connect-only') {
-            throw new multiWallet.DynamicError(e.message);
+            throw new utils.DynamicError(e.message);
         }
         setView(loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list');
         logger.logger.error(e);
@@ -127,7 +130,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
-                throw new multiWallet.DynamicError('Invalid token!');
+                throw new utils.DynamicError('Invalid token!');
             const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
@@ -138,8 +141,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');

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

@@ -1,16 +1,19 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError, WalletUsedError, ChainalysisError, NoAccessError } from '@dynamic-labs/utils';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
+import '@dynamic-labs/multi-wallet';
 import { LAST_USED_WALLET } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import { logger } from '../../../shared/logger.js';
 import { setToLS } from '../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
+import 'ethers';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
@@ -82,7 +85,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const handleError = (e, walletConnector) => {
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
-        if (e.name === 'WalletUsedError') {
+        if (e instanceof WalletUsedError) {
             setShowAuthFlow(true);
             setView('wallet-used');
             setIsSingleWalletAccount(false);
@@ -92,11 +95,11 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             return;
         }
         walletConnector.endSession();
-        if (e.name === 'ChainalysisError') {
+        if (e instanceof ChainalysisError) {
             setView('chainalysis-blocked-wallet');
             return;
         }
-        if (e.name === 'NoAccessError') {
+        if (e instanceof NoAccessError) {
             setView('no-access');
             return;
         }
@@ -134,8 +137,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -12,10 +13,12 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.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');
 
@@ -89,7 +92,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
-            throw new multiWallet.DynamicError(`Wallet with id: ${walletId} not found`);
+            throw new utils.DynamicError(`Wallet with id: ${walletId} not found`);
         }
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
@@ -127,7 +130,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             setMultiWalletWidgetState('awaiting_connection');
             setShowQrcodeModal(checkIfShowQrCodeModal(newPrimaryWallet));
         }
-        if (multiWallet.isEmailWalletConnector(newPrimaryWallet.connector)) {
+        if (walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
             if (email) {

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

@@ -1,6 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
-import { DynamicError, isEmailWalletConnector } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -8,10 +9,12 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.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';
 

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

@@ -4,17 +4,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet: multiWallet$1, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -45,14 +47,14 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
                 yield computeConnectedStateForWallets();
-                if (multiWallet.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+                if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
-                else if (!multiWallet$1) {
+                else if (!multiWallet) {
                     yield handleLogOut();
                 }
                 else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    const linkedSecondaryWallet = secondaryWallets.find((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain));
+                    const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
                     // this means the user is linking a new account, so we need proof of ownership...
                     if (!linkedSecondaryWallet) {
                         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
@@ -65,11 +67,11 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                     yield computeConnectedStateForWallets();
                 }
                 else if (multiWalletWidgetState === 'idle' &&
-                    secondaryWallets.some((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain))) {
+                    secondaryWallets.some((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain))) {
                     setMultiWalletWidgetState('detected_known_secondary_wallet');
                 }
                 else if (multiWalletWidgetState === 'idle' &&
-                    !secondaryWallets.some((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain))) {
+                    !secondaryWallets.some((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain))) {
                     if (user) {
                         setMultiWalletWidgetState('detected_new_wallet');
                         setSelectedWalletConnector(primaryWallet.connector);

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

@@ -18,6 +18,6 @@ export type UseWalletEventListenersArgs = {
 };
 export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
-    network: number | undefined;
-    setNetwork: import("react").Dispatch<import("react").SetStateAction<number | undefined>>;
+    network: string | number | undefined;
+    setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;
 };

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

@@ -1,12 +1,14 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
-import { isSameAddress } from '@dynamic-labs/multi-wallet';
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();

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

@@ -4,16 +4,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('../../constants/colors.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+require('ethers');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../config/ApiEndpoint.cjs');
@@ -91,7 +94,7 @@ const useWalletItemActions = () => {
         const wallet = wallets.find((wallet) => wallet.key === walletKey);
         if (!wallet)
             return;
-        if (multiWallet.isMobile()) {
+        if (utils.isMobile()) {
             openMobileWallet(wallet.walletConnector);
         }
         else if (wallet.walletConnector.canConnectViaCustodialService) {
@@ -117,7 +120,7 @@ const useWalletItemActions = () => {
             // providers like blocto and dapper
             handleCustodialWalletClick(walletConnector);
         }
-        else if (multiWallet.isMobile()) {
+        else if (utils.isMobile()) {
             // mobile wallets
             if (walletConnector.name === 'WalletConnect') {
                 setView('wallet-connect-mobile-wallets-list');

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

@@ -1,15 +1,18 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { isMobile } from '@dynamic-labs/multi-wallet';
+import { isMobile } from '@dynamic-labs/utils';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '../../constants/colors.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import 'ethers';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../config/ApiEndpoint.js';

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

@@ -10,7 +10,9 @@ var TransactionConfirmationModal = require('../../../modals/TransactionConfirmat
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
 require('../../constants/colors.cjs');
 require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {

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

@@ -1,4 +1,4 @@
 import { ReactNode } from 'react';
-import { WalletUiUtils } from '@dynamic-labs/multi-wallet';
+import { WalletUiUtils } from '@dynamic-labs/types';
 import { WalletUiUtilsHookProps } from './useWalletUiUtils.types';
 export declare const useWalletUiUtils: ({ appLogoUrl, appName, getAppOrigin, }: WalletUiUtilsHookProps) => [ReactNode | undefined, WalletUiUtils];

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

@@ -6,7 +6,9 @@ import { TransactionConfirmationModal } from '../../../modals/TransactionConfirm
 import { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
 import '../../constants/colors.js';
 import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {

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

@@ -5,45 +5,46 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
-var getMagicLinkApiKeyFromProviders = require('./utils/getMagicLinkApiKeyFromProviders/getMagicLinkApiKeyFromProviders.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, walletUiUtils, walletConnectorsProp, }) => {
     const [wallets, setWallets] = React.useState([]);
     React.useEffect(() => {
         const getWalletList = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             if (projectSettings) {
-                const magicLinkApiKey = getMagicLinkApiKeyFromProviders.getMagicLinkApiKeyFromProviders((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []);
                 const installedWallets = yield data.getInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
+                    walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
                     walletUiUtils,
                 });
                 const notInstalledWallets = yield data.getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
+                    walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
                     walletUiUtils,
                 });
-                const unfilteredWallets = [...installedWallets, ...notInstalledWallets];
+                const unfilteredWallets = [
+                    ...installedWallets,
+                    ...notInstalledWallets,
+                ];
                 setWallets(unfilteredWallets);
             }
         });
         getWalletList();
-    }, [
+    }, 
+    // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+    [
         projectSettings,
         appLogoUrl,
         appName,
-        vendorCredentials,
         networkConfigurations,
+        walletConnectorsProp,
     ]);
     return { wallets };
 };

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

@@ -1,16 +1,16 @@
-import { MagicLinkConfig, NetworkConfigurationMap, VendorCredentials, WalletUiUtils } from '@dynamic-labs/multi-wallet';
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
+import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
+import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../shared';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
-    magicLinkConfig?: MagicLinkConfig;
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
-    vendorCredentials?: VendorCredentials;
+    walletConnectorsProp?: WalletConnectorsMethod[];
     walletUiUtils: WalletUiUtils;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, networkConfigurations, walletUiUtils, walletConnectorsProp, }: Props) => {
     wallets: WalletOption[];
 };
 export {};

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

@@ -1,45 +1,46 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
 import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
-import { getMagicLinkApiKeyFromProviders } from './utils/getMagicLinkApiKeyFromProviders/getMagicLinkApiKeyFromProviders.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfigurations, walletUiUtils, walletConnectorsProp, }) => {
     const [wallets, setWallets] = useState([]);
     useEffect(() => {
         const getWalletList = () => __awaiter(void 0, void 0, void 0, function* () {
             if (projectSettings) {
-                const magicLinkApiKey = getMagicLinkApiKeyFromProviders((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []);
                 const installedWallets = yield getInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
+                    walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
                     walletUiUtils,
                 });
                 const notInstalledWallets = yield getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
+                    walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
                     walletUiUtils,
                 });
-                const unfilteredWallets = [...installedWallets, ...notInstalledWallets];
+                const unfilteredWallets = [
+                    ...installedWallets,
+                    ...notInstalledWallets,
+                ];
                 setWallets(unfilteredWallets);
             }
         });
         getWalletList();
-    }, [
+    }, 
+    // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+    [
         projectSettings,
         appLogoUrl,
         appName,
-        vendorCredentials,
         networkConfigurations,
+        walletConnectorsProp,
     ]);
     return { wallets };
 };

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -9,11 +9,14 @@ require('react');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
+require('ethers');
 require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
@@ -23,13 +26,14 @@ require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/rpc-providers');
 var useVerifyWallet = require('../../utils/hooks/useVerifyWallet/useVerifyWallet.cjs');
-require('ethers');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 var CaptchaContext = require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 require('../../components/IconButton/IconButton.cjs');
+require('../../components/Alert/Alert.cjs');
 var PoweredByDynamic = require('../../components/PoweredByDynamic/PoweredByDynamic.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');