@dynamic-labs/sdk-react-core 2.3.9 → 2.3.10

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [2.3.10](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.9...v2.3.10) (2024-08-15)
+
+
+### Bug Fixes
+
+* twitter should no longer rely polling for oauth flow ([#6606](https://github.com/dynamic-labs/DynamicAuth/issues/6606)) ([38906ab](https://github.com/dynamic-labs/DynamicAuth/commit/38906ab02b41fd02d7993e229072290d046dbc0e))
+
 ### [2.3.9](https://github.com/dynamic-labs/DynamicAuth/compare/v2.3.8...v2.3.9) (2024-08-13)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.3.9";
+var version = "2.3.10";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.497",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "2.3.9";
+var version = "2.3.10";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.497",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.3.9",
-    "@dynamic-labs/logger": "2.3.9",
-    "@dynamic-labs/multi-wallet": "2.3.9",
-    "@dynamic-labs/rpc-provider-ethereum": "2.3.9",
-    "@dynamic-labs/rpc-provider-solana": "2.3.9",
-    "@dynamic-labs/rpc-providers": "2.3.9",
-    "@dynamic-labs/store": "2.3.9",
-    "@dynamic-labs/types": "2.3.9",
-    "@dynamic-labs/utils": "2.3.9",
-    "@dynamic-labs/viem-utils": "2.3.9",
-    "@dynamic-labs/wallet-book": "2.3.9",
-    "@dynamic-labs/wallet-connector-core": "2.3.9",
+    "@dynamic-labs/iconic": "2.3.10",
+    "@dynamic-labs/logger": "2.3.10",
+    "@dynamic-labs/multi-wallet": "2.3.10",
+    "@dynamic-labs/rpc-provider-ethereum": "2.3.10",
+    "@dynamic-labs/rpc-provider-solana": "2.3.10",
+    "@dynamic-labs/rpc-providers": "2.3.10",
+    "@dynamic-labs/store": "2.3.10",
+    "@dynamic-labs/types": "2.3.10",
+    "@dynamic-labs/utils": "2.3.10",
+    "@dynamic-labs/viem-utils": "2.3.10",
+    "@dynamic-labs/wallet-book": "2.3.10",
+    "@dynamic-labs/wallet-connector-core": "2.3.10",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/data/api/oauth/oauth.cjs

@@ -95,23 +95,6 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => _tslib.__awaiter(vo
         return undefined;
     }
 });
