diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx index 40787401f1ed..85b3c60d45ff 100755 --- a/src/components/HeaderWithBackButton/index.tsx +++ b/src/components/HeaderWithBackButton/index.tsx @@ -82,7 +82,6 @@ function HeaderWithBackButton({ shouldNavigateToTopMostReport = false, shouldDisplayHelpButton = false, shouldDisplaySearchRouter = false, - progressBarPercentage, style, subTitleLink = '', shouldMinimizeMenuButton = false, @@ -103,31 +102,6 @@ function HeaderWithBackButton({ const middleContent = useMemo(() => { const stepCounterTranslation = stepCounter ? translate('stepCounter', stepCounter.step, stepCounter.total, stepCounter.text) : undefined; - if (progressBarPercentage) { - const progressBarLabel = stepCounter ? `${translate('common.progressBarLabel')}, ${stepCounterTranslation}` : undefined; - return ( - <> - {/* Reserves as much space for the middleContent as possible */} - - {/* Uses absolute positioning so that it's always centered instead of being affected by the - presence or absence of back/close buttons to the left/right of it */} - - - - - - - ); - } if (shouldShowReportAvatarWithDisplay) { return ( & { /** Whether we should display the button that opens new SearchRouter */ shouldDisplaySearchRouter?: boolean; - /** 0 - 100 number indicating current progress of the progress bar */ - progressBarPercentage?: number; - /** Policy avatar to display in the header */ policyAvatar?: Icon; diff --git a/src/components/OnboardingHeader.tsx b/src/components/OnboardingHeader.tsx new file mode 100644 index 000000000000..4330718c330e --- /dev/null +++ b/src/components/OnboardingHeader.tsx @@ -0,0 +1,56 @@ +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useTheme from '@hooks/useTheme'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import variables from '@styles/variables'; + +import CONST from '@src/CONST'; + +import React from 'react'; +import {View} from 'react-native'; + +import Icon from './Icon'; +import {PressableWithoutFeedback} from './Pressable'; +import Text from './Text'; + +type OnboardingHeaderProps = { + onBackButtonPress?: () => void; + + shouldShowBackButton?: boolean; +}; + +/** + * Popover-style back link: caret + "Back" label. + * Matches the submenu back row used by PopoverMenu. + */ +function OnboardingHeader({onBackButtonPress, shouldShowBackButton = true}: OnboardingHeaderProps) { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + const theme = useTheme(); + const icons = useMemoizedLazyExpensifyIcons(['BackArrow']); + + return ( + + {shouldShowBackButton ? ( + + + {translate('common.back')} + + ) : null} + + ); +} + +export default OnboardingHeader; diff --git a/src/languages/de.ts b/src/languages/de.ts index 2249e0aaedf4..f2154e22e07e 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'bis', genericErrorMessage: 'Ups ... etwas ist schiefgelaufen und Ihre Anfrage konnte nicht abgeschlossen werden. Bitte versuchen Sie es später noch einmal.', percentage: 'Prozentsatz', - progressBarLabel: 'Onboarding-Fortschritt', converted: 'Umgewandelt', error: { invalidAmount: 'Ungültiger Betrag', diff --git a/src/languages/el.ts b/src/languages/el.ts index 5beb2a28fe1c..1079fa404d1c 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -199,7 +199,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'σε', genericErrorMessage: 'Ουπς... κάτι πήγε στραβά και το αίτημά σας δεν μπόρεσε να ολοκληρωθεί. Παρακαλούμε δοκιμάστε ξανά αργότερα.', percentage: 'Ποσοστό', - progressBarLabel: 'Πρόοδος αρχικής ρύθμισης', converted: 'Μετατράπηκε', off: 'Ανενεργό', error: { diff --git a/src/languages/en.ts b/src/languages/en.ts index 86dfee00e49d..b223adf9f62d 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -215,7 +215,6 @@ const translations = { conjunctionTo: 'to', genericErrorMessage: 'Oops... something went wrong and your request could not be completed. Please try again later.', percentage: 'Percentage', - progressBarLabel: 'Onboarding progress', converted: 'Converted', off: 'Off', error: { diff --git a/src/languages/es.ts b/src/languages/es.ts index 3a1308cee41f..01a9b43a457f 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -185,7 +185,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'a', genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor, inténtalo más tarde.', percentage: 'Porcentaje', - progressBarLabel: 'Progreso de incorporación', converted: 'Convertido', error: { invalidAmount: 'Importe no válido', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 1ffc19e1c73b..04b95ffef602 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'à', genericErrorMessage: 'Oups... une erreur s’est produite et votre requête n’a pas pu être effectuée. Veuillez réessayer plus tard.', percentage: 'Pourcentage', - progressBarLabel: "Progression de l'intégration", converted: 'Converti', error: { invalidAmount: 'Montant invalide', diff --git a/src/languages/it.ts b/src/languages/it.ts index d46b43130d1b..2139d6e86265 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'a', genericErrorMessage: 'Ops... qualcosa è andato storto e la tua richiesta non può essere completata. Riprova più tardi.', percentage: 'Percentuale', - progressBarLabel: 'Progresso onboarding', converted: 'Convertito', error: { invalidAmount: 'Importo non valido', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 763a134b907f..6aec6301c385 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: '宛先', genericErrorMessage: 'おっと…問題が発生したため、リクエストを完了できませんでした。時間をおいてもう一度お試しください。', percentage: 'パーセンテージ', - progressBarLabel: 'オンボーディング進捗', converted: '変換済み', error: { invalidAmount: '金額が無効です', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 809c677ccd73..c1703dac2cdd 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'naar', genericErrorMessage: 'Oeps... er is iets misgegaan en je verzoek kon niet worden voltooid. Probeer het later opnieuw.', percentage: 'Percentage', - progressBarLabel: 'Voortgang onboarding', converted: 'Geconverteerd', error: { invalidAmount: 'Ongeldig bedrag', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 68ff3437f47e..4f5e5aab3554 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'do', genericErrorMessage: 'Ups... coś poszło nie tak i Twoje żądanie nie mogło zostać zrealizowane. Spróbuj ponownie później.', percentage: 'Procent', - progressBarLabel: 'Postęp wdrożenia', converted: 'Przekonwertowano', error: { invalidAmount: 'Nieprawidłowa kwota', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 881000efd3ba..089589bb7747 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: 'para', genericErrorMessage: 'Ops... algo deu errado e sua solicitação não pôde ser concluída. Tente novamente mais tarde.', percentage: 'Porcentagem', - progressBarLabel: 'Progresso da integração', converted: 'Convertido', error: { invalidAmount: 'Valor inválido', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 46a20445ce46..327093e17934 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -197,7 +197,6 @@ const translations: TranslationDeepObject = { conjunctionTo: '至', genericErrorMessage: '哎呀……出现问题,无法完成您的请求。请稍后重试。', percentage: '百分比', - progressBarLabel: '入门进度', converted: '已转换', error: { invalidAmount: '金额无效', diff --git a/src/libs/getOnboardingStepCounter.ts b/src/libs/getOnboardingStepCounter.ts index e221859c7a70..7f6cad821d3a 100644 --- a/src/libs/getOnboardingStepCounter.ts +++ b/src/libs/getOnboardingStepCounter.ts @@ -22,7 +22,6 @@ type OnboardingFlowContext = { type OnboardingStepResult = { stepCounter: StepCounterParams; - progressBarPercentage: number; }; const {ONBOARDING} = SCREENS; @@ -64,9 +63,6 @@ const qualifierSuffixes = { [ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL]: null, } satisfies Record, OnboardingScreen[] | null>; -const maxSuffixLength = Math.max(...Object.values(purposeSuffixes).map((s) => s.length)); -const maxPrivateSuffixLength = Math.max(...Object.values(purposeSuffixes).map((s) => s.filter((p) => p !== ONBOARDING.PERSONAL_DETAILS).length)); - function getAdjustedSuffix(suffix: OnboardingScreen[], context: OnboardingFlowContext): OnboardingScreen[] { if (context.isAccountingEnabled === false) { return suffix.filter((screen) => screen !== ONBOARDING.ACCOUNTING); @@ -137,11 +133,8 @@ function getOnboardingStepCounter(page: OnboardingScreen, context: OnboardingFlo if (index === -1) { return undefined; } - const isPrivateDomain = !context.isFromPublicDomain && !!context.hasAccessibleDomainPolicies; - const maxFlowLength = prefix.length + 1 + (isPrivateDomain ? maxPrivateSuffixLength : maxSuffixLength); return { stepCounter: {step: index + 1}, - progressBarPercentage: Math.round(((index + 1) / maxFlowLength) * 100), }; } @@ -151,7 +144,6 @@ function getOnboardingStepCounter(page: OnboardingScreen, context: OnboardingFlo } return { stepCounter: {step: index + 1, total: flow.length}, - progressBarPercentage: Math.round(((index + 1) / flow.length) * 100), }; } diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index 9db38928cc81..1e023102493b 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -1,8 +1,8 @@ import Button from '@components/ButtonComposed'; import FixedFooter from '@components/FixedFooter'; import FormHelpMessage from '@components/FormHelpMessage'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; +import OnboardingHeader from '@components/OnboardingHeader'; import {PressableWithoutFeedback} from '@components/Pressable'; import RadioButtonWithLabel from '@components/RadioButtonWithLabel'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -14,7 +14,6 @@ import useCompleteOnboarding from '@hooks/useCompleteOnboarding'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; -import useOnboardingStepCounter from '@hooks/useOnboardingStepCounter'; import useOnyx from '@hooks/useOnyx'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useStyleUtils from '@hooks/useStyleUtils'; @@ -33,7 +32,6 @@ import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import SCREENS from '@src/SCREENS'; import type IconAsset from '@src/types/utils/IconAsset'; import React, {useEffect, useState} from 'react'; @@ -124,7 +122,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount const [session] = useOnyx(ONYXKEYS.SESSION); const [onboardingUserReportedIntegration] = useOnyx(ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION); const [onboardingFeaturesMap] = useOnyx(ONYXKEYS.ONBOARDING_INTERESTED_FEATURES_MAP); - const onboardingStep = useOnboardingStepCounter(SCREENS.ONBOARDING.ACCOUNTING, {isAccountingEnabled: true}); const isKnownIntegration = isIntegrationKey(onboardingUserReportedIntegration); let initialSelectedIntegration: AccountingOptionKey | undefined; @@ -235,13 +232,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} shouldEnableMaxHeight > - Navigation.goBack(ROUTES.ONBOARDING_INTERESTED_FEATURES.getRoute())} - shouldDisplayHelpButton={false} - /> + Navigation.goBack(ROUTES.ONBOARDING_INTERESTED_FEATURES.getRoute())} /> - { @@ -244,12 +241,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} shouldEnableMaxHeight > - Navigation.goBack(ROUTES.ONBOARDING_EMPLOYEES.getRoute())} - shouldDisplayHelpButton={false} - /> + Navigation.goBack(ROUTES.ONBOARDING_EMPLOYEES.getRoute())} /> - { // Based on the `handleSubmit` function to reverse where to return if (isPrivateDomainAndHasAccessiblePolicies) { @@ -264,7 +259,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo)); }} - shouldDisplayHelpButton={false} /> (null); const [somethingElseTextOverride, setSomethingElseTextOverride] = useState(null); const [inputError, setInputError] = useState(''); @@ -90,14 +87,11 @@ function BaseOnboardingPersonalTrackGoal({shouldUseNativeStyles, route}: BaseOnb testID="BaseOnboardingPersonalTrackGoal" style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} > - { Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute(route.params?.backTo)); }} - shouldDisplayHelpButton={false} /> - - + diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx index eebe94100dcc..afe72e089915 100644 --- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx +++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx @@ -3,9 +3,9 @@ import Button from '@components/ButtonComposed'; import FormProvider from '@components/Form/FormProvider'; import InputWrapper from '@components/Form/InputWrapper'; import type {FormOnyxValues} from '@components/Form/types'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; import Icon from '@components/Icon'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; +import OnboardingHeader from '@components/OnboardingHeader'; import OnboardingMergingAccountBlockedView from '@components/OnboardingMergingAccountBlockedView'; import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; @@ -15,7 +15,6 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput'; import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; -import useOnboardingStepCounter from '@hooks/useOnboardingStepCounter'; import useOnyx from '@hooks/useOnyx'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -33,7 +32,6 @@ import type {TranslationPaths} from '@src/languages/types'; import Log from '@src/libs/Log'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import SCREENS from '@src/SCREENS'; import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm'; import type IconAsset from '@src/types/utils/IconAsset'; @@ -74,7 +72,6 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai const ICON_SIZE = 48; const operatingSystem = getOperatingSystem(); const isFocused = useIsFocused(); - const onboardingStep = useOnboardingStepCounter(SCREENS.ONBOARDING.WORK_EMAIL); useEffect(() => { setOnboardingErrorMessage(null); @@ -204,12 +201,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai testID="BaseOnboardingWorkEmail" style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} > - + {onboardingValues?.isMergingAccountBlocked ? ( { if (onboardingValues?.isMergeAccountStepCompleted === undefined) { @@ -89,14 +86,11 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi testID="BaseOnboardingWorkEmailValidation" style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} > - { updateOnboardingValuesAndNavigation(onboardingValues); }} - shouldDisplayHelpButton={false} /> {onboardingValues?.isMergingAccountBlocked ? ( diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx index 68eda09d568b..e4e0c0b32bf9 100644 --- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx +++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx @@ -1,6 +1,6 @@ import Button from '@components/ButtonComposed'; import LinkButton from '@components/ButtonComposed/composed/LinkButton'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import OnboardingHeader from '@components/OnboardingHeader'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import BareUserListItem from '@components/SelectionList/ListItem/BareUserListItem'; @@ -11,7 +11,6 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnboardingMessages from '@hooks/useOnboardingMessages'; -import useOnboardingStepCounter from '@hooks/useOnboardingStepCounter'; import useOnyx from '@hooks/useOnyx'; import usePermissions from '@hooks/usePermissions'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -31,7 +30,6 @@ import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@userActio import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import SCREENS from '@src/SCREENS'; import type {JoinablePolicy} from '@src/types/onyx/JoinablePolicies'; import {useFocusEffect} from '@react-navigation/native'; @@ -81,7 +79,6 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding const isEmployerWithSubmit = onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.EMPLOYER && canUseSubmit2026; const autoCreateSubmitWorkspace = useAutoCreateSubmitWorkspace(); const shouldHideBackButton = onboardingValues?.shouldValidate === false && route.params?.backTo === ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(); - const onboardingStep = useOnboardingStepCounter(SCREENS.ONBOARDING.WORKSPACES); const handleJoinWorkspace = (policy: JoinablePolicy) => { const isJoiningSubmitPolicy = policy.policyType === CONST.POLICY.TYPE.SUBMIT; @@ -188,12 +185,9 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]} shouldShowOfflineIndicator={isSmallScreenWidth} > - Navigation.goBack()} - shouldDisplayHelpButton={false} /> fontFamily: FontUtils.fontFamily.platform.SYSTEM.fontFamily, }, + onboardingHeaderContainer: { + height: 52, + paddingHorizontal: 20, + paddingVertical: 16, + marginTop: 8, + justifyContent: 'center', + alignItems: 'flex-start', + }, + createMenuContainer: { width: variables.sideBarWidth - 40, paddingVertical: variables.componentBorderRadiusLarge, @@ -5539,26 +5548,6 @@ const staticStyles = (theme: ThemeColors) => marginLeft: -2, }, - headerProgressBarContainer: { - position: 'absolute', - width: '100%', - pointerEvents: 'none', - }, - - headerProgressBar: { - width: variables.componentSizeMedium, - height: variables.iconSizeXXXSmall, - borderRadius: variables.componentBorderRadiusRounded, - backgroundColor: theme.border, - alignSelf: 'center', - }, - - headerProgressBarFill: { - borderRadius: variables.componentBorderRadiusRounded, - height: '100%', - backgroundColor: theme.success, - }, - interactiveStepHeaderContainer: { flex: 1, alignSelf: 'center', diff --git a/tests/unit/getOnboardingStepCounterTest.ts b/tests/unit/getOnboardingStepCounterTest.ts index 38446ada27fe..f458b78ca433 100644 --- a/tests/unit/getOnboardingStepCounterTest.ts +++ b/tests/unit/getOnboardingStepCounterTest.ts @@ -263,133 +263,133 @@ describe('getOnboardingFlow', () => { }); describe('getOnboardingStepCounter', () => { - it('returns correct step/total/percentage for each page in VSB flow', () => { + it('returns correct step/total for each page in VSB flow', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'vsb'}; - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for each page in SMB flow', () => { + it('returns correct step/total for each page in SMB flow', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'smb'}; - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for individual + MANAGE_TEAM', () => { + it('returns correct step/total for individual + MANAGE_TEAM', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM}; - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 4}, progressBarPercentage: 25}); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 2, total: 4}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 4}, progressBarPercentage: 75}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 4, total: 4}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 4}}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 2, total: 4}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 4}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 4, total: 4}}); }); it('omits Accounting from the counter when Accounting is disabled', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM, isAccountingEnabled: false}; - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toBeUndefined(); }); - it('returns correct step/total/percentage for individual + PERSONAL_SPEND', () => { + it('returns correct step/total for individual + PERSONAL_SPEND', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', purposeSelected: ONBOARDING_CHOICES.PERSONAL_SPEND}; - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}}); }); - it('returns correct step/total/percentage for individual + TRACK_PERSONAL', () => { + it('returns correct step/total for individual + TRACK_PERSONAL', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', purposeSelected: ONBOARDING_CHOICES.TRACK_PERSONAL}; - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_TRACK_GOAL, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_TRACK_GOAL, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for individual + other purpose', () => { + it('returns correct step/total for individual + other purpose', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', purposeSelected: ONBOARDING_CHOICES.EMPLOYER}; - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(O.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}}); + expect(getOnboardingStepCounter(O.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}}); }); - it('returns correct step/total/percentage for public + individual + MANAGE_TEAM', () => { + it('returns correct step/total for public + individual + MANAGE_TEAM', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', isFromPublicDomain: true, purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM}; - expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toEqual({stepCounter: {step: 1, total: 6}, progressBarPercentage: 17}); - expect(getOnboardingStepCounter(O.WORK_EMAIL_VALIDATION, ctx)).toEqual({stepCounter: {step: 2, total: 6}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}, progressBarPercentage: 83}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toEqual({stepCounter: {step: 1, total: 6}}); + expect(getOnboardingStepCounter(O.WORK_EMAIL_VALIDATION, ctx)).toEqual({stepCounter: {step: 2, total: 6}}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}}); }); - it('returns correct step/total/percentage for public + merge + individual + MANAGE_TEAM', () => { + it('returns correct step/total for public + merge + individual + MANAGE_TEAM', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: false, purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM}; - expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toEqual({stepCounter: {step: 1, total: 7}, progressBarPercentage: 14}); - expect(getOnboardingStepCounter(O.WORK_EMAIL_VALIDATION, ctx)).toEqual({stepCounter: {step: 2, total: 7}, progressBarPercentage: 29}); - expect(getOnboardingStepCounter(O.WORKSPACES, ctx)).toEqual({stepCounter: {step: 3, total: 7}, progressBarPercentage: 43}); - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 4, total: 7}, progressBarPercentage: 57}); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 5, total: 7}, progressBarPercentage: 71}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 6, total: 7}, progressBarPercentage: 86}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 7, total: 7}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toEqual({stepCounter: {step: 1, total: 7}}); + expect(getOnboardingStepCounter(O.WORK_EMAIL_VALIDATION, ctx)).toEqual({stepCounter: {step: 2, total: 7}}); + expect(getOnboardingStepCounter(O.WORKSPACES, ctx)).toEqual({stepCounter: {step: 3, total: 7}}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 4, total: 7}}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 5, total: 7}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 6, total: 7}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 7, total: 7}}); }); - it('returns correct step/total/percentage for public + skipped + individual + MANAGE_TEAM (no gaps)', () => { + it('returns correct step/total for public + skipped + individual + MANAGE_TEAM (no gaps)', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: true, purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM}; // The skipped work email step is excluded from the flow, so it has no step counter. expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 4}, progressBarPercentage: 25}); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 2, total: 4}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 4}, progressBarPercentage: 75}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 4, total: 4}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 4}}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 2, total: 4}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 3, total: 4}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 4, total: 4}}); }); - it('returns correct step/total/percentage for public + skipped + individual + PERSONAL_SPEND (no gaps)', () => { + it('returns correct step/total for public + skipped + individual + PERSONAL_SPEND (no gaps)', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: true, purposeSelected: ONBOARDING_CHOICES.PERSONAL_SPEND}; // The skipped work email step is excluded from the flow, so it has no step counter. expect(getOnboardingStepCounter(SCREENS.ONBOARDING.WORK_EMAIL, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 2}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 2, total: 2}}); }); - it('returns correct step/total/percentage for public + skipped + VSB', () => { + it('returns correct step/total for public + skipped + VSB', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'vsb', isFromPublicDomain: true, isMergeAccountStepSkipped: true}; // The skipped work email step is excluded from the flow, so it has no step counter. expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for public + validated + VSB', () => { + it('returns correct step/total for public + validated + VSB', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'vsb', isFromPublicDomain: true, isAccountValidated: true, isMergeAccountStepSkipped: false}; // The validated work email step is excluded from the flow, so it has no step counter. expect(getOnboardingStepCounter(O.WORK_EMAIL, ctx)).toBeUndefined(); expect(getOnboardingStepCounter(O.WORK_EMAIL_VALIDATION, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for public + skipped + individual + TRACK_PERSONAL (no gaps)', () => { + it('returns correct step/total for public + skipped + individual + TRACK_PERSONAL (no gaps)', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: true, purposeSelected: ONBOARDING_CHOICES.TRACK_PERSONAL}; // The skipped work email step is excluded from the flow, so it has no step counter. expect(getOnboardingStepCounter(SCREENS.ONBOARDING.WORK_EMAIL, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 3}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_TRACK_GOAL, ctx)).toEqual({stepCounter: {step: 2, total: 3}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 3, total: 3}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 1, total: 3}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_TRACK_GOAL, ctx)).toEqual({stepCounter: {step: 2, total: 3}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 3, total: 3}}); }); - it('returns correct step/total/percentage for unvalidated private domain + individual + MANAGE_TEAM (6-step flow)', () => { + it('returns correct step/total for unvalidated private domain + individual + MANAGE_TEAM (6-step flow)', () => { const ctx: OnboardingFlowContext = {signupQualifier: 'individual', hasAccessibleDomainPolicies: true, purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM}; - expect(getOnboardingStepCounter(O.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 1, total: 6}, progressBarPercentage: 17}); - expect(getOnboardingStepCounter(O.PRIVATE_DOMAIN, ctx)).toEqual({stepCounter: {step: 2, total: 6}, progressBarPercentage: 33}); + expect(getOnboardingStepCounter(O.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 1, total: 6}}); + expect(getOnboardingStepCounter(O.PRIVATE_DOMAIN, ctx)).toEqual({stepCounter: {step: 2, total: 6}}); // WORKSPACES is not traversed by an unvalidated private-domain user, so it has no step counter. expect(getOnboardingStepCounter(O.WORKSPACES, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}, progressBarPercentage: 83}); - expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(O.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}}); + expect(getOnboardingStepCounter(O.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}}); + expect(getOnboardingStepCounter(O.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}}); + expect(getOnboardingStepCounter(O.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}}); }); - it('returns correct step/total/percentage for validated private domain + individual + MANAGE_TEAM with joinable workspaces (6-step flow)', () => { + it('returns correct step/total for validated private domain + individual + MANAGE_TEAM with joinable workspaces (6-step flow)', () => { const ctx: OnboardingFlowContext = { signupQualifier: 'individual', hasAccessibleDomainPolicies: true, @@ -397,14 +397,14 @@ describe('getOnboardingStepCounter', () => { hasJoinablePolicies: true, purposeSelected: ONBOARDING_CHOICES.MANAGE_TEAM, }; - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 1, total: 6}, progressBarPercentage: 17}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PERSONAL_DETAILS, ctx)).toEqual({stepCounter: {step: 1, total: 6}}); // Validated users skip PRIVATE_DOMAIN, so it has no step counter. expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PRIVATE_DOMAIN, ctx)).toBeUndefined(); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.WORKSPACES, ctx)).toEqual({stepCounter: {step: 2, total: 6}, progressBarPercentage: 33}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}, progressBarPercentage: 50}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}, progressBarPercentage: 67}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}, progressBarPercentage: 83}); - expect(getOnboardingStepCounter(SCREENS.ONBOARDING.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}, progressBarPercentage: 100}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.WORKSPACES, ctx)).toEqual({stepCounter: {step: 2, total: 6}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.PURPOSE, ctx)).toEqual({stepCounter: {step: 3, total: 6}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.EMPLOYEES, ctx)).toEqual({stepCounter: {step: 4, total: 6}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.INTERESTED_FEATURES, ctx)).toEqual({stepCounter: {step: 5, total: 6}}); + expect(getOnboardingStepCounter(SCREENS.ONBOARDING.ACCOUNTING, ctx)).toEqual({stepCounter: {step: 6, total: 6}}); }); describe('sub-page mappings', () => { @@ -425,65 +425,59 @@ describe('getOnboardingStepCounter', () => { label: string; ctx: OnboardingFlowContext; expectedPurposeStep: number; - expectedPurposePct: number; - prefixPages: Array<{page: OnboardingScreen; step: number; pct: number}>; + prefixPages: Array<{page: OnboardingScreen; step: number}>; }> = [ { label: 'no-domain', ctx: {signupQualifier: 'individual'}, expectedPurposeStep: 1, - expectedPurposePct: 25, prefixPages: [], }, { label: 'public', ctx: {signupQualifier: 'individual', isFromPublicDomain: true}, expectedPurposeStep: 3, - expectedPurposePct: 50, prefixPages: [ - {page: O.WORK_EMAIL, step: 1, pct: 17}, - {page: O.WORK_EMAIL_VALIDATION, step: 2, pct: 33}, + {page: O.WORK_EMAIL, step: 1}, + {page: O.WORK_EMAIL_VALIDATION, step: 2}, ], }, { label: 'public-skipped', ctx: {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: true}, expectedPurposeStep: 1, - expectedPurposePct: 25, prefixPages: [], }, { label: 'public-merge', ctx: {signupQualifier: 'individual', isFromPublicDomain: true, isMergeAccountStepSkipped: false}, expectedPurposeStep: 4, - expectedPurposePct: 57, prefixPages: [ - {page: O.WORK_EMAIL, step: 1, pct: 14}, - {page: O.WORK_EMAIL_VALIDATION, step: 2, pct: 29}, - {page: O.WORKSPACES, step: 3, pct: 43}, + {page: O.WORK_EMAIL, step: 1}, + {page: O.WORK_EMAIL_VALIDATION, step: 2}, + {page: O.WORKSPACES, step: 3}, ], }, { label: 'private', ctx: {signupQualifier: 'individual', hasAccessibleDomainPolicies: true}, expectedPurposeStep: 3, - expectedPurposePct: 50, prefixPages: [ - {page: O.PERSONAL_DETAILS, step: 1, pct: 17}, - {page: O.PRIVATE_DOMAIN, step: 2, pct: 33}, + {page: O.PERSONAL_DETAILS, step: 1}, + {page: O.PRIVATE_DOMAIN, step: 2}, ], }, ]; - it.each(domainVariants)('$label: PURPOSE returns step $expectedPurposeStep without total', ({ctx, expectedPurposeStep, expectedPurposePct}) => { + it.each(domainVariants)('$label: PURPOSE returns step $expectedPurposeStep without total', ({ctx, expectedPurposeStep}) => { const result = getOnboardingStepCounter(O.PURPOSE, ctx); - expect(result).toEqual({stepCounter: {step: expectedPurposeStep}, progressBarPercentage: expectedPurposePct}); + expect(result).toEqual({stepCounter: {step: expectedPurposeStep}}); }); it.each(domainVariants)('$label: prefix pages return correct steps without total', ({ctx, prefixPages}) => { - for (const {page, step, pct} of prefixPages) { + for (const {page, step} of prefixPages) { const result = getOnboardingStepCounter(page, ctx); - expect(result).toEqual({stepCounter: {step}, progressBarPercentage: pct}); + expect(result).toEqual({stepCounter: {step}}); } }); @@ -493,40 +487,6 @@ describe('getOnboardingStepCounter', () => { }); }); - describe('indeterminate percentages never exceed the next page after purpose selection', () => { - const domainVariants: Array<{label: string; ctx: Partial}> = [ - {label: 'no-domain', ctx: {}}, - {label: 'public', ctx: {isFromPublicDomain: true}}, - {label: 'public-skipped', ctx: {isFromPublicDomain: true, isMergeAccountStepSkipped: true}}, - {label: 'public-merge', ctx: {isFromPublicDomain: true, isMergeAccountStepSkipped: false}}, - {label: 'private', ctx: {hasAccessibleDomainPolicies: true}}, - ]; - - it.each(domainVariants)('$label: PURPOSE indeterminate percent is less than or equal to min next-page percent across all purposes', ({ctx}) => { - const indeterminateCtx: OnboardingFlowContext = {signupQualifier: 'individual', ...ctx}; - const purposeResult = getOnboardingStepCounter(O.PURPOSE, indeterminateCtx); - expect(purposeResult).toBeDefined(); - - for (const purpose of Object.values(ONBOARDING_CHOICES)) { - const flow = getOnboardingFlow({...indeterminateCtx, purposeSelected: purpose}); - if (!flow) { - continue; - } - const purposeIndex = flow.indexOf(O.PURPOSE); - if (purposeIndex === -1 || purposeIndex >= flow.length - 1) { - continue; - } - const nextPage = flow.at(purposeIndex + 1); - if (!nextPage) { - continue; - } - const nextResult = getOnboardingStepCounter(nextPage, {...indeterminateCtx, purposeSelected: purpose}); - expect(nextResult).toBeDefined(); - expect(nextResult?.progressBarPercentage).toBeGreaterThanOrEqual(purposeResult?.progressBarPercentage ?? 0); - } - }); - }); - it('returns undefined for a page that is not in the flow', () => { expect(getOnboardingStepCounter(O.PURPOSE, {signupQualifier: 'vsb'})).toBeUndefined(); });