@dynamic-labs/sdk-react-core 0.18.0-RC.12 → 0.18.0-RC.13

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## [0.18.0-RC.13](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.12...v0.18.0-RC.13) (2023-07-11)
+
+
+### Features
+
+* **DynamicContextProvider:** expose socialProviderFilter to modify social provider display order ([#2607](https://github.com/dynamic-labs/DynamicAuth/issues/2607)) ([0f03260](https://github.com/dynamic-labs/DynamicAuth/commit/0f03260e739da3e68c32a2a87a2ca629bb1f28b5))
+* **GVTY-21:** Blocto Email provider ([#2524](https://github.com/dynamic-labs/DynamicAuth/issues/2524)) ([434ce59](https://github.com/dynamic-labs/DynamicAuth/commit/434ce598b3bc13841121b61e5ead7547d3c44eea))
+* listen for the network change in network not supported views ([#2611](https://github.com/dynamic-labs/DynamicAuth/issues/2611)) ([957fbce](https://github.com/dynamic-labs/DynamicAuth/commit/957fbce55d7906f9d6b109838035b2c0306a4b85))
+
+
+### Bug Fixes
+
+* Clean up provider re-initializing after logout ([#2632](https://github.com/dynamic-labs/DynamicAuth/issues/2632)) ([fbc2201](https://github.com/dynamic-labs/DynamicAuth/commit/fbc22013d6784061cb4fdd72e24695c89f0e2fe5))
+* **MagicWalletConnector:** check if user is logged when getting balance ([#2614](https://github.com/dynamic-labs/DynamicAuth/issues/2614)) ([ced9d66](https://github.com/dynamic-labs/DynamicAuth/commit/ced9d66cb335c3033a18642bdd841ee6be6c1e05))
+* **useValidateSessin:** only check for bridge on wallet connect wallets ([#2571](https://github.com/dynamic-labs/DynamicAuth/issues/2571)) ([349b659](https://github.com/dynamic-labs/DynamicAuth/commit/349b65963f1d5392f63aaa138f6498f0d17cd43f))
+
 ## [0.18.0-RC.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.11...v0.18.0-RC.12) (2023-07-07)
 
 

package/package.cjs

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.18.0-RC.12";
+var version = "0.18.0-RC.13";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",
-	"@dynamic-labs/sdk-api": "0.0.222",
+	"@dynamic-labs/sdk-api": "0.0.228",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	yup: "0.32.11",

package/package.js

@@ -1,8 +1,8 @@
-var version = "0.18.0-RC.12";
+var version = "0.18.0-RC.13";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",
-	"@dynamic-labs/sdk-api": "0.0.222",
+	"@dynamic-labs/sdk-api": "0.0.228",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	yup: "0.32.11",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.0-RC.12",
+  "version": "0.18.0-RC.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -9,20 +9,20 @@
   "dependencies": {
     "react-focus-lock": "2.9.2",
     "@dynamic-labs/iconic": "0.1.23",
-    "@dynamic-labs/sdk-api": "0.0.222",
+    "@dynamic-labs/sdk-api": "0.0.228",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
     "yup": "0.32.11",
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.18.0-RC.12",
-    "@dynamic-labs/multi-wallet": "0.18.0-RC.12",
-    "@dynamic-labs/rpc-providers": "0.18.0-RC.12",
-    "@dynamic-labs/types": "0.18.0-RC.12",
-    "@dynamic-labs/utils": "0.18.0-RC.12",
-    "@dynamic-labs/wallet-book": "0.18.0-RC.12",
-    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.12"
+    "@dynamic-labs/logger": "0.18.0-RC.13",
+    "@dynamic-labs/multi-wallet": "0.18.0-RC.13",
+    "@dynamic-labs/rpc-providers": "0.18.0-RC.13",
+    "@dynamic-labs/types": "0.18.0-RC.13",
+    "@dynamic-labs/utils": "0.18.0-RC.13",
+    "@dynamic-labs/wallet-book": "0.18.0-RC.13",
+    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.13"
   },
   "devDependencies": {
     "semver": "7.3.8"

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -91,7 +91,7 @@ var useSetShowAuthFlowWithInit = require('./hooks/useSetShowAuthFlowWithInit/use
 
 const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
-const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, }, children, theme, }) => {
+const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, socialProvidersFilter, }, children, theme, }) => {
     var _a, _b, _c, _d, _e, _f, _g;
     if (!environmentId) {
         throw new utils.MissingEnvironmentIdError();
@@ -446,6 +446,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             socialMediaIconUrl: ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general) === null || _a === void 0 ? void 0 : _a.supportUrls) || socialMediaIconUrl,
             socialMediaLinkText,
             socialMediaUrl,
+            socialProvidersFilter,
             termsOfServiceUrl,
             theme,
             toolkitEnabled,
@@ -459,6 +460,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             walletsToConnectByChain,
         });
     }, [
+        socialProvidersFilter,
         accessDeniedButton,
         accessDeniedMessagePrimary,
         accessDeniedMessageSecondary,

package/src/lib/context/DynamicContext/DynamicContext.d.ts

@@ -2,7 +2,7 @@ import { Dispatch, SetStateAction, ReactNode } from 'react';
 import { WalletConnector, FetchPublicAddressOpts, WalletConnectorsMethod, Chain } from '@dynamic-labs/wallet-connector-core';
 import { DynamicJwt, NameServiceData, ProjectSettings } from '@dynamic-labs/sdk-api';
 import { LogLevel } from '@dynamic-labs/logger';
-import { EvmNetwork, NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
+import { EvmNetwork, NetworkConfigurationMap, SocialProviderFilter, WalletUiUtils } from '@dynamic-labs/types';
 import { WalletOption, UserProfile, Wallet, MultiWalletWidgetState, AccountSwitchState, AwaitingSignatureState, ChainToWalletMap, AuthModeType, DynamicRPCProviders, DynamicEventsCallbacks, WalletWithAction, AccessDeniedCustomButton } from '../../shared';
 import { ThemeData, ThemeSetting } from '../ThemeContext';
 import { MultiWalletWidgetStateSetter } from '../../utils/hooks/multiWallet';
@@ -128,6 +128,7 @@ export interface IDynamicContext {
     walletUiUtils: WalletUiUtils;
     wallets: WalletOption[];
     walletsFilter?: (options: WalletOption[]) => WalletOption[];
+    socialProvidersFilter?: SocialProviderFilter;
     removeConnectedWalletsInfo: () => void;
 }
 export interface DynamicContextProps {
@@ -179,8 +180,9 @@ export interface DynamicContextProps {
         walletConnectV1Bridge?: string;
         walletConnectors?: WalletConnectorsMethod[];
         walletsFilter?: (options: WalletOption[]) => WalletOption[];
+        socialProvidersFilter?: SocialProviderFilter;
     };
     theme?: ThemeData | ThemeSetting;
 }
 export declare const DynamicContext: import("react").Context<IDynamicContext | undefined>;
-export declare const DynamicContextProvider: ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl, appName, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow, flowNetwork, initialAuthenticationMode, debugError, displayTermsOfService, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel, multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, }, children, theme, }: DynamicContextProps) => JSX.Element;
+export declare const DynamicContextProvider: ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl, appName, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow, flowNetwork, initialAuthenticationMode, debugError, displayTermsOfService, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel, multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, socialProvidersFilter, }, children, theme, }: DynamicContextProps) => JSX.Element;

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -87,7 +87,7 @@ import { useSetShowAuthFlowWithInit } from './hooks/useSetShowAuthFlowWithInit/u
 
 const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
-const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, }, children, theme, }) => {
+const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, socialProvidersFilter, }, children, theme, }) => {
     var _a, _b, _c, _d, _e, _f, _g;
     if (!environmentId) {
         throw new MissingEnvironmentIdError();
@@ -442,6 +442,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             socialMediaIconUrl: ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general) === null || _a === void 0 ? void 0 : _a.supportUrls) || socialMediaIconUrl,
             socialMediaLinkText,
             socialMediaUrl,