-const getOAuthResult = (environmentId_3, providerType_3, _e) => _tslib.__awaiter(void 0, [environmentId_3, providerType_3, _e], void 0, function* (environmentId, providerType, { state }) {
-    const oauthResultRequest = {
-        state,
-    };
-    try {
-        const result = yield api.sdkApi().oauthResult({
-            environmentId,
-            oauthResultRequest,
-            providerType,
-        });
-        return result;
-    }
-    catch (e) {
-        logger.logger.error(e);
-        return undefined;
-    }
-});
 const farcasterSignIn = (environmentId, farcasterSignInRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
         const response = yield api.sdkApi().farcasterSignIn({
@@ -151,7 +134,6 @@ const farcasterVerify = (farcasterVerifyRequest) => _tslib.__awaiter(void 0, voi
 
 exports.farcasterSignIn = farcasterSignIn;
 exports.farcasterVerify = farcasterVerify;
-exports.getOAuthResult = getOAuthResult;
 exports.signInOAuth = signInOAuth;
 exports.unlinkOAuth = unlinkOAuth;
 exports.verifyOAuth = verifyOAuth;

package/src/lib/data/api/oauth/oauth.js

@@ -91,23 +91,6 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => __awaiter(void 0, [
         return undefined;
     }
 });
-const getOAuthResult = (environmentId_3, providerType_3, _e) => __awaiter(void 0, [environmentId_3, providerType_3, _e], void 0, function* (environmentId, providerType, { state }) {
-    const oauthResultRequest = {
-        state,
-    };
-    try {
-        const result = yield sdkApi().oauthResult({
-            environmentId,
-            oauthResultRequest,
-            providerType,
-        });
-        return result;
-    }
-    catch (e) {
-        logger.error(e);
-        return undefined;
-    }
-});
 const farcasterSignIn = (environmentId, farcasterSignInRequest) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const response = yield sdkApi().farcasterSignIn({
@@ -145,4 +128,4 @@ const farcasterVerify = (farcasterVerifyRequest) => __awaiter(void 0, void 0, vo
     }
 });
 
-export { farcasterSignIn, farcasterVerify, getOAuthResult, signInOAuth, unlinkOAuth, verifyOAuth };
+export { farcasterSignIn, farcasterVerify, signInOAuth, unlinkOAuth, verifyOAuth };

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

@@ -103,7 +103,6 @@ const socialProviders = [
 // pkce params are only required for twitter and break if added for other providers, like google
 // so we should only add provider that support pkce to this list
 const providersRequiringPkce = ['twitter', 'github'];
-const providersWithoutWindowOpenerRefence = ['twitter'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }) => {
     const { environmentId, setShowAuthFlow, projectSettings, consumeNonce, redirectUrl, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -115,7 +114,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     const [error, setError] = React.useState();
     const providersWaitingOauthMessage = React.useRef({});
     const authWindowInterval = React.useRef();
-    const shouldPool = React.useRef(false);
     const clearError = () => {
         setError(undefined);
         setContextError(undefined);
@@ -138,26 +136,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         setErrorMessage(code);
         onFailed(provider, { error }, options);
     };
-    const poolOauthResult = (provider, state) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!shouldPool.current) {
-            return;
-        }
-        const result = yield oauth.getOAuthResult(environmentId, provider, {
-            state,
-        });
-        if ((result === null || result === void 0 ? void 0 : result.status) !== sdkApiCore.OauthResultStatus.Completed) {
-            setTimeout(() => poolOauthResult(provider, state), 1000);
-            return;
-        }
-        shouldPool.current = false;
-        const authMessage = {
-            code: result === null || result === void 0 ? void 0 : result.code,
-            error: result === null || result === void 0 ? void 0 : result.error,
-            provider,
-            type: 'authorization_response',
-        };
-        window.postMessage(authMessage, '*');
-    });
     const checkValidProvider = (provider, authMode) => {
         if (!provider) {
             handleError(provider, types.SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
@@ -230,17 +208,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 return;
             }
             let expectedOrigin = window.location.origin;
-            if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-                try {
-                    const redirectUri = new URL(apiProvider.redirectUrl);
-                    expectedOrigin = redirectUri.origin;
-                }
-                catch (e) {
-                    logger.logger.error('Failed to parse social provider redirect url', {
-                        error: e,
-                    });
-                    return;
-                }
+            try {
+                const redirectUri = new URL(apiProvider.redirectUrl);
+                expectedOrigin = redirectUri.origin;
+            }
+            catch (e) {
+                logger.logger.error('Failed to parse social provider redirect url', {
+                    error: e,
+                });
+                return;
             }
             if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
                 logger.logger.debug('Origin check message received. Sending response now.', {
@@ -276,8 +252,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             // check that the state we receive from message is the same state we calculated earlier
             // this could be an attack
             // this state check is used only by providers with an open window opener reference (eg, not twitter)
-            if (!providersWithoutWindowOpenerRefence.includes(provider) &&
-                state !== authState) {
+            if (state !== authState) {
                 handleError(provider, types.SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`, { raiseAuthFailure: authMode === 'signin' });
                 return;
             }
@@ -328,48 +303,21 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
         }
         authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
-        if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
-            authWindowInterval.current = setInterval(() => {
-                var _a;
-                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
-                    return;
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                // user didn't complete oauth
-                if ((_a = providersWaitingOauthMessage.current) === null || _a === void 0 ? void 0 : _a[provider]) {
-                    onFailed(provider, 'user-cancelled');
-                }
-            }, 2000);
-        }
-        else {
-            // For provider that don't support window.opener, we need to use a timeout to pool the oauth result
-            // If we don't get a valid result in {async sessionTimeout} ms, we'll assume the user closed the window
-            // and we'll clear all states/listeners
-            // start pooling oauth result
-            shouldPool.current = true;
-            poolOauthResult(provider, state);
-            // if this is mobile, set a longer timeout to allow the user to login to the provider in the browser
-            let authWindowTimeout = sessionTimeout;
-            if (utils.isMobile()) {
-                authWindowTimeout = authWindowTimeout * 3;
+        // For provider that support window.opener, we need to clear all states/listeners when the window is closed
+        authWindowInterval.current = setInterval(() => {
+            var _a;
+            if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
+                return;
             }
-            authWindowInterval.current = setInterval(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                var _f;
-                shouldPool.current = false;
-                // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider]) {
-                    clearListeners();
-                    handleError(provider, types.SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`, { raiseAuthFailure: authMode === 'signin' });
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }), authWindowTimeout);
-        }
+            clearInterval(authWindowInterval.current);
+            setIsProcessing(false);
+            // user didn't complete oauth
+            if ((_a = providersWaitingOauthMessage.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                onFailed(provider, 'user-cancelled');
+            }
+        }, 2000);
     });
-    const connectWithFarcaster = (authMode_1, _g) => _tslib.__awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
+    const connectWithFarcaster = (authMode_1, _f) => _tslib.__awaiter(void 0, [authMode_1, _f], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = utils.PlatformService.getHost();
         const data = yield farcaster.connect({

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

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef } from 'react';
-import { ProviderEnum, OauthResultStatus } from '@dynamic-labs/sdk-api-core';
+import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
-import { isMobile, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
+import { PlatformService, isMobile, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -31,7 +31,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
-import { getOAuthResult, signInOAuth, verifyOAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
+import { signInOAuth, verifyOAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -99,7 +99,6 @@ const socialProviders = [
 // pkce params are only required for twitter and break if added for other providers, like google
 // so we should only add provider that support pkce to this list
 const providersRequiringPkce = ['twitter', 'github'];
-const providersWithoutWindowOpenerRefence = ['twitter'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }) => {
     const { environmentId, setShowAuthFlow, projectSettings, consumeNonce, redirectUrl, } = useInternalDynamicContext();
@@ -111,7 +110,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     const [error, setError] = useState();
     const providersWaitingOauthMessage = useRef({});
     const authWindowInterval = useRef();
-    const shouldPool = useRef(false);
     const clearError = () => {
         setError(undefined);
         setContextError(undefined);
@@ -134,26 +132,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         setErrorMessage(code);
         onFailed(provider, { error }, options);
     };
-    const poolOauthResult = (provider, state) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!shouldPool.current) {
-            return;
-        }
-        const result = yield getOAuthResult(environmentId, provider, {
-            state,
-        });
-        if ((result === null || result === void 0 ? void 0 : result.status) !== OauthResultStatus.Completed) {
-            setTimeout(() => poolOauthResult(provider, state), 1000);
-            return;
-        }
-        shouldPool.current = false;
-        const authMessage = {
-            code: result === null || result === void 0 ? void 0 : result.code,
-            error: result === null || result === void 0 ? void 0 : result.error,
-            provider,
-            type: 'authorization_response',
-        };
-        window.postMessage(authMessage, '*');
-    });
     const checkValidProvider = (provider, authMode) => {
         if (!provider) {
             handleError(provider, SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
@@ -226,17 +204,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 return;
             }
             let expectedOrigin = window.location.origin;
-            if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-                try {
-                    const redirectUri = new URL(apiProvider.redirectUrl);
-                    expectedOrigin = redirectUri.origin;
-                }
-                catch (e) {
-                    logger.error('Failed to parse social provider redirect url', {
-                        error: e,
-                    });
-                    return;
-                }
+            try {
+                const redirectUri = new URL(apiProvider.redirectUrl);
+                expectedOrigin = redirectUri.origin;
+            }
+            catch (e) {
+                logger.error('Failed to parse social provider redirect url', {
+                    error: e,
+                });
+                return;
             }
             if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
                 logger.debug('Origin check message received. Sending response now.', {
@@ -272,8 +248,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             // check that the state we receive from message is the same state we calculated earlier
             // this could be an attack
             // this state check is used only by providers with an open window opener reference (eg, not twitter)
-            if (!providersWithoutWindowOpenerRefence.includes(provider) &&
-                state !== authState) {
+            if (state !== authState) {
                 handleError(provider, SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`, { raiseAuthFailure: authMode === 'signin' });
                 return;
             }
@@ -324,48 +299,21 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
         }
         authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
-        if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
-            authWindowInterval.current = setInterval(() => {
-                var _a;
-                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
-                    return;
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                // user didn't complete oauth
-                if ((_a = providersWaitingOauthMessage.current) === null || _a === void 0 ? void 0 : _a[provider]) {
-                    onFailed(provider, 'user-cancelled');
-                }
-            }, 2000);
-        }
-        else {
-            // For provider that don't support window.opener, we need to use a timeout to pool the oauth result
-            // If we don't get a valid result in {async sessionTimeout} ms, we'll assume the user closed the window
-            // and we'll clear all states/listeners
-            // start pooling oauth result
-            shouldPool.current = true;
-            poolOauthResult(provider, state);
-            // if this is mobile, set a longer timeout to allow the user to login to the provider in the browser
-            let authWindowTimeout = sessionTimeout;
-            if (isMobile()) {
-                authWindowTimeout = authWindowTimeout * 3;
+        // For provider that support window.opener, we need to clear all states/listeners when the window is closed
+        authWindowInterval.current = setInterval(() => {
+            var _a;
+            if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
+                return;
             }
-            authWindowInterval.current = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
-                var _f;
-                shouldPool.current = false;
-                // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider]) {
-                    clearListeners();
-                    handleError(provider, SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`, { raiseAuthFailure: authMode === 'signin' });
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }), authWindowTimeout);
-        }
+            clearInterval(authWindowInterval.current);
+            setIsProcessing(false);
+            // user didn't complete oauth
+            if ((_a = providersWaitingOauthMessage.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                onFailed(provider, 'user-cancelled');
+            }
+        }, 2000);
     });
-    const connectWithFarcaster = (authMode_1, _g) => __awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
+    const connectWithFarcaster = (authMode_1, _f) => __awaiter(void 0, [authMode_1, _f], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = PlatformService.getHost();
         const data = yield connect({

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.cjs

@@ -98,22 +98,26 @@ const LoginViewSection = ({ viewSection, index, walletCount, gotToWalletList, })
         case sdkApiCore.SdkViewSectionType.Phone:
             return (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading }));
         case sdkApiCore.SdkViewSectionType.EmailAndPhone:
-            return (jsxRuntime.jsx(ToggleableSection.ToggleableSection, { sections: [
-                    {
-                        button: t('dyn_login.email_or_phone.use_phone'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
-                        component: (jsxRuntime.jsx(LoginEmailForm.LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_phone'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
-                    },
-                    {
-                        button: t('dyn_login.email_or_phone.use_email'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_email',
-                        component: (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_email'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
-                    },
-                ] }));
+            // eslint-disable-next-line no-case-declarations
+            const sections = [
+                {
+                    button: t('dyn_login.email_or_phone.use_phone'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
+                    component: (jsxRuntime.jsx(LoginEmailForm.LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_phone'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
+                },
+                {
+                    button: t('dyn_login.email_or_phone.use_email'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_email',
+                    component: (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_email'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
+                },
+            ];
+            if (viewSection.defaultItem === 'phone')
+                sections.reverse();
+            return jsxRuntime.jsx(ToggleableSection.ToggleableSection, { sections: sections });
         case sdkApiCore.SdkViewSectionType.Wallet:
             return (jsxRuntime.jsx(WalletSignInSection.WalletSignInSection, { numberOfItensToShow: viewSection.numOfItemsToDisplay || 0, onSubmit: () => {
                     // this view is just to show the back button

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.js

@@ -94,22 +94,26 @@ const LoginViewSection = ({ viewSection, index, walletCount, gotToWalletList, })
         case SdkViewSectionType.Phone:
             return (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading }));
         case SdkViewSectionType.EmailAndPhone:
-            return (jsx(ToggleableSection, { sections: [
-                    {
-                        button: t('dyn_login.email_or_phone.use_phone'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
-                        component: (jsx(LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_phone'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
-                    },
-                    {
-                        button: t('dyn_login.email_or_phone.use_email'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_email',
-                        component: (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_email'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
-                    },
-                ] }));
+            // eslint-disable-next-line no-case-declarations
+            const sections = [
+                {
+                    button: t('dyn_login.email_or_phone.use_phone'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
+                    component: (jsx(LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_phone'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
+                },
+                {
+                    button: t('dyn_login.email_or_phone.use_email'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_email',
+                    component: (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_email'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
+                },
+            ];
+            if (viewSection.defaultItem === 'phone')
+                sections.reverse();
+            return jsx(ToggleableSection, { sections: sections });
         case SdkViewSectionType.Wallet:
             return (jsx(WalletSignInSection, { numberOfItensToShow: viewSection.numOfItemsToDisplay || 0, onSubmit: () => {
                     // this view is just to show the back button

package/src/lib/views/LoginView/sections/ToggleableSection/ToggleableSection.d.ts

@@ -6,8 +6,7 @@ export type Section = {
     buttonCopyKey?: string;
     labelCopyKey?: string;
 };
-type ToggleableSectionProps = {
+export type ToggleableSectionProps = {
     sections: [Section, Section];
 };
 export declare const ToggleableSection: FC<ToggleableSectionProps>;
-export {};