@dynamic-labs/sdk-react-core 0.17.0-RC.0 → 0.17.0-RC.10

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');
@@ -75,7 +78,14 @@ const useWalletItemActions = () => {
         setError(undefined);
     });
     const handleAlreadyConnectedWallet = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
+        const connectedAccounts = yield walletConnector.getConnectedAccounts();
+        const activeAccountAlreadyLinked = connectedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        if (activeAccountAlreadyLinked) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
         setShowAuthFlow(false);
         setWalletConnectorAndWalletColor(walletConnector);
     });
@@ -84,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) {
@@ -95,12 +105,11 @@ const useWalletItemActions = () => {
         }
     };
     const handleWalletItemClick = (wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
         const { walletConnector, isInstalledOnBrowser } = wallet;
         if (mockedSDK)
             return;
         if (walletConnector.connectedChain === 'FLOW') {
-            yield ((_a = walletConnector.endSession) === null || _a === void 0 ? void 0 : _a.call(walletConnector));
+            yield walletConnector.endSession();
         }
         if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
@@ -111,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';
@@ -71,7 +74,14 @@ const useWalletItemActions = () => {
         setError(undefined);
     });
     const handleAlreadyConnectedWallet = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
+        const connectedAccounts = yield walletConnector.getConnectedAccounts();
+        const activeAccountAlreadyLinked = connectedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        if (activeAccountAlreadyLinked) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
         setShowAuthFlow(false);
         setWalletConnectorAndWalletColor(walletConnector);
     });
@@ -91,12 +101,11 @@ const useWalletItemActions = () => {
         }
     };
     const handleWalletItemClick = (wallet) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
         const { walletConnector, isInstalledOnBrowser } = wallet;
         if (mockedSDK)
             return;
         if (walletConnector.connectedChain === 'FLOW') {
-            yield ((_a = walletConnector.endSession) === null || _a === void 0 ? void 0 : _a.call(walletConnector));
+            yield walletConnector.endSession();
         }
         if (isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {

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,32 +5,26 @@ 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, }) => {
     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,
                     walletUiUtils,
                 });
                 const notInstalledWallets = yield data.getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
                     walletUiUtils,
                 });
                 const unfilteredWallets = [...installedWallets, ...notInstalledWallets];
@@ -38,13 +32,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfiguration
             }
         });
         getWalletList();
-    }, [
-        projectSettings,
-        appLogoUrl,
-        appName,
-        vendorCredentials,
-        networkConfigurations,
-    ]);
+    }, [projectSettings, appLogoUrl, appName, networkConfigurations]);
     return { wallets };
 };
 

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

@@ -1,16 +1,14 @@
-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 { WalletOption } from '../../../shared';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
-    magicLinkConfig?: MagicLinkConfig;
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
-    vendorCredentials?: VendorCredentials;
     walletUiUtils: WalletUiUtils;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, networkConfigurations, vendorCredentials, walletUiUtils, magicLinkConfig, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, networkConfigurations, walletUiUtils, }: Props) => {
     wallets: WalletOption[];
 };
 export {};

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

@@ -1,32 +1,26 @@
 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, }) => {
     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,
                     walletUiUtils,
                 });
                 const notInstalledWallets = yield getNotInstalledWallets(projectSettings, {
                     appLogoUrl,
                     appName,
-                    magicLinkApiKey,
-                    magicLinkConfig,
+                    customerApiProviders: projectSettings.providers || [],
                     networkConfigurations,
                     skipMemo: true,
-                    vendorCredentials,
                     walletUiUtils,
                 });
                 const unfilteredWallets = [...installedWallets, ...notInstalledWallets];
@@ -34,13 +28,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, networkConfiguration
             }
         });
         getWalletList();
-    }, [
-        projectSettings,
-        appLogoUrl,
-        appName,
-        vendorCredentials,
-        networkConfigurations,
-    ]);
+    }, [projectSettings, appLogoUrl, appName, networkConfigurations]);
     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');
 

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -5,11 +5,14 @@ import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
+import 'ethers';
 import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
+import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../context/ThemeContext/ThemeContext.js';
@@ -19,13 +22,14 @@ import '../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../config/ApiEndpoint.js';
+import '@dynamic-labs/rpc-providers';
 import { useVerifyWallet } from '../../utils/hooks/useVerifyWallet/useVerifyWallet.js';
-import 'ethers';
 import '../../context/MockContext/MockContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import { useCaptchaContext } from '../../context/CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import '../../components/IconButton/IconButton.js';
+import '../../components/Alert/Alert.js';
 import { PoweredByDynamic } from '../../components/PoweredByDynamic/PoweredByDynamic.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 

package/src/lib/views/CollectUserDataView/CollectUserDataView.cjs