+            socialProvidersFilter,
             termsOfServiceUrl,
             theme,
             toolkitEnabled,
@@ -455,6 +456,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             walletsToConnectByChain,
         });
     }, [
+        socialProvidersFilter,
         accessDeniedButton,
         accessDeniedMessagePrimary,
         accessDeniedMessageSecondary,

package/src/lib/utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs

@@ -6,6 +6,7 @@ var sdkApi = require('@dynamic-labs/sdk-api');
 var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
 
 const isEmailProviderEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly) ||
+    isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Blocto) ||
     isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink);
 
 exports.isEmailProviderEnabled = isEmailProviderEnabled;

package/src/lib/utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js

@@ -2,6 +2,7 @@ import { ProviderEnum } from '@dynamic-labs/sdk-api';
 import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
 
 const isEmailProviderEnabled = (providers) => isProviderEnabled(providers, ProviderEnum.EmailOnly) ||
+    isProviderEnabled(providers, ProviderEnum.Blocto) ||
     isProviderEnabled(providers, ProviderEnum.MagicLink);
 
 export { isEmailProviderEnabled };

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
 
-const specialCareWallets = ['slope', 'myalgo'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
 
-const specialCareWallets = ['slope', 'myalgo'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -43,13 +43,13 @@ const useConnectAndSign = () => {
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
+            yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
-                else {
+                else if (!walletConnectorCore.isBloctoConnector(walletConnector)) {
                     setView('wait-for-email-confirmation-view');
                 }
             }
@@ -75,7 +75,8 @@ const useConnectAndSign = () => {
                 setView('captcha');
                 return;
             }
-            if (!walletConnectorCore.isEmailWalletConnector(walletConnector)) {
+            if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
+                walletConnectorCore.isBloctoConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -39,13 +39,13 @@ const useConnectAndSign = () => {
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        yield showPendingConnectView(walletConnector, setView);
         try {
+            yield showPendingConnectView(walletConnector, setView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
-                else {
+                else if (!isBloctoConnector(walletConnector)) {
                     setView('wait-for-email-confirmation-view');
                 }
             }
@@ -71,7 +71,8 @@ const useConnectAndSign = () => {
                 setView('captcha');
                 return;
             }
-            if (!isEmailWalletConnector(walletConnector)) {
+            if (!isEmailWalletConnector(walletConnector) ||
+                isBloctoConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {

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

@@ -28,3 +28,4 @@ export { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect/useIsomor
 export { useTimeout } from './useTimeout/useTimeout';
 export { useInterval } from './useInterval/useInterval';
 export { useCountdown } from './useCountdown/useCountdown';
+export { useWalletConnectorEvents } from './useWalletConnectorEvents/useWalletConnectorEvents';

package/src/lib/utils/hooks/useConnectWithEmail/index.d.ts

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

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

@@ -20,9 +20,8 @@ var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 
 const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {
     const { error } = ErrorContext.useErrorContext();
-    const [email, setEmail] = React.useState('');
     const [loading, setLoading] = React.useState(false);
-    const connectWithEmail = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectWithEmail = (email) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!email || !emailWalletConnector || loading)
             return;
         setLoading(true);
@@ -42,9 +41,7 @@ const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {
     }, [error, loading]);
     return {
         connectWithEmail,
-        email,
         loading,
-        setEmail,
     };
 };
 

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

@@ -1,13 +1,10 @@
-/// <reference types="react" />
 import { IEmailWalletConnector, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 type ConnectWithEmailProps = {
     emailWalletConnector: IEmailWalletConnector | undefined;
     handleConnect: (walletConnector: WalletConnector) => Promise<void>;
 };
 export declare const useConnectWithEmail: ({ emailWalletConnector, handleConnect, }: ConnectWithEmailProps) => {
-    connectWithEmail: () => Promise<void>;
-    email: string;
+    connectWithEmail: (email: string) => Promise<void>;
     loading: boolean;
-    setEmail: import("react").Dispatch<import("react").SetStateAction<string>>;
 };
 export {};

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

@@ -16,9 +16,8 @@ import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 
 const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {
     const { error } = useErrorContext();
-    const [email, setEmail] = useState('');
     const [loading, setLoading] = useState(false);
-    const connectWithEmail = () => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWithEmail = (email) => __awaiter(void 0, void 0, void 0, function* () {
         if (!email || !emailWalletConnector || loading)
             return;
         setLoading(true);
@@ -38,9 +37,7 @@ const useConnectWithEmail = ({ emailWalletConnector, handleConnect, }) => {
     }, [error, loading]);
     return {
         connectWithEmail,
-        email,
         loading,
-        setEmail,
     };
 };
 

package/src/lib/utils/hooks/useEmailProvider/index.d.ts

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

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

@@ -0,0 +1,54 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var sdkApi = require('@dynamic-labs/sdk-api');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+var EmailVerificationContext = require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
+var useConnectWithEmail = require('../useConnectWithEmail/useConnectWithEmail.cjs');
+var api = require('../../../data/api.cjs');
+
+const useEmailProvider = ({ emailWalletConnector }) => {
+    const { projectSettings, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setEmail: setEmailForVerification, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
+    const { setView } = ViewContext.useViewContext();
+    const { handleInstalledExtensionClick } = useWalletItemActions.useWalletItemActions();
+    const { connectWithEmail, loading: isEmailProviderLoading } = useConnectWithEmail.useConnectWithEmail({
+        emailWalletConnector,
+        handleConnect: handleInstalledExtensionClick,
+    });
+    const { providers } = projectSettings || {};
+    const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.provider === sdkApi.ProviderEnum.MagicLink ||
+            provider.provider === sdkApi.ProviderEnum.Blocto).length);
+    const handleEmailOnlyLoginSubmit = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const { email, verificationUUID } = yield api.createEmailVerification({
+            email: emailInput,
+            environmentId,
+        });
+        setView('login-with-email-verification');
+        setEmailForVerification(email);
+        setVerificationUUID(verificationUUID);
+    });
+    const handleMagicLinkOrBloctoSubmit = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        yield connectWithEmail(emailInput);
+    });
+    const submitEmail = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (isMagicOrBloctoEnabled) {
+            yield handleMagicLinkOrBloctoSubmit(emailInput);
+            return;
+        }
+        yield handleEmailOnlyLoginSubmit(emailInput);
+    });
+    return {
+        handleEmailOnlyLoginSubmit,
+        isEmailProviderLoading,
+        submitEmail,
+    };
+};
+
+exports.useEmailProvider = useEmailProvider;

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

@@ -0,0 +1,10 @@
+import { IEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+type Props = {
+    emailWalletConnector: IEmailWalletConnector | undefined;
+};
+export declare const useEmailProvider: ({ emailWalletConnector }: Props) => {
+    handleEmailOnlyLoginSubmit: (emailInput: string) => Promise<void>;
+    isEmailProviderLoading: boolean;
+    submitEmail: (emailInput: string) => Promise<void>;
+};
+export {};

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

@@ -0,0 +1,50 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import { useEmailVerificationContext } from '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
+import { useConnectWithEmail } from '../useConnectWithEmail/useConnectWithEmail.js';
+import { createEmailVerification } from '../../../data/api.js';
+
+const useEmailProvider = ({ emailWalletConnector }) => {
+    const { projectSettings, environmentId } = useInternalDynamicContext();
+    const { setEmail: setEmailForVerification, setVerificationUUID } = useEmailVerificationContext();
+    const { setView } = useViewContext();
+    const { handleInstalledExtensionClick } = useWalletItemActions();
+    const { connectWithEmail, loading: isEmailProviderLoading } = useConnectWithEmail({
+        emailWalletConnector,
+        handleConnect: handleInstalledExtensionClick,
+    });
+    const { providers } = projectSettings || {};
+    const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.provider === ProviderEnum.MagicLink ||
+            provider.provider === ProviderEnum.Blocto).length);
+    const handleEmailOnlyLoginSubmit = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
+        const { email, verificationUUID } = yield createEmailVerification({
+            email: emailInput,
+            environmentId,
+        });
+        setView('login-with-email-verification');
+        setEmailForVerification(email);
+        setVerificationUUID(verificationUUID);
+    });
+    const handleMagicLinkOrBloctoSubmit = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
+        yield connectWithEmail(emailInput);
+    });
+    const submitEmail = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
+        if (isMagicOrBloctoEnabled) {
+            yield handleMagicLinkOrBloctoSubmit(emailInput);
+            return;
+        }
+        yield handleEmailOnlyLoginSubmit(emailInput);
+    });
+    return {
+        handleEmailOnlyLoginSubmit,
+        isEmailProviderLoading,
+        submitEmail,
+    };
+};
+
+export { useEmailProvider };

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

