@hhgtech/hhg-components 1.29.310-beta-4 → 1.29.310-beta-5

package/build/esm/organisms.js

@@ -1,73 +1,73 @@
-export { N as NavigationV2, g as getNavMenuContent, a as getNavMenuContentWithCache } from './index-eab88653.js';
-export { U as UserProfileNavigation, N as UserProfileNavigationHeader, a as UserProfileNavigationStats } from './index-e1acf54a.js';
-export { F as Footer } from './index-f8393905.js';
+export { N as NavigationV2, g as getNavMenuContent, a as getNavMenuContentWithCache } from './index-67433083.js';
+export { U as UserProfileNavigation, N as UserProfileNavigationHeader, a as UserProfileNavigationStats } from './index-eff9c6f6.js';
+export { F as Footer } from './index-902860a7.js';
 export { NavigationLogoutPopup } from './navigationLogoutPopup.js';
-export { N as NavigationProfileButton } from './index-4cfe44c8.js';
+export { N as NavigationProfileButton } from './index-a4d5e355.js';
 export { ProfileNavigation } from './profileNavigation.js';
-import './tslib.es6-ce74f603.js';
+import './tslib.es6-35c86ab7.js';
 import 'react';
-import './index-53a3dddb.js';
-import './index-1d6042e8.js';
+import './index-6d670de3.js';
+import './index-974c8ac0.js';
 import '@hhgtech/icons/other';
 import '@mantine/core';
 import '@mantine/hooks';
-import './index-55e9de36.js';
+import './index-565a80b0.js';
 import './constantsDomainLocales.js';
-import './Locale-807ca088.js';
+import './Locale-e7dd53a3.js';
 import './constantsIsProduction.js';
-import './useScreenSize-384dd60f.js';
+import './useScreenSize-adb5e955.js';
 import '@emotion/styled';
-import './utils-69e6fbdd.js';
+import './utils-d7279c01.js';
 import '@mantine/carousel';
-import './index-6da0c043.js';
-import './other-18348d8b.js';
-import './index-94ab96a4.js';
+import './index-26ac0d81.js';
+import './other-d17b315d.js';
+import './index-a61170d8.js';
 import './miscTheme.js';
-import './useMantineLocale-df80f46c.js';
+import './useMantineLocale-c2b902a7.js';
 import '@mantine/notifications';
-import './index-abadd269.js';
+import './index-5756472c.js';
 import 'date-fns/locale';
 import './constantsSite.js';
 import './constantsRiskScreener.js';
 import 'dayjs';
-import './index-a108337c.js';
+import './index-4bd879eb.js';
 import 'classnames';
-import './useUniqueId-1419c2da.js';
+import './useUniqueId-310f5e9a.js';
 import '@hhgtech/icons/core';
-import './normalizeLink-171c1577.js';
-import './dataTransform-76f0f8e2.js';
-import './index-06ea17df.js';
-import './logoIcon-71f36463.js';
-import './index-7839baec.js';
-import './translationsContext-faa1aa86.js';
+import './normalizeLink-20a616dd.js';
+import './dataTransform-1ef6e73e.js';
+import './index-df945777.js';
+import './logoIcon-f7d8a376.js';
+import './index-88759ed1.js';
+import './translationsContext-9d15b26c.js';
 import 'lodash/throttle';
 import '@mantine/dates';
-import './index.styles-8276aa5b.js';
-import './index-b7b494e0.js';
-import './constants-9dc0d96b.js';
-import './store-1acba58d.js';
+import './index.styles-0e5fc387.js';
+import './index-6dc065e0.js';
+import './constants-93492225.js';
+import './store-36a2023e.js';
 import 'zustand';
 import './miscCookieHelper.js';
-import './index-2f71b617.js';
-import './utils-e7d70f3b.js';
-import './index-d844a01b.js';
+import './index-8d92fdfc.js';
+import './utils-33525a90.js';
+import './index-ea14dc61.js';
 import 'slugify';
 import 'string-format';
 import './togetherApiPaths.js';