@@ -9,11 +9,14 @@ var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 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 createUserProfile = require('../../utils/functions/createUserProfile/createUserProfile.cjs');
 var isSupportedNetwork = require('../../utils/functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var pixelToRem = require('../../utils/functions/pixelToRem/pixelToRem.cjs');
@@ -24,30 +27,32 @@ require('react-focus-lock');
 require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-var TextButton = require('../../components/TextButton/TextButton.cjs');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/rpc-providers');
 require('../../context/ErrorContext/ErrorContext.cjs');
-require('ethers');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var TextButton = require('../../components/TextButton/TextButton.cjs');
 require('../../components/IconButton/IconButton.cjs');
+require('../../components/Alert/Alert.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 var NetworkPicker = require('../../components/NetworkPicker/NetworkPicker.cjs');
 var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
-var UserDataForm = require('./UserDataForm/UserDataForm.cjs');
+var useFetchNameService = require('../../widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.cjs');
+var OnboardingUserDataForm = require('./OnboardingUserDataForm/OnboardingUserDataForm.cjs');
 
 const CollectUserDataView = () => {
-    var _a, _b;
     const { appName, handleLogOut, projectSettings, network, decodedOnboardingOnlyToken, selectedWalletConnector: walletConnector, onboardingImageUrl, } = useInternalDynamicContext.useInternalDynamicContext();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
+    const nameService = useFetchNameService.useFetchNameService();
     if (!walletConnector || !decodedOnboardingOnlyToken) {
         return null;
     }
     const userProfile = createUserProfile.createUserProfile(decodedOnboardingOnlyToken);
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({ network, walletConnector });
-    return (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxRuntime.jsxs(UserDataForm.UserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: ((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) ? (jsxRuntime.jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem.pixelToRem(64), width: pixelToRem.pixelToRem(64) } })) })), jsxRuntime.jsx(UserAddress.UserAddress, { userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
+    return (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxRuntime.jsxs(OnboardingUserDataForm.OnboardingUserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: (nameService === null || nameService === void 0 ? void 0 : nameService.avatar) ? (jsxRuntime.jsx("img", { src: nameService.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem.pixelToRem(64), width: pixelToRem.pixelToRem(64) } })) })), jsxRuntime.jsx(UserAddress.UserAddress, { userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxRuntime.jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
                                             `Welcome to ${appName}` })), jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeMessage) ||
                                             'We need a bit of information to get started' }))] })))] })), jsxRuntime.jsx(TextButton.TextButton, Object.assign({ className: 'collect-user-data__log-out', onClick: () => handleLogOut() }, { children: "Log out" }))] }))] })));
 };

package/src/lib/views/CollectUserDataView/CollectUserDataView.js

@@ -5,11 +5,14 @@ import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import '../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
+import 'ethers';
 import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
+import '@dynamic-labs/multi-wallet';
 import { createUserProfile } from '../../utils/functions/createUserProfile/createUserProfile.js';
 import { isSupportedNetwork } from '../../utils/functions/isSupportedNetwork/isSupportedNetwork.js';
 import { pixelToRem } from '../../utils/functions/pixelToRem/pixelToRem.js';
@@ -20,30 +23,32 @@ import 'react-focus-lock';
 import '../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../components/Transition/OpacityTransition/OpacityTransition.js';
-import { TextButton } from '../../components/TextButton/TextButton.js';
 import '../../config/ApiEndpoint.js';
+import '@dynamic-labs/rpc-providers';
 import '../../context/ErrorContext/ErrorContext.js';
-import 'ethers';
 import '../../context/MockContext/MockContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { TextButton } from '../../components/TextButton/TextButton.js';
 import '../../components/IconButton/IconButton.js';
+import '../../components/Alert/Alert.js';
 import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.js';
 import { NetworkPicker } from '../../components/NetworkPicker/NetworkPicker.js';
 import { UserAddress } from '../../components/UserAddress/UserAddress.js';
-import { UserDataForm } from './UserDataForm/UserDataForm.js';
+import { useFetchNameService } from '../../widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.js';
+import { OnboardingUserDataForm } from './OnboardingUserDataForm/OnboardingUserDataForm.js';
 
 const CollectUserDataView = () => {
-    var _a, _b;
     const { appName, handleLogOut, projectSettings, network, decodedOnboardingOnlyToken, selectedWalletConnector: walletConnector, onboardingImageUrl, } = useInternalDynamicContext();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
+    const nameService = useFetchNameService();
     if (!walletConnector || !decodedOnboardingOnlyToken) {
         return null;
     }
     const userProfile = createUserProfile(decodedOnboardingOnlyToken);
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork({ network, walletConnector });
-    return (jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsx(ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxs(UserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: ((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) ? (jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsx(WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem(64), width: pixelToRem(64) } })) })), jsx(UserAddress, { userProfile: userProfile }), jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsx(NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsx(Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
+    return (jsxs("div", Object.assign({ className: 'collect-user-data', "data-testid": 'collect-user-data-view' }, { children: [onboardingImageUrl && (jsx("img", { className: 'collect-user-data__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsx(ErrorContainer, Object.assign({ withIcon: false, className: 'collect-user-data__error--not-supported' }, { children: "This network is not available, please update." }))), jsxs("div", Object.assign({ className: 'collect-user-data__form' }, { children: [jsxs(OnboardingUserDataForm, Object.assign({ disableSubmit: !_isSupportedNetwork, userProfile: userProfile }, { children: [jsx("div", Object.assign({ className: 'collect-user-data__img-container' }, { children: (nameService === null || nameService === void 0 ? void 0 : nameService.avatar) ? (jsx("img", { src: nameService.avatar, alt: '', className: 'collect-user-data__img collect-user-data__img--rounded' })) : (jsx(WalletIcon, { walletName: walletConnector.name, style: { height: pixelToRem(64), width: pixelToRem(64) } })) })), jsx(UserAddress, { userProfile: userProfile }), jsx("div", Object.assign({ className: 'collect-user-data__network-container' }, { children: jsx(NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, showNetworkName: true, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, buttonClassName: 'collect-user-data__network-picker-button', mainClassName: 'collect-user-data__network-picker' }) })), !_isSupportedNetwork ? (jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: "Update Network" })), jsx(Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: "Your wallet is not connected to a supported network. Please update before continuing." }))] }))) : (jsxs("div", Object.assign({ className: 'collect-user-data__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'collect-user-data__welcome-title' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeHeader) ||
                                             `Welcome to ${appName}` })), jsx(Typography, Object.assign({ variant: 'body_normal', weight: 'regular', color: 'secondary' }, { children: (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general.collectUserDataWelcomeMessage) ||
                                             'We need a bit of information to get started' }))] })))] })), jsx(TextButton, Object.assign({ className: 'collect-user-data__log-out', onClick: () => handleLogOut() }, { children: "Log out" }))] }))] })));
 };

package/src/lib/views/CollectUserDataView/{UserDataForm/UserDataForm.cjs → OnboardingUserDataForm/OnboardingUserDataForm.cjs}

@@ -9,11 +9,14 @@ var formik = require('formik');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-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');
 require('@dynamic-labs/sdk-api');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -23,18 +26,19 @@ 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');
 require('../../../context/ErrorContext/ErrorContext.cjs');
-require('ethers');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useUserUpdateRequest = require('../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 var Button = require('../../../components/Button/Button.cjs');
 require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/Alert/Alert.cjs');
 var index = require('../UserDataFields/index.cjs');
 var useUserDataForm = require('../../../utils/hooks/useUserDataForm/useUserDataForm.cjs');
 
-const UserDataForm = ({ children, userProfile }) => {
-    const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+const OnboardingUserDataForm = ({ children, userProfile, disableSubmit, }) => {
+    const { policiesConsentInnerComponent, onboardingOnlyJwt, setShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const decodedJwt = decodeJwt.decodeJwt(onboardingOnlyJwt);
     const { updateUser } = useUserUpdateRequest.useUserUpdateRequestInternal({
@@ -47,7 +51,8 @@ const UserDataForm = ({ children, userProfile }) => {
             return;
         }
         setShowAuthFlow(false);
-    }), [setShowAuthFlow, setView, updateUser]);
+        setCallback('authSuccess');
+    }), [setCallback, setShowAuthFlow, setView, updateUser]);
     const { fetch: loading, formikInitialValues, formikValidationSchema, enforcePolicies, onFormSubmit, } = useUserDataForm.useUserDataForm({
         fields: (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) || [],
         onSubmit,
@@ -58,11 +63,12 @@ const UserDataForm = ({ children, userProfile }) => {
     ].flat();
     return (jsxRuntime.jsx(formik.Formik, Object.assign({ onSubmit: onFormSubmit, initialValues: formikInitialValues, validationSchema: formikValidationSchema }, { children: ({ errors, touched, values }) => {
             var _a;
-            const isSubmitBtnDisabled = enforcePolicies &&
-                (policiesConsentInnerComponentArray === null || policiesConsentInnerComponentArray === void 0 ? void 0 : policiesConsentInnerComponentArray.length) !==
-                    ((_a = values.policiesConsentArray) === null || _a === void 0 ? void 0 : _a.length);
+            const isSubmitBtnDisabled = disableSubmit ||
+                (enforcePolicies &&
+                    (policiesConsentInnerComponentArray === null || policiesConsentInnerComponentArray === void 0 ? void 0 : policiesConsentInnerComponentArray.length) !==
+                        ((_a = values.policiesConsentArray) === null || _a === void 0 ? void 0 : _a.length));
             return (jsxRuntime.jsx(formik.Form, Object.assign({ className: 'user-data-form__form' }, { children: jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [children, jsxRuntime.jsx(index.UserDataFields, { fields: decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields, errors: errors, touched: touched, policiesConsentInnerComponentArray: policiesConsentInnerComponentArray }), jsxRuntime.jsx(Button.Button, Object.assign({ type: 'submit', loading: loading, disabled: isSubmitBtnDisabled, buttonVariant: 'primary', expanded: true, buttonRounded: 'default', buttonPadding: 'large' }, { children: "Continue" }))] }) })));
         } })));
 };
 
-exports.UserDataForm = UserDataForm;
+exports.OnboardingUserDataForm = OnboardingUserDataForm;