@@ -40,6 +40,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
         let currentWalletConnectV1Bridge;
         if (walletConnectors) {
             for (const connector of walletConnectors) {
+                if (!connector.isWalletConnect) {
+                    continue;
+                }
                 const session = yield connector.getSession();
                 const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
                 if (bridge) {

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

@@ -36,6 +36,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
         let currentWalletConnectV1Bridge;
         if (walletConnectors) {
             for (const connector of walletConnectors) {
+                if (!connector.isWalletConnect) {
+                    continue;
+                }
                 const session = yield connector.getSession();
                 const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
                 if (bridge) {

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

@@ -0,0 +1,17 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+const useWalletConnectorEvents = (walletConnector, listeners) => {
+    React.useEffect(() => {
+        if (!walletConnector || !listeners) {
+            return;
+        }
+        walletConnector.setupEventListeners(listeners);
+        return () => walletConnector.teardownEventListeners();
+    }, [walletConnector, listeners]);
+};
+
+exports.useWalletConnectorEvents = useWalletConnectorEvents;

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

@@ -0,0 +1,2 @@
+import { WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
+export declare const useWalletConnectorEvents: (walletConnector?: WalletConnector | null, listeners?: Partial<WalletEventListeners>) => void;

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

@@ -0,0 +1,13 @@
+import { useEffect } from 'react';
+
+const useWalletConnectorEvents = (walletConnector, listeners) => {
+    useEffect(() => {
+        if (!walletConnector || !listeners) {
+            return;
+        }
+        walletConnector.setupEventListeners(listeners);
+        return () => walletConnector.teardownEventListeners();
+    }, [walletConnector, listeners]);
+};
+
+export { useWalletConnectorEvents };

package/src/lib/views/LoginWithEmailView/components/LoginWithEmailForm/LoginWithEmailForm.cjs

@@ -7,113 +7,86 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var sdkApi = require('@dynamic-labs/sdk-api');
-require('@dynamic-labs/utils');
-var api = require('../../../../data/api.cjs');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
+require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/rpc-providers');
-require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('react-dom');
+require('@dynamic-labs/multi-wallet');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var Input = require('../../../../components/Input/Input.cjs');
+require('react-dom');
 require('react-focus-lock');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-var Button = require('../../../../components/Button/Button.cjs');
+var api = require('../../../../data/api.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
+var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
+var Button = require('../../../../components/Button/Button.cjs');
 require('../../../../components/Alert/Alert.cjs');
+require('../../../../context/MockContext/MockContext.cjs');
+require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
-var useWalletItemActions = require('../../../../utils/hooks/useWalletItemActions/useWalletItemActions.cjs');
-require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
-var useConnectWithEmail = require('../../../../utils/hooks/useConnectWithEmail/useConnectWithEmail.cjs');
-var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 var LoadingContext = require('../../../../context/LoadingContext/LoadingContext.cjs');
+var useEmailProvider = require('../../../../utils/hooks/useEmailProvider/useEmailProvider.cjs');
 
 const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginWithEmailForm = () => {
     const { environmentId, wallets, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { setEmail: setEmailForVerification, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
     const [emailInput, setEmailInput] = React.useState('');
     const [emailError, setEmailError] = React.useState(false);
     const emailWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(walletConnectorCore.isEmailWalletConnector);
-    const { handleInstalledExtensionClick } = useWalletItemActions.useWalletItemActions();
-    const { connectWithEmail, email: magicEmail, setEmail: setEmailForMagic, loading: isMagicLoading, } = useConnectWithEmail.useConnectWithEmail({
+    const { handleEmailOnlyLoginSubmit, submitEmail, isEmailProviderLoading } = useEmailProvider.useEmailProvider({
         emailWalletConnector,
-        handleConnect: handleInstalledExtensionClick,
     });
-    const isLoading = React.useMemo(() => isMagicLoading || loading, [isMagicLoading, loading]);
-    const handleMagicOnChangeEvent = (event) => {
-        const { value } = event.currentTarget;
-        setEmailForMagic(value);
-    };
+    const isLoading = React.useMemo(() => isEmailProviderLoading || loading, [isEmailProviderLoading, loading]);
     const handleEmailOnChangeEvent = (event) => {
         const { value } = event.currentTarget;
         setEmailInput(value);
     };
-    const handleMagicLinkSubmit = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        yield connectWithEmail();
-    });
-    const handleEmailLoginSubmit = (emailInputOverride) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const emailToVerify = emailInputOverride !== null && emailInputOverride !== void 0 ? emailInputOverride : emailInput;
-        const { email, verificationUUID } = yield api.createEmailVerification({
-            email: emailToVerify,
-            environmentId,
-        });
-        setView('login-with-email-verification');
-        setEmailForVerification(email);
-        setVerificationUUID(verificationUUID);
-    });
-    const magicLinkEnabled = emailWalletConnector !== undefined;
-    const submitHandler = magicLinkEnabled
-        ? handleMagicLinkSubmit
-        : handleEmailLoginSubmit;
-    const onChangeHandler = magicLinkEnabled
-        ? handleMagicOnChangeEvent
-        : handleEmailOnChangeEvent;
-    const emailValue = magicLinkEnabled ? magicEmail : emailInput;
+    const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    const onChangeHandler = handleEmailOnChangeEvent;
     const handleSubmit = (e) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         e.preventDefault();
-        if (!EMAIL_REGEX.test(emailValue)) {
+        if (!EMAIL_REGEX.test(emailInput)) {
             setEmailError(true);
             return;
         }
         try {
             setLoading(true);
-            if (magicLinkEnabled &&
+            if (isInjectedWalletProviderEnabled &&
                 (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
                 // see: https://linear.app/dynamic-labs/issue/DYN-2517
                 // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
                 const { emailProvider } = yield api.getEmailProvider({
-                    email: emailValue,
+                    email: emailInput,
                     environmentId,
                 });
                 if (emailProvider === sdkApi.ProviderEnum.EmailOnly) {
-                    yield handleEmailLoginSubmit(emailValue);
+                    yield handleEmailOnlyLoginSubmit(emailInput);
                     return;
                 }
             }
-            yield submitHandler();
+            yield submitEmail(emailInput);
         }
         catch (error) {
             logger.logger.debug(error);
@@ -124,7 +97,7 @@ const LoginWithEmailForm = () => {
         }
     });
     // social sign in currently coupled to email... might be better to decouple
-    return (jsxRuntime.jsxs("form", Object.assign({ className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e) }, { children: [jsxRuntime.jsx(Input.Input, { id: 'email_field', value: emailValue, onChange: onChangeHandler, label: 'Enter your email', error: emailError, message: emailError && 'Please enter a valid email address' }), jsxRuntime.jsx(Button.Button, Object.assign({ buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'primary', buttonPadding: 'large', buttonRounded: 'medium', expanded: true }, { children: "Continue" }))] })));
+    return (jsxRuntime.jsxs("form", Object.assign({ className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e) }, { children: [jsxRuntime.jsx(Input.Input, { id: 'email_field', value: emailInput, onChange: onChangeHandler, label: 'Enter your email', error: emailError, message: emailError && 'Please enter a valid email address' }), jsxRuntime.jsx(Button.Button, Object.assign({ buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'primary', buttonPadding: 'large', buttonRounded: 'medium', expanded: true }, { children: "Continue" }))] })));
 };
 
 exports.EMAIL_REGEX = EMAIL_REGEX;

package/src/lib/views/LoginWithEmailView/components/LoginWithEmailForm/LoginWithEmailForm.js

@@ -3,113 +3,86 @@ import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useMemo } from 'react';
 import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
-import '@dynamic-labs/utils';
-import { getEmailProvider, createEmailVerification } from '../../../../data/api.js';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
+import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/rpc-providers';
-import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
-import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import 'react-dom';
+import '@dynamic-labs/multi-wallet';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { Input } from '../../../../components/Input/Input.js';
+import 'react-dom';
 import 'react-focus-lock';
 import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import { Button } from '../../../../components/Button/Button.js';
+import { getEmailProvider } from '../../../../data/api.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
+import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
+import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../components/IconButton/IconButton.js';
+import { Button } from '../../../../components/Button/Button.js';
 import '../../../../components/Alert/Alert.js';
+import '../../../../context/MockContext/MockContext.js';
+import '../../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
 import '../../../../components/InlineWidget/InlineWidget.js';
-import { useWalletItemActions } from '../../../../utils/hooks/useWalletItemActions/useWalletItemActions.js';
-import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
-import { useConnectWithEmail } from '../../../../utils/hooks/useConnectWithEmail/useConnectWithEmail.js';
-import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import { useLoadingContext } from '../../../../context/LoadingContext/LoadingContext.js';
+import { useEmailProvider } from '../../../../utils/hooks/useEmailProvider/useEmailProvider.js';
 
 const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
 const LoginWithEmailForm = () => {
     const { environmentId, wallets, projectSettings } = useInternalDynamicContext();
-    const { setView } = useViewContext();
     const { loading, setLoading } = useLoadingContext();
     const { setErrorMessage } = useErrorContext();
-    const { setEmail: setEmailForVerification, setVerificationUUID } = useEmailVerificationContext();
     const [emailInput, setEmailInput] = useState('');
     const [emailError, setEmailError] = useState(false);
     const emailWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(isEmailWalletConnector);
-    const { handleInstalledExtensionClick } = useWalletItemActions();
-    const { connectWithEmail, email: magicEmail, setEmail: setEmailForMagic, loading: isMagicLoading, } = useConnectWithEmail({
+    const { handleEmailOnlyLoginSubmit, submitEmail, isEmailProviderLoading } = useEmailProvider({
         emailWalletConnector,
-        handleConnect: handleInstalledExtensionClick,
     });
-    const isLoading = useMemo(() => isMagicLoading || loading, [isMagicLoading, loading]);
-    const handleMagicOnChangeEvent = (event) => {
-        const { value } = event.currentTarget;
-        setEmailForMagic(value);
-    };
+    const isLoading = useMemo(() => isEmailProviderLoading || loading, [isEmailProviderLoading, loading]);
     const handleEmailOnChangeEvent = (event) => {
         const { value } = event.currentTarget;
         setEmailInput(value);
     };
-    const handleMagicLinkSubmit = () => __awaiter(void 0, void 0, void 0, function* () {
-        yield connectWithEmail();
-    });
-    const handleEmailLoginSubmit = (emailInputOverride) => __awaiter(void 0, void 0, void 0, function* () {
-        const emailToVerify = emailInputOverride !== null && emailInputOverride !== void 0 ? emailInputOverride : emailInput;
-        const { email, verificationUUID } = yield createEmailVerification({
-            email: emailToVerify,
-            environmentId,
-        });
-        setView('login-with-email-verification');
-        setEmailForVerification(email);
-        setVerificationUUID(verificationUUID);
-    });
-    const magicLinkEnabled = emailWalletConnector !== undefined;
-    const submitHandler = magicLinkEnabled
-        ? handleMagicLinkSubmit
-        : handleEmailLoginSubmit;
-    const onChangeHandler = magicLinkEnabled
-        ? handleMagicOnChangeEvent
-        : handleEmailOnChangeEvent;
-    const emailValue = magicLinkEnabled ? magicEmail : emailInput;
+    const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    const onChangeHandler = handleEmailOnChangeEvent;
     const handleSubmit = (e) => __awaiter(void 0, void 0, void 0, function* () {
         e.preventDefault();
-        if (!EMAIL_REGEX.test(emailValue)) {
+        if (!EMAIL_REGEX.test(emailInput)) {
             setEmailError(true);
             return;
         }
         try {
             setLoading(true);
-            if (magicLinkEnabled &&
+            if (isInjectedWalletProviderEnabled &&
                 (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
                 // see: https://linear.app/dynamic-labs/issue/DYN-2517
                 // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
                 const { emailProvider } = yield getEmailProvider({
-                    email: emailValue,
+                    email: emailInput,
                     environmentId,
                 });
                 if (emailProvider === ProviderEnum.EmailOnly) {
-                    yield handleEmailLoginSubmit(emailValue);
+                    yield handleEmailOnlyLoginSubmit(emailInput);
                     return;
                 }
             }
-            yield submitHandler();
+            yield submitEmail(emailInput);
         }
         catch (error) {
             logger.debug(error);
@@ -120,7 +93,7 @@ const LoginWithEmailForm = () => {
         }
     });
     // social sign in currently coupled to email... might be better to decouple
-    return (jsxs("form", Object.assign({ className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e) }, { children: [jsx(Input, { id: 'email_field', value: emailValue, onChange: onChangeHandler, label: 'Enter your email', error: emailError, message: emailError && 'Please enter a valid email address' }), jsx(Button, Object.assign({ buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'primary', buttonPadding: 'large', buttonRounded: 'medium', expanded: true }, { children: "Continue" }))] })));
+    return (jsxs("form", Object.assign({ className: 'login-with-email-form', onSubmit: (e) => handleSubmit(e) }, { children: [jsx(Input, { id: 'email_field', value: emailInput, onChange: onChangeHandler, label: 'Enter your email', error: emailError, message: emailError && 'Please enter a valid email address' }), jsx(Button, Object.assign({ buttonClassName: 'login-with-email-form__button', type: 'submit', loading: isLoading, disabled: isLoading, buttonVariant: 'primary', buttonPadding: 'large', buttonRounded: 'medium', expanded: true }, { children: "Continue" }))] })));
 };
 
 export { EMAIL_REGEX, LoginWithEmailForm };

package/src/lib/views/LoginWithEmailView/components/SocialSignIn/SocialSignIn.cjs

@@ -19,7 +19,7 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
-require('../../../../context/DynamicContext/DynamicContext.cjs');
+var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
@@ -55,16 +55,18 @@ require('../../../../components/OverlayCard/OverlayCard.context.cjs');
 var capitalize = require('../../../../shared/utils/functions/capitalize/capitalize.cjs');
 
 const SocialSignIn = () => {
+    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext.useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = SocialRedirectContext.useSocialRedirectContext();
     const getSocialIcon = useGetSocialIcon.useGetSocialIcon();
     const [showCard, setShowCard] = React.useState(false);
     const closeCard = () => !isLoading && setShowCard(false);
-    const numberOfEnabledSocialProviders = enabledSocialProviders.length;
+    const socialProviders = socialProvidersFilter(enabledSocialProviders);
+    const numberOfEnabledSocialProviders = socialProviders.length;
     const showConnectText = numberOfEnabledSocialProviders === 1;
     const showCardButton = numberOfEnabledSocialProviders > 5;
     const socialProvidersToDisplayInline = showCardButton
-        ? enabledSocialProviders.slice(0, 4)
-        : enabledSocialProviders.slice(0, 5);
+        ? socialProviders.slice(0, 4)
+        : socialProviders.slice(0, 5);
     const numberOfSocialGridItems = numberOfEnabledSocialProviders + (showCardButton ? 1 : 0);
     const { mutate: onClickProvider, isLoading } = useMutation.useMutation((provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
@@ -74,7 +76,7 @@ const SocialSignIn = () => {
     const closeButton = (jsxRuntime.jsx(IconButton.IconButton, Object.assign({ onClick: closeCard, type: 'button', id: 'close-button', disabled: isLoading, "data-testid": 'close-button' }, { children: jsxRuntime.jsx(close.ReactComponent, {}) })));
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", Object.assign({ className: 'social-sign-in', style: {
                     '--number-of-social-grid-items': numberOfSocialGridItems,
-                } }, { children: [socialProvidersToDisplayInline.map((provider) => (jsxRuntime.jsxs(IconListTile.IconListTile, Object.assign({ dataTestId: `inline-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--tile' }, { children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }), showConnectText && (jsxRuntime.jsxs(Typography.Typography, Object.assign({ variant: 'button_primary' }, { children: ["Connect with ", capitalize.capitalize(provider)] })))] }), provider))), showCardButton && (jsxRuntime.jsx(IconListTile.IconListTile, Object.assign({ dataTestId: 'show-more-options', onClick: () => setShowCard(true) }, { children: jsxRuntime.jsx(Icon.Icon, Object.assign({ color: 'text-primary' }, { children: jsxRuntime.jsx(dotsHorizontal.ReactComponent, {}) })) }), 'show-more-options'))] })), jsxRuntime.jsx(OverlayCard.OverlayCard, Object.assign({ isOpen: showCard, onClickOverlay: closeCard }, { children: jsxRuntime.jsxs("div", Object.assign({ className: 'social-sign-in--card' }, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, Object.assign({ trailing: closeButton }, { children: jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary', as: 'span' }, { children: "Choose a social account" })) })), jsxRuntime.jsx("div", Object.assign({ className: 'social-sign-in--card--body' }, { children: enabledSocialProviders.map((provider) => (jsxRuntime.jsx(IconListTile.IconListTile, Object.assign({ dataTestId: `card-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--card--tile' }, { children: jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }) }), provider))) }))] })) }))] }));
+                } }, { children: [socialProvidersToDisplayInline.map((provider) => (jsxRuntime.jsxs(IconListTile.IconListTile, Object.assign({ dataTestId: `inline-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--tile' }, { children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }), showConnectText && (jsxRuntime.jsxs(Typography.Typography, Object.assign({ variant: 'button_primary' }, { children: ["Connect with ", capitalize.capitalize(provider)] })))] }), provider))), showCardButton && (jsxRuntime.jsx(IconListTile.IconListTile, Object.assign({ dataTestId: 'show-more-options', onClick: () => setShowCard(true) }, { children: jsxRuntime.jsx(Icon.Icon, Object.assign({ color: 'text-primary' }, { children: jsxRuntime.jsx(dotsHorizontal.ReactComponent, {}) })) }), 'show-more-options'))] })), jsxRuntime.jsx(OverlayCard.OverlayCard, Object.assign({ isOpen: showCard, onClickOverlay: closeCard }, { children: jsxRuntime.jsxs("div", Object.assign({ className: 'social-sign-in--card' }, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, Object.assign({ trailing: closeButton }, { children: jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary', as: 'span' }, { children: "Choose a social account" })) })), jsxRuntime.jsx("div", Object.assign({ className: 'social-sign-in--card--body' }, { children: socialProviders.map((provider) => (jsxRuntime.jsx(IconListTile.IconListTile, Object.assign({ dataTestId: `card-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--card--tile' }, { children: jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }) }), provider))) }))] })) }))] }));
 };
 
 exports.SocialSignIn = SocialSignIn;

package/src/lib/views/LoginWithEmailView/components/SocialSignIn/SocialSignIn.js

@@ -15,7 +15,7 @@ import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
-import '../../../../context/DynamicContext/DynamicContext.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
@@ -51,16 +51,18 @@ import '../../../../components/OverlayCard/OverlayCard.context.js';
 import { capitalize } from '../../../../shared/utils/functions/capitalize/capitalize.js';
 
 const SocialSignIn = () => {
+    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = useSocialRedirectContext();
     const getSocialIcon = useGetSocialIcon();
     const [showCard, setShowCard] = useState(false);
     const closeCard = () => !isLoading && setShowCard(false);
-    const numberOfEnabledSocialProviders = enabledSocialProviders.length;
+    const socialProviders = socialProvidersFilter(enabledSocialProviders);
+    const numberOfEnabledSocialProviders = socialProviders.length;
     const showConnectText = numberOfEnabledSocialProviders === 1;
     const showCardButton = numberOfEnabledSocialProviders > 5;
     const socialProvidersToDisplayInline = showCardButton
-        ? enabledSocialProviders.slice(0, 4)
-        : enabledSocialProviders.slice(0, 5);
+        ? socialProviders.slice(0, 4)
+        : socialProviders.slice(0, 5);
     const numberOfSocialGridItems = numberOfEnabledSocialProviders + (showCardButton ? 1 : 0);
     const { mutate: onClickProvider, isLoading } = useMutation((provider) => __awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
@@ -70,7 +72,7 @@ const SocialSignIn = () => {
     const closeButton = (jsx(IconButton, Object.assign({ onClick: closeCard, type: 'button', id: 'close-button', disabled: isLoading, "data-testid": 'close-button' }, { children: jsx(SvgClose, {}) })));
     return (jsxs(Fragment, { children: [jsxs("div", Object.assign({ className: 'social-sign-in', style: {
                     '--number-of-social-grid-items': numberOfSocialGridItems,
-                } }, { children: [socialProvidersToDisplayInline.map((provider) => (jsxs(IconListTile, Object.assign({ dataTestId: `inline-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--tile' }, { children: [jsx(IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }), showConnectText && (jsxs(Typography, Object.assign({ variant: 'button_primary' }, { children: ["Connect with ", capitalize(provider)] })))] }), provider))), showCardButton && (jsx(IconListTile, Object.assign({ dataTestId: 'show-more-options', onClick: () => setShowCard(true) }, { children: jsx(Icon, Object.assign({ color: 'text-primary' }, { children: jsx(SvgDotsHorizontal, {}) })) }), 'show-more-options'))] })), jsx(OverlayCard, Object.assign({ isOpen: showCard, onClickOverlay: closeCard }, { children: jsxs("div", Object.assign({ className: 'social-sign-in--card' }, { children: [jsx(ModalHeader, Object.assign({ trailing: closeButton }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary', as: 'span' }, { children: "Choose a social account" })) })), jsx("div", Object.assign({ className: 'social-sign-in--card--body' }, { children: enabledSocialProviders.map((provider) => (jsx(IconListTile, Object.assign({ dataTestId: `card-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--card--tile' }, { children: jsx(IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }) }), provider))) }))] })) }))] }));
+                } }, { children: [socialProvidersToDisplayInline.map((provider) => (jsxs(IconListTile, Object.assign({ dataTestId: `inline-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--tile' }, { children: [jsx(IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }), showConnectText && (jsxs(Typography, Object.assign({ variant: 'button_primary' }, { children: ["Connect with ", capitalize(provider)] })))] }), provider))), showCardButton && (jsx(IconListTile, Object.assign({ dataTestId: 'show-more-options', onClick: () => setShowCard(true) }, { children: jsx(Icon, Object.assign({ color: 'text-primary' }, { children: jsx(SvgDotsHorizontal, {}) })) }), 'show-more-options'))] })), jsx(OverlayCard, Object.assign({ isOpen: showCard, onClickOverlay: closeCard }, { children: jsxs("div", Object.assign({ className: 'social-sign-in--card' }, { children: [jsx(ModalHeader, Object.assign({ trailing: closeButton }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary', as: 'span' }, { children: "Choose a social account" })) })), jsx("div", Object.assign({ className: 'social-sign-in--card--body' }, { children: socialProviders.map((provider) => (jsx(IconListTile, Object.assign({ dataTestId: `card-${provider}`, onClick: () => onClickProvider(provider), className: 'social-sign-in--card--tile' }, { children: jsx(IconWithSpinner, { Icon: getSocialIcon(provider), isSpinning: socialProvider === provider, iconSize: 32 }) }), provider))) }))] })) }))] }));
 };
 
 export { SocialSignIn };

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -39,6 +39,7 @@ require('../../context/MockContext/MockContext.cjs');
 var useConnectAndSign = require('../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var useWalletConnectorEvents = require('../../utils/hooks/useWalletConnectorEvents/useWalletConnectorEvents.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
@@ -48,27 +49,26 @@ require('../../components/InlineWidget/InlineWidget.cjs');
 var NetworkPicker = require('../../components/NetworkPicker/NetworkPicker.cjs');
 var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
 var AuthProviderIcon = require('../../components/AuthProviderIcon/AuthProviderIcon.cjs');
-var useUpdateUserProfileByJWTCallback = require('../../utils/hooks/useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNetworkButton.cjs');
 
 const NetworkNotSupported = () => {
     var _a, _b, _c, _d;
-    const { onboardingOnlyJwt, network, onboardingImageUrl, selectedWalletConnector: walletConnector, decodedOnboardingOnlyToken, setShowAuthFlow, setCallback, setNetwork, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
+    const { onboardingOnlyJwt, network, onboardingImageUrl, selectedWalletConnector: walletConnector, decodedOnboardingOnlyToken, setNetwork, } = useInternalDynamicContext.useInternalDynamicContext();
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
+    const onChainChange = (network) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (isSupportedNetwork.isSupportedNetwork({ network, walletConnector })) {
+            finishConnectAndSign({
+                walletConnector: walletConnector,
+            });
+        }
+    });
+    // We can't listen on the network defined in the context,
+    // because events on the primaryWallet are defined after message is signed.
+    useWalletConnectorEvents.useWalletConnectorEvents(walletConnector, { onChainChange });
     if (!walletConnector) {
         return null;
     }
-    const handleNetworkChange = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!onboardingOnlyJwt) {
-            finishConnectAndSign({ walletConnector });
-            return;
-        }
-        setCallback('authSuccess');
-        yield updateUserProfileByJWT(onboardingOnlyJwt);
-        setShowAuthFlow(false);
-    });
     const userProfile = decodedOnboardingOnlyToken && createUserProfile.createUserProfile(decodedOnboardingOnlyToken);
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({ network, walletConnector });
@@ -78,13 +78,13 @@ const NetworkNotSupported = () => {
                 networkChainId: networkId,
             });
             setNetwork(networkId);
-            handleNetworkChange();
+            finishConnectAndSign({ walletConnector });
         }
         catch (e) {
             logger.logger.debug(e);
         }
     });
-    return (jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported', "data-testid": 'network-not-supported' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__content-container' }, { children: [jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__img-container' }, { children: [((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) && (jsxRuntime.jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: jsxRuntime.jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: 'user ens avatar', className: 'network-not-supported__img' }) }))), !((_c = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _c === void 0 ? void 0 : _c.avatar) && onboardingOnlyJwt && (jsxRuntime.jsx(AuthProviderIcon.AuthProviderIcon, { jwt: onboardingOnlyJwt })), !((_d = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _d === void 0 ? void 0 : _d.avatar) && !onboardingOnlyJwt && (jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletName: walletConnector.name }))] })), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector, userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker', customCallbackOnSuccess: handleNetworkChange })) })), jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'network-not-supported__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." }))] })), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] }))] })));
+    return (jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported', "data-testid": 'network-not-supported' }, { children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, Object.assign({ variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported' }, { children: "This network is not available, please update." }))), jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__content-container' }, { children: [jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__img-container' }, { children: [((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) && (jsxRuntime.jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: jsxRuntime.jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: 'user ens avatar', className: 'network-not-supported__img' }) }))), !((_c = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _c === void 0 ? void 0 : _c.avatar) && onboardingOnlyJwt && (jsxRuntime.jsx(AuthProviderIcon.AuthProviderIcon, { jwt: onboardingOnlyJwt })), !((_d = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _d === void 0 ? void 0 : _d.avatar) && !onboardingOnlyJwt && (jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletName: walletConnector.name }))] })), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector, userProfile: userProfile }), jsxRuntime.jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) })), jsxRuntime.jsxs("div", Object.assign({ className: 'network-not-supported__welcome-container' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ variant: 'title', color: 'primary', className: 'network-not-supported__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." }))] })), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] }))] })));
 };
 
 exports.NetworkNotSupported = NetworkNotSupported;

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -35,6 +35,7 @@ import '../../context/MockContext/MockContext.js';
 import { useConnectAndSign } from '../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { useWalletConnectorEvents } from '../../utils/hooks/useWalletConnectorEvents/useWalletConnectorEvents.js';
 import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
@@ -44,27 +45,26 @@ import '../../components/InlineWidget/InlineWidget.js';
 import { NetworkPicker } from '../../components/NetworkPicker/NetworkPicker.js';
 import { UserAddress } from '../../components/UserAddress/UserAddress.js';
 import { AuthProviderIcon } from '../../components/AuthProviderIcon/AuthProviderIcon.js';
-import { useUpdateUserProfileByJWTCallback } from '../../utils/hooks/useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { SelectNetworkButton } from '../../components/SelectNetworkButton/SelectNetworkButton.js';
 
 const NetworkNotSupported = () => {
     var _a, _b, _c, _d;
-    const { onboardingOnlyJwt, network, onboardingImageUrl, selectedWalletConnector: walletConnector, decodedOnboardingOnlyToken, setShowAuthFlow, setCallback, setNetwork, } = useInternalDynamicContext();
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
+    const { onboardingOnlyJwt, network, onboardingImageUrl, selectedWalletConnector: walletConnector, decodedOnboardingOnlyToken, setNetwork, } = useInternalDynamicContext();
     const finishConnectAndSign = useConnectAndSign();
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
+    const onChainChange = (network) => __awaiter(void 0, void 0, void 0, function* () {
+        if (isSupportedNetwork({ network, walletConnector })) {
+            finishConnectAndSign({
+                walletConnector: walletConnector,
+            });
+        }
+    });
+    // We can't listen on the network defined in the context,
+    // because events on the primaryWallet are defined after message is signed.
+    useWalletConnectorEvents(walletConnector, { onChainChange });
     if (!walletConnector) {
         return null;
     }
-    const handleNetworkChange = () => __awaiter(void 0, void 0, void 0, function* () {
-        if (!onboardingOnlyJwt) {
-            finishConnectAndSign({ walletConnector });
-            return;
-        }
-        setCallback('authSuccess');
-        yield updateUserProfileByJWT(onboardingOnlyJwt);
-        setShowAuthFlow(false);
-    });
     const userProfile = decodedOnboardingOnlyToken && createUserProfile(decodedOnboardingOnlyToken);
     const evmNetworks = walletConnector.evmNetworks || [];
     const _isSupportedNetwork = isSupportedNetwork({ network, walletConnector });
@@ -74,13 +74,13 @@ const NetworkNotSupported = () => {
                 networkChainId: networkId,
             });
             setNetwork(networkId);
-            handleNetworkChange();
+            finishConnectAndSign({ walletConnector });
         }
         catch (e) {
             logger.debug(e);
         }
     });
-    return (jsxs("div", Object.assign({ className: 'network-not-supported', "data-testid": 'network-not-supported' }, { children: [onboardingImageUrl && (jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsx(ErrorContainer, Object.assign({ variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported' }, { children: "This network is not available, please update." }))), jsxs("div", Object.assign({ className: 'network-not-supported__content-container' }, { children: [jsxs("div", Object.assign({ className: 'network-not-supported__img-container' }, { children: [((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) && (jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: 'user ens avatar', className: 'network-not-supported__img' }) }))), !((_c = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _c === void 0 ? void 0 : _c.avatar) && onboardingOnlyJwt && (jsx(AuthProviderIcon, { jwt: onboardingOnlyJwt })), !((_d = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _d === void 0 ? void 0 : _d.avatar) && !onboardingOnlyJwt && (jsx(WalletIcon, { style: { height: 64, width: 64 }, walletName: walletConnector.name }))] })), jsx(UserAddress, { walletConnector: walletConnector, userProfile: userProfile }), jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: evmNetworks.length > 1 && (jsx(NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker', customCallbackOnSuccess: handleNetworkChange })) })), jsxs("div", Object.assign({ className: 'network-not-supported__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'network-not-supported__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." }))] })), evmNetworks.length === 1 && (jsx(SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] }))] })));
+    return (jsxs("div", Object.assign({ className: 'network-not-supported', "data-testid": 'network-not-supported' }, { children: [onboardingImageUrl && (jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsx(ErrorContainer, Object.assign({ variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported' }, { children: "This network is not available, please update." }))), jsxs("div", Object.assign({ className: 'network-not-supported__content-container' }, { children: [jsxs("div", Object.assign({ className: 'network-not-supported__img-container' }, { children: [((_a = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _a === void 0 ? void 0 : _a.avatar) && (jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: jsx("img", { src: (_b = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _b === void 0 ? void 0 : _b.avatar, alt: 'user ens avatar', className: 'network-not-supported__img' }) }))), !((_c = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _c === void 0 ? void 0 : _c.avatar) && onboardingOnlyJwt && (jsx(AuthProviderIcon, { jwt: onboardingOnlyJwt })), !((_d = userProfile === null || userProfile === void 0 ? void 0 : userProfile.ens) === null || _d === void 0 ? void 0 : _d.avatar) && !onboardingOnlyJwt && (jsx(WalletIcon, { style: { height: 64, width: 64 }, walletName: walletConnector.name }))] })), jsx(UserAddress, { walletConnector: walletConnector, userProfile: userProfile }), jsx("div", Object.assign({ className: 'network-not-supported__network-container' }, { children: evmNetworks.length > 1 && (jsx(NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) })), jsxs("div", Object.assign({ className: 'network-not-supported__welcome-container' }, { children: [jsx(Typography, Object.assign({ variant: 'title', color: 'primary', className: 'network-not-supported__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." }))] })), evmNetworks.length === 1 && (jsx(SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] }))] })));
 };
 
 export { NetworkNotSupported };

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -41,6 +41,7 @@ require('../../context/MockContext/MockContext.cjs');
 var useConnectAndSign = require('../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var useWalletConnectorEvents = require('../../utils/hooks/useWalletConnectorEvents/useWalletConnectorEvents.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
@@ -52,31 +53,26 @@ var useUpdateUserProfileByJWTCallback = require('../../utils/hooks/useUpdateUser
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, onboardingOnlyJwt, selectedWalletConnector: walletConnector, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, onboardingOnlyJwt, selectedWalletConnector: walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
-    const finishSign = useConnectAndSign.useConnectAndSign();
-    // Listen for network changes
-    React.useEffect(() => {
-        if (!walletConnector)
-            return;
-        const onChainChange = (network) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            if (isSupportedNetwork.isSupportedNetwork({ network, walletConnector })) {
-                if (onboardingOnlyJwt) {
-                    updateUserProfileByJWT(onboardingOnlyJwt);
-                    setShowAuthFlow(false);
-                }
-                else {
-                    finishSign({ walletConnector });
-                }
-            }
-        });
-        walletConnector.setupEventListeners({
-            onChainChange,
-        });
-        return () => {
-            walletConnector.teardownEventListeners();
-        };
-    }, [onboardingOnlyJwt, walletConnector, updateUserProfileByJWT]);
+    const finishConnectAndSign = useConnectAndSign.useConnectAndSign();
+    const onChainChange = React.useCallback((network) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (isSupportedNetwork.isSupportedNetwork({ network, walletConnector })) {
+            finishConnectAndSign({
+                walletConnector: walletConnector,
+            });
+        }
+    }), 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+        finishConnectAndSign,
+        onboardingOnlyJwt,
+        updateUserProfileByJWT,
+        walletConnector,
+    ]);
+    // We can't listen on the network defined in the context,
+    // because events on the primaryWallet are defined after message is signed.
+    useWalletConnectorEvents.useWalletConnectorEvents(walletConnector, { onChainChange });
     const iconSize = 80;
     const icon = (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.name, style: {
             height: pixelToRem.pixelToRem(iconSize * IconWithSpinner.iconRatio),

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useEffect } from 'react';
+import { useCallback } from 'react';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
@@ -37,6 +37,7 @@ import '../../context/MockContext/MockContext.js';
 import { useConnectAndSign } from '../../utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { useWalletConnectorEvents } from '../../utils/hooks/useWalletConnectorEvents/useWalletConnectorEvents.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
@@ -48,31 +49,26 @@ import { useUpdateUserProfileByJWTCallback } from '../../utils/hooks/useUpdateUs
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, onboardingOnlyJwt, selectedWalletConnector: walletConnector, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, onboardingOnlyJwt, selectedWalletConnector: walletConnector, } = useInternalDynamicContext();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
-    const finishSign = useConnectAndSign();
-    // Listen for network changes
-    useEffect(() => {
-        if (!walletConnector)
-            return;
-        const onChainChange = (network) => __awaiter(void 0, void 0, void 0, function* () {
-            if (isSupportedNetwork({ network, walletConnector })) {
-                if (onboardingOnlyJwt) {
-                    updateUserProfileByJWT(onboardingOnlyJwt);
-                    setShowAuthFlow(false);
-                }
-                else {
-                    finishSign({ walletConnector });
-                }
-            }
-        });
-        walletConnector.setupEventListeners({
-            onChainChange,
-        });
-        return () => {
-            walletConnector.teardownEventListeners();
-        };
-    }, [onboardingOnlyJwt, walletConnector, updateUserProfileByJWT]);
+    const finishConnectAndSign = useConnectAndSign();
+    const onChainChange = useCallback((network) => __awaiter(void 0, void 0, void 0, function* () {
+        if (isSupportedNetwork({ network, walletConnector })) {
+            finishConnectAndSign({
+                walletConnector: walletConnector,
+            });
+        }
+    }), 
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+        finishConnectAndSign,
+        onboardingOnlyJwt,
+        updateUserProfileByJWT,
+        walletConnector,
+    ]);
+    // We can't listen on the network defined in the context,
+    // because events on the primaryWallet are defined after message is signed.
+    useWalletConnectorEvents(walletConnector, { onChainChange });
     const iconSize = 80;
     const icon = (jsx(WalletIcon, { walletName: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.name, style: {
             height: pixelToRem(iconSize * iconRatio),