-import './constants-45e848cf.js';
-import './constants-83cb0f00.js';
-import './index-223df4dc.js';
-import './index-24176555.js';
-import './useIsInit-66451a9c.js';
+import './constants-801453a8.js';
+import './constants-c98ae9ee.js';
+import './index-9ed6478a.js';
+import './index-84288de1.js';
+import './useIsInit-4edc15a1.js';
 import './miscDefaultClassWrapper.js';
 import 'dayjs/plugin/relativeTime';
-import './index-4c170b70.js';
-import './index-5703a803.js';
+import './index-eaa201ba.js';
+import './index-66d97368.js';
 import 'lodash/debounce';
-import './core-c991f49d.js';
-import './index-882153f2.js';
-import './index-b5263111.js';
-import './index-3459c4d1.js';
-import './Spinner-c0d420aa.js';
-import './ChevronDown-d9841086.js';
+import './core-f0306b16.js';
+import './index-5e38d731.js';
+import './index-d5abff8c.js';
+import './index-c96c8d0b.js';
+import './Spinner-d9c3c089.js';
+import './ChevronDown-7684e837.js';
 import '@emotion/react';

package/build/esm/{post-12765401.js → post-bb0e92f7.js}

@@ -1,6 +1,6 @@
-import { a as __awaiter } from './tslib.es6-ce74f603.js';
+import { a as __awaiter } from './tslib.es6-35c86ab7.js';
 import { ADMIN_PATHS, PATHS } from './togetherApiPaths.js';
-import { d as getApiPath, s as callApiWithAdminAuth, b as callApiWithAuth } from './utils-e7d70f3b.js';
+import { d as getApiPath, s as callApiWithAdminAuth, b as callApiWithAuth } from './utils-33525a90.js';
 
 const EncodeUrlRegexMap = {
     edit: /<mocka ([^>]*)data-url="true"[^<>]*>(.*?)<\/mocka>/gim,

package/build/esm/profileNavigation.js

@@ -1,37 +1,37 @@
 import React__default, { useMemo, useState, Fragment, useEffect } from 'react';
-import { a as CARE_LOCALES, T as TOGETHER_LOCALES, E as ECOM_LOCALES, D as DATA_PRIVACY_LOCALES } from './index-abadd269.js';
-import { a as Avatar } from './index-1d6042e8.js';
+import { a as CARE_LOCALES, T as TOGETHER_LOCALES, E as ECOM_LOCALES, D as DATA_PRIVACY_LOCALES } from './index-5756472c.js';
+import { a as Avatar } from './index-974c8ac0.js';
 import '@mantine/core';
 import '@mantine/dates';
-import './index-94ab96a4.js';
-import { C as CommonGAssets } from './index-55e9de36.js';
-import './useMantineLocale-df80f46c.js';
-import { T as Text } from './index-6da0c043.js';
-import './index-a108337c.js';
-import './index.styles-8276aa5b.js';
-import { u as useTranslations } from './index-7839baec.js';
+import './index-a61170d8.js';
+import { C as CommonGAssets } from './index-565a80b0.js';
+import './useMantineLocale-c2b902a7.js';
+import { T as Text } from './index-26ac0d81.js';
+import './index-4bd879eb.js';
+import './index.styles-0e5fc387.js';
+import { u as useTranslations } from './index-88759ed1.js';
 import '@mantine/hooks';
-import './utils-69e6fbdd.js';
-import './other-18348d8b.js';
-import './index-b7b494e0.js';
-import { C as ChevronDown } from './ChevronDown-d9841086.js';
-import { e as normalizeLinkSlash, a as getCurrentSsoUrl, g as getCurrentBaseUrl } from './normalizeLink-171c1577.js';
+import './utils-d7279c01.js';
+import './other-d17b315d.js';
+import './index-6dc065e0.js';
+import { C as ChevronDown } from './ChevronDown-7684e837.js';
+import { e as normalizeLinkSlash, a as getCurrentSsoUrl, g as getCurrentBaseUrl } from './normalizeLink-20a616dd.js';
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 import { theme } from './miscTheme.js';
-import './translationsContext-faa1aa86.js';
+import './translationsContext-9d15b26c.js';
 import 'date-fns/locale';
 import './constantsSite.js';
-import './Locale-807ca088.js';
+import './Locale-e7dd53a3.js';
 import './constantsDomainLocales.js';
 import './constantsRiskScreener.js';
 import './constantsIsProduction.js';
-import './tslib.es6-ce74f603.js';
+import './tslib.es6-35c86ab7.js';
 import '@hhgtech/icons/other';
-import './useScreenSize-384dd60f.js';
+import './useScreenSize-adb5e955.js';
 import '@mantine/carousel';
 import 'classnames';
-import './useUniqueId-1419c2da.js';
+import './useUniqueId-310f5e9a.js';
 import '@hhgtech/icons/core';
 import '@mantine/notifications';
 import 'dayjs';

package/build/esm/progressBar.js

@@ -1,4 +1,4 @@
-import { _ as __rest } from './tslib.es6-ce74f603.js';
+import { _ as __rest } from './tslib.es6-35c86ab7.js';
 import React__default, { useState, useCallback, useEffect } from 'react';
 import throttle from 'lodash/throttle';
 import styled from '@emotion/styled';

package/build/esm/pwg.js

@@ -1,43 +1,43 @@
 import React__default, { useMemo, useState, useRef } from 'react';
-import { M as MarryBabyText, a as MarryBabyHeading } from './index-b5263111.js';
-import { T as Text } from './index-6da0c043.js';
-import { P as PillCarousel } from './index-26da7cb8.js';
-import { u as useTranslations } from './index-7839baec.js';
+import { M as MarryBabyText, a as MarryBabyHeading } from './index-d5abff8c.js';
+import { T as Text } from './index-26ac0d81.js';
+import { P as PillCarousel } from './index-efc5bd83.js';
+import { u as useTranslations } from './index-88759ed1.js';
 import { theme } from './miscTheme.js';
 import { ResponsiveContainer, AreaChart, CartesianGrid, Tooltip, XAxis, YAxis, Area, ReferenceDot } from 'recharts';
-import { C as CustomReferenceDot } from './index-28458034.js';
-import { a as useOutsideClick } from './useOutsideClick-c4c35f6c.js';
+import { C as CustomReferenceDot } from './index-45755052.js';
+import { a as useOutsideClick } from './useOutsideClick-1fe587d9.js';
 import styled from '@emotion/styled';
-import { _ as __rest } from './tslib.es6-ce74f603.js';
+import { _ as __rest } from './tslib.es6-35c86ab7.js';
 import '@mantine/core';
-import './other-18348d8b.js';
-import './index-94ab96a4.js';
-import './Locale-807ca088.js';
-import './index-55e9de36.js';
+import './other-d17b315d.js';
+import './index-a61170d8.js';
+import './Locale-e7dd53a3.js';
+import './index-565a80b0.js';
 import './constantsDomainLocales.js';
 import './constantsIsProduction.js';
-import './useScreenSize-384dd60f.js';
-import './utils-69e6fbdd.js';
-import './index-7d618aff.js';
-import './index-1d6042e8.js';
+import './useScreenSize-adb5e955.js';
+import './utils-d7279c01.js';
+import './index-1f3e450b.js';
+import './index-974c8ac0.js';
 import '@hhgtech/icons/other';
 import '@mantine/hooks';
 import '@mantine/carousel';
-import './useMantineLocale-df80f46c.js';
+import './useMantineLocale-c2b902a7.js';
 import '@mantine/notifications';
-import './index-abadd269.js';
+import './index-5756472c.js';
 import 'date-fns/locale';
 import './constantsSite.js';
 import './constantsRiskScreener.js';
 import 'dayjs';
-import './index-a108337c.js';
+import './index-4bd879eb.js';
 import 'classnames';
-import './useUniqueId-1419c2da.js';
+import './useUniqueId-310f5e9a.js';
 import '@hhgtech/icons/core';
 import '@mantine/dates';
-import './index.styles-8276aa5b.js';
-import './translationsContext-faa1aa86.js';
-import './index-b7b494e0.js';
+import './index.styles-0e5fc387.js';
+import './translationsContext-9d15b26c.js';
+import './index-6dc065e0.js';
 
 const CustomizedAxisTick = (props) => {
     const { x, y, payload, activeWeek } = props;

package/build/esm/ssoV2/screens/components/progressBar.utils.d.ts

@@ -0,0 +1,6 @@
+import { SSOV2StoreType } from "../../ssoStateManager/store";
+import { SSOStepsContextType } from "../../stepsManager";
+import { UserInfo } from "../../../types";
+export declare const isPhoneVerifedAlready: (userInfo: UserInfo, flowData: SSOV2StoreType['flowData']) => string | boolean;
+export declare const isSetupFullInfoAlready: (userInfo: UserInfo, flowData: SSOV2StoreType['flowData']) => boolean;
+export declare const isExistUpdateEmailStep: (steps: SSOStepsContextType['steps']) => import("../../stepsManager").SSOStepType;

package/build/esm/ssoV2/ssoStateManager/store.d.ts

@@ -33,7 +33,7 @@ export type SSOV2StoreType = {
         flow?: 'login' | 'signup';
         isVerifyPhone?: boolean;
         /** These data is fetched from API to use in the email flow */
-        emailMetaData?: {
+        metaData?: {
             is_birthday?: boolean;
             is_gender?: boolean;
             is_name?: boolean;

package/build/esm/ssoV2.js

@@ -1,27 +1,27 @@
-import { a as __awaiter, _ as __rest } from './tslib.es6-ce74f603.js';
+import { a as __awaiter, _ as __rest } from './tslib.es6-35c86ab7.js';
 import React__default, { createContext, useMemo, useEffect, useState, useCallback, forwardRef } from 'react';
-import { I as Input, s as styles, O as OTP, f as PasswordInput, E as ErrorBoundary } from './index-1d6042e8.js';
-import { S as SSOStepTypeType, a as useSSOSteps, u as useSSOV2Store, i as isPhoneNotVerifedYet, b as isUserFinishedSetup, c as isUserNeedPassword, f as fetchSSOV2Api, w as websiteId, d as SSO_V2_PATHS, e as checkUserExist, F as FacebookAppId, G as GoogleAuthClientId, h as handleAuthSuccess, g as getUserInfo, j as updateUserInfo, k as isLoginWithPhoneNotVerifedYet, l as isFlowFinishedSetup, r as resetPassword, m as redirect } from './store-1acba58d.js';
-export { u as useSSOV2Store } from './store-1acba58d.js';
+import { I as Input, s as styles, O as OTP, f as PasswordInput, E as ErrorBoundary } from './index-974c8ac0.js';
+import { S as SSOStepTypeType, a as useSSOSteps, u as useSSOV2Store, i as isUserFinishedSetup, f as fetchSSOV2Api, w as websiteId, b as SSO_V2_PATHS, c as checkUserExist, F as FacebookAppId, G as GoogleAuthClientId, h as handleAuthSuccess, g as getUserInfo, d as updateUserInfo, e as isPhoneNotVerifedYet, j as isLoginWithPhoneNotVerifedYet, k as isFlowFinishedSetup, r as resetPassword, l as redirect } from './store-36a2023e.js';
+export { u as useSSOV2Store } from './store-36a2023e.js';
 import { ChevronLeft } from '@hhgtech/icons/arrow';
 import { Close, Search } from '@hhgtech/icons/core';
-import { Z as ZINDEX_SSO, L as LOCALE_SPECS, S as STATIC_PAGES } from './index-abadd269.js';
-import { L as LogoIcon } from './logoIcon-71f36463.js';
-import { B as Button } from './index-a108337c.js';
-import { M as Modal } from './index-1e32216d.js';
+import { Z as ZINDEX_SSO, L as LOCALE_SPECS, S as STATIC_PAGES } from './index-5756472c.js';
+import { L as LogoIcon } from './logoIcon-f7d8a376.js';
+import { B as Button } from './index-4bd879eb.js';
+import { M as Modal } from './index-f92a27e8.js';
 import { Stack, Flex, Box, Group } from '@mantine/core';
 import '@mantine/dates';
-import './index-94ab96a4.js';
-import './index-55e9de36.js';
-import { s as showNotification } from './useMantineLocale-df80f46c.js';
-import { T as Text } from './index-6da0c043.js';
-import { u as useTranslations } from './index-7839baec.js';
+import './index-a61170d8.js';
+import './index-565a80b0.js';
+import { s as showNotification } from './useMantineLocale-c2b902a7.js';
+import { T as Text } from './index-26ac0d81.js';
+import { u as useTranslations } from './index-88759ed1.js';
 import '@mantine/hooks';
-import './utils-69e6fbdd.js';
-import './other-18348d8b.js';
-import './index-b7b494e0.js';
-import { L as LOCALE } from './Locale-807ca088.js';
-import { G as Google, F as Facebook } from './Google-a554e17d.js';
+import './utils-d7279c01.js';
+import './other-d17b315d.js';
+import './index-6dc065e0.js';
+import { L as LOCALE } from './Locale-e7dd53a3.js';
+import { G as Google, F as Facebook } from './Google-42d190a1.js';
 import { parsePhoneNumber, getCountryCallingCode } from 'react-phone-number-input';
 import styled from '@emotion/styled';
 import cn from 'classnames';
@@ -29,28 +29,28 @@ import { CaretDown } from '@hhgtech/icons/other';
 import debounce from 'lodash/debounce';
 import throttle from 'lodash/throttle';
 import Flags from 'react-phone-number-input/flags';
-import { u as useScreenSize } from './useScreenSize-384dd60f.js';
+import { u as useScreenSize } from './useScreenSize-adb5e955.js';
 import { Drawer } from 'vaul';
-import { M as MAPPED_LOCALE } from './utils-34a49d5f.js';
-import { S as Spoiler } from './index-1b5dc167.js';
+import { M as MAPPED_LOCALE } from './utils-10cbbbdc.js';
+import { S as Spoiler } from './index-7cbc7122.js';
 import { domainLocales } from './constantsDomainLocales.js';
 import { useForm, yupResolver } from '@mantine/form';
 import * as yup from 'yup';
 import dayjs from 'dayjs';
-import { D as DatePicker } from './index-07844dc7.js';
+import { D as DatePicker } from './index-bba5d96b.js';
 import '@mantine/carousel';
 import './miscTheme.js';
-import './useUniqueId-1419c2da.js';
+import './useUniqueId-310f5e9a.js';
 import './constantsSite.js';
 import 'zustand';
 import './constantsIsProduction.js';
-import './normalizeLink-171c1577.js';
+import './normalizeLink-20a616dd.js';
 import './miscCookieHelper.js';
 import 'date-fns/locale';
 import './constantsRiskScreener.js';
-import './index.styles-8276aa5b.js';
+import './index.styles-0e5fc387.js';
 import '@mantine/notifications';
-import './translationsContext-faa1aa86.js';
+import './translationsContext-9d15b26c.js';
 
 const SSOStateContext = createContext({
     locale: LOCALE.Vietnam,
@@ -158,6 +158,29 @@ const BackgroundHeader = () => (React__default.createElement("svg", { width: "29
             React__default.createElement("stop", { stopColor: "#fff", stopOpacity: "0" }),
             React__default.createElement("stop", { offset: "1", stopColor: "#fff" })))));
 
+const isPhoneVerifedAlready = (userInfo, flowData) => {
+    var _a;
+    if (flowData === null || flowData === void 0 ? void 0 : flowData.metaData) {
+        return (_a = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _a === void 0 ? void 0 : _a.is_phone_verified;
+    }
+    return (userInfo === null || userInfo === void 0 ? void 0 : userInfo.phone_verified_at) && (userInfo === null || userInfo === void 0 ? void 0 : userInfo.phone);
+};
+const isSetupFullInfoAlready = (userInfo, flowData) => {
+    var _a, _b, _c;
+    if (flowData === null || flowData === void 0 ? void 0 : flowData.metaData) {
+        return (((_a = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _a === void 0 ? void 0 : _a.is_name) &&
+            ((_b = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _b === void 0 ? void 0 : _b.is_gender) &&
+            ((_c = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _c === void 0 ? void 0 : _c.is_birthday));
+    }
+    const hasName = !!(userInfo === null || userInfo === void 0 ? void 0 : userInfo.name);
+    const hasGender = typeof (userInfo === null || userInfo === void 0 ? void 0 : userInfo.gender) === 'number';
+    const hasBirthday = !!(userInfo === null || userInfo === void 0 ? void 0 : userInfo.birthday);
+    return hasName && hasGender && hasBirthday;
+};
+const isExistUpdateEmailStep = (steps) => {
+    return steps.find((s) => s.type === SSOStepTypeType.UPDATE_EMAIL);
+};
+
 const isSocialFlowFn = (flowData) => {
     return (flowData === null || flowData === void 0 ? void 0 : flowData.method) === 'google' || (flowData === null || flowData === void 0 ? void 0 : flowData.method) === 'facebook';
 };
@@ -176,15 +199,15 @@ const isDisplayProgressBarFn = (flowData, step) => {
         (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.PASSWORD ||
         (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.FORGOT_PASSWORD_PHONE ||
         (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.FORGOT_PASSWORD_SETUP ||
-        (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.EMAIL;
-    // step?.type === SSOStepTypeType.PASSWORD
+        (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.EMAIL ||
+        (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.UPDATE_EMAIL;
     const isWhiteListFlow = isSocialFlowFn(flowData) ||
         isPhoneFlowFn(flowData) ||
         isEmailFlowFn(flowData);
     return showProgressBar && isWhiteListFlow;
 };
 const getCurrentStepNumber = (flowData, { steps, currentStepIndex, }, userInfo) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     const step = steps[currentStepIndex];
     const isSocialFlow = isSocialFlowFn(flowData);
     const isPhoneFlow = isPhoneFlowFn(flowData);
@@ -192,27 +215,37 @@ const getCurrentStepNumber = (flowData, { steps, currentStepIndex, }, userInfo)
     /** Social (Google, Facebook): FIRST => VERIFY_PHONE | OTP => STEP_FULL */
     if (isSocialFlow) {
         const arrSteps = [
-            isPhoneNotVerifedYet(userInfo)
+            !isPhoneVerifedAlready(userInfo, flowData)
                 ? [SSOStepTypeType.VERIFY_PHONE, SSOStepTypeType.OTP]
                 : undefined,
+            isExistUpdateEmailStep(steps)
+                ? (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.OTP
+                    ? SSOStepTypeType.OTP
+                    : SSOStepTypeType.UPDATE_EMAIL
+                : undefined,
             !userInfo || !isUserFinishedSetup(userInfo)
                 ? SSOStepTypeType.SETUP_FULL
                 : undefined,
         ]
             .flat()
             .filter(Boolean);
+        const previousStep = steps[currentStepIndex - 1];
         return [
             arrSteps.length,
-            arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
+            (previousStep === null || previousStep === void 0 ? void 0 : previousStep.type) === SSOStepTypeType.UPDATE_EMAIL
+                ? arrSteps.findLastIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1
+                : arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
         ];
     }
     if (isPhoneFlow && (flowData === null || flowData === void 0 ? void 0 : flowData.flow) === 'signup') {
         const arrSteps = [
-            isPhoneNotVerifedYet(userInfo) ? SSOStepTypeType.OTP : undefined,
-            isUserNeedPassword(flowData, userInfo)
+            !isPhoneVerifedAlready(userInfo, flowData)
+                ? SSOStepTypeType.OTP
+                : undefined,
+            !((_a = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _a === void 0 ? void 0 : _a.is_pass)
                 ? SSOStepTypeType.FORGOT_PASSWORD_SETUP
                 : undefined,
-            !userInfo || !isUserFinishedSetup(userInfo)
+            !isSetupFullInfoAlready(userInfo, flowData)
                 ? SSOStepTypeType.SETUP_FULL
                 : undefined,
         ]
@@ -224,30 +257,39 @@ const getCurrentStepNumber = (flowData, { steps, currentStepIndex, }, userInfo)
         ];
     }
     if (isPhoneFlow && (flowData === null || flowData === void 0 ? void 0 : flowData.flow) === 'login') {
-        const arrSteps = !userInfo
-            ? []
-            : [
-                SSOStepTypeType.PASSWORD,
-                isPhoneNotVerifedYet(userInfo)
-                    ? [SSOStepTypeType.FORGOT_PASSWORD_PHONE, SSOStepTypeType.OTP]
-                    : undefined,
-                !isUserFinishedSetup(userInfo)
-                    ? SSOStepTypeType.SETUP_FULL
-                    : undefined,
-            ]
-                .flat()
-                .filter(Boolean);
+        const arrSteps = [
+            SSOStepTypeType.PASSWORD,
+            !isPhoneVerifedAlready(userInfo, flowData)
+                ? [SSOStepTypeType.FORGOT_PASSWORD_PHONE, SSOStepTypeType.OTP]
+                : undefined,
+            isExistUpdateEmailStep(steps)
+                ? (step === null || step === void 0 ? void 0 : step.type) === SSOStepTypeType.OTP
+                    ? SSOStepTypeType.OTP
+                    : SSOStepTypeType.UPDATE_EMAIL
+                : undefined,
+            !isSetupFullInfoAlready(userInfo, flowData)
+                ? SSOStepTypeType.SETUP_FULL
+                : undefined,
+        ]
+            .flat()
+            .filter(Boolean);
+        if (arrSteps.length === 2 &&
+            arrSteps[0] === SSOStepTypeType.PASSWORD &&
+            arrSteps[1] === SSOStepTypeType.SETUP_FULL) {
+            return [];
+        }
+        const previousStep = steps[currentStepIndex - 1];
         return [
             arrSteps.length,
-            arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
+            (previousStep === null || previousStep === void 0 ? void 0 : previousStep.type) === SSOStepTypeType.UPDATE_EMAIL
+                ? arrSteps.findLastIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1
+                : arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
         ];
     }
     if (isEmailFlow) {
-        const hasPasswordStep = !((_a = flowData === null || flowData === void 0 ? void 0 : flowData.emailMetaData) === null || _a === void 0 ? void 0 : _a.is_pass);
-        const hasPhoneStep = !((_b = flowData === null || flowData === void 0 ? void 0 : flowData.emailMetaData) === null || _b === void 0 ? void 0 : _b.is_phone_verified);
-        const hasSetupFullStep = !((_c = flowData === null || flowData === void 0 ? void 0 : flowData.emailMetaData) === null || _c === void 0 ? void 0 : _c.is_gender) ||
-            !((_d = flowData === null || flowData === void 0 ? void 0 : flowData.emailMetaData) === null || _d === void 0 ? void 0 : _d.is_name) ||
-            !((_e = flowData === null || flowData === void 0 ? void 0 : flowData.emailMetaData) === null || _e === void 0 ? void 0 : _e.is_birthday);
+        const hasPasswordStep = !((_b = flowData === null || flowData === void 0 ? void 0 : flowData.metaData) === null || _b === void 0 ? void 0 : _b.is_pass);
+        const hasPhoneStep = !isPhoneVerifedAlready(userInfo, flowData);
+        const hasSetupFullStep = !isSetupFullInfoAlready(userInfo, flowData);
         if (!hasPasswordStep && !hasPhoneStep && !hasSetupFullStep)
             return [];
         const arrSteps = [
@@ -266,11 +308,12 @@ const getCurrentStepNumber = (flowData, { steps, currentStepIndex, }, userInfo)
         ]
             .flat()
             .filter(Boolean);
+        const previousStep = steps[currentStepIndex - 1];
         return [
             arrSteps.length,
-            steps.length < arrSteps.length
-                ? arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1
-                : arrSteps.findLastIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
+            (previousStep === null || previousStep === void 0 ? void 0 : previousStep.type) === SSOStepTypeType.VERIFY_PHONE
+                ? arrSteps.findLastIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1
+                : arrSteps.findIndex((type) => type === (step === null || step === void 0 ? void 0 : step.type)) + 1,
         ];
     }
     return [];
@@ -547,7 +590,7 @@ const SSOEmailScreen = ({ hidden, }) => {
                             flowData: {
                                 method: 'email',
                                 flow: 'login',
-                                emailMetaData: existRes._data,
+                                metaData: existRes._data,
                             },
                         });
                         // go to password screen
@@ -565,7 +608,7 @@ const SSOEmailScreen = ({ hidden, }) => {
                             flowData: {
                                 method: 'email',
                                 flow: 'signup',
-                                emailMetaData: existRes._data,
+                                metaData: existRes._data,
                             },
                         });
                         if (!((_b = existRes._data) === null || _b === void 0 ? void 0 : _b.provider)) {
@@ -2335,6 +2378,7 @@ const SSOFirstScreen = ({ hidden, config, }) => {
                     flowData: {
                         method: 'zalo',
                         flow: 'login',
+                        metaData: userExist._data,
                     },
                 });
                 addStep({
@@ -2362,6 +2406,7 @@ const SSOFirstScreen = ({ hidden, config, }) => {
                     flowData: {
                         method: 'zalo',
                         flow: 'signup',
+                        metaData: userExist._data,
                     },
                 });
                 addStep({
@@ -2396,6 +2441,7 @@ const SSOFirstScreen = ({ hidden, config, }) => {
                     flowData: {
                         method: 'sms',
                         flow: 'login',
+                        metaData: userExist._data,
                     },
                 });
                 addStep({
@@ -2423,6 +2469,7 @@ const SSOFirstScreen = ({ hidden, config, }) => {
                     flowData: {
                         method: 'sms',
                         flow: 'signup',
+                        metaData: userExist._data,
                     },
                 });
                 addStep({
@@ -2464,6 +2511,7 @@ const SSOFirstScreen = ({ hidden, config, }) => {
                     flowData: {
                         method: 'phone',
                         flow: 'login',
+                        metaData: userExist._data,
                     },
                 });
                 addStep({
@@ -2673,15 +2721,7 @@ const SSOOTPScreen = ({ hidden, index, config, }) => {
     }, [hidden]);
     const addStepAndGoNext = (step) => {
         useSSOSteps.setState((old) => {
-            var _a, _b;
             const oldSteps = old.steps;
-            if (((_a = oldSteps[index - 1]) === null || _a === void 0 ? void 0 : _a.type) === SSOStepTypeType.VERIFY_PHONE ||
-                ((_b = oldSteps[index - 1]) === null || _b === void 0 ? void 0 : _b.type) === SSOStepTypeType.UPDATE_EMAIL) {
-                return {
-                    steps: oldSteps.slice(0, index - 1).concat(step),
-                    currentStepIndex: index - 1,
-                };
-            }
             return {
                 steps: oldSteps.slice(0, index).concat(step),
                 currentStepIndex: index,