From 4c6d1d1b5f88950bf1bc2bda377c2ebe8410cf03 Mon Sep 17 00:00:00 2001 From: KJ21-ENG <140263938+KJ21-ENG@users.noreply.github.com> Date: Mon, 9 Nov 2026 15:10:59 +0000 Subject: [PATCH] refactor: check onboarding company size instead of asserting it IntroSelected.companySize is a plain string from the server. Return it only when it is a known CONST.ONBOARDING_COMPANY_SIZE value, current or legacy, instead of casting it at four call sites. --- src/libs/actions/IOU/PayMoneyRequest.ts | 7 +++---- src/libs/actions/Policy/Policy.ts | 4 ++-- src/libs/actions/Report/index.ts | 4 ++-- src/libs/actions/Welcome/OnboardingFlow.ts | 21 +++++++++++++++++++-- tests/unit/OnboardingFlowTest.ts | 22 +++++++++++++++++++++- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/libs/actions/IOU/PayMoneyRequest.ts b/src/libs/actions/IOU/PayMoneyRequest.ts index 03964ac7f32e..5a26926a94f0 100644 --- a/src/libs/actions/IOU/PayMoneyRequest.ts +++ b/src/libs/actions/IOU/PayMoneyRequest.ts @@ -35,8 +35,7 @@ import {buildPolicyData, generatePolicyID} from '@userActions/Policy/Policy'; import type {BuildPolicyDataKeys} from '@userActions/Policy/Policy'; import {completeOnboarding} from '@userActions/Report'; import {notifyNewAction} from '@userActions/Report/reportActionSubscribers'; -import {getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow'; -import type {OnboardingCompanySize} from '@userActions/Welcome/OnboardingFlow'; +import {getIntroSelectedCompanySize, getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -236,7 +235,7 @@ function getPayMoneyRequestParams({ introSelected, activePolicy, conciergeChat, - companySize: introSelected?.companySize as OnboardingCompanySize, + companySize: getIntroSelectedCompanySize(introSelected), isSelfTourViewed, delegateAccountID, // This workspace is created by the invoice payment command, which does not apply CreatePolicy's @@ -894,7 +893,7 @@ function completePaymentOnboarding( onboardingPolicyID, paymentSelected, wasInvited: true, - companySize: introSelected?.companySize as OnboardingCompanySize, + companySize: getIntroSelectedCompanySize(introSelected), introSelected, isSelfTourViewed, conciergeChat, diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 5ba5b5eb276d..7d88b584f77c 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -122,7 +122,7 @@ import * as PaymentMethods from '@userActions/PaymentMethods'; import * as PersistedRequests from '@userActions/PersistedRequests'; import {buildTaskData, getOnboardingTaskCompletionOnSuccessData, withReviewWorkspaceSettingsTaskData} from '@userActions/Task'; import type {OnboardingTaskCompletionOnyxData} from '@userActions/Task'; -import {getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow'; +import {getIntroSelectedCompanySize, getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow'; import type {OnboardingCompanySize, OnboardingPurpose} from '@userActions/Welcome/OnboardingFlow'; import CONST from '@src/CONST'; @@ -3301,7 +3301,7 @@ function buildPolicyData(options: BuildPolicyDataOptions): OnyxData): OnboardingCompanySize | undefined { + const companySize = introSelected?.companySize; + return Object.values(CONST.ONBOARDING_COMPANY_SIZE).find((size) => size === companySize); +} + /** * Resolves the onboarding path to resume after required-2FA setup during incomplete guided setup. */ @@ -209,4 +218,12 @@ async function resumeOnboardingAfterRequired2FASetup(onboardingFlowParams: GetOn const getOnboardingMessages = (locale?: Locale) => buildOnboardingMessages(onboardingData, locale); export type {OnboardingMessage, OnboardingTask, OnboardingTaskLinks, OnboardingPurpose, OnboardingCompanySize, GetOnboardingInitialPathParamsType}; -export {buildOnboardingFlowParams, getOnboardingInitialPath, getRequired2FAOnboardingResumePath, resumeOnboardingAfterRequired2FASetup, startOnboardingFlow, getOnboardingMessages}; +export { + buildOnboardingFlowParams, + getIntroSelectedCompanySize, + getOnboardingInitialPath, + getRequired2FAOnboardingResumePath, + resumeOnboardingAfterRequired2FASetup, + startOnboardingFlow, + getOnboardingMessages, +}; diff --git a/tests/unit/OnboardingFlowTest.ts b/tests/unit/OnboardingFlowTest.ts index 8e71267e8d38..16e5549b6f4c 100644 --- a/tests/unit/OnboardingFlowTest.ts +++ b/tests/unit/OnboardingFlowTest.ts @@ -1,4 +1,4 @@ -import {getOnboardingInitialPath, getOnboardingMessages, getRequired2FAOnboardingResumePath, startOnboardingFlow} from '@libs/actions/Welcome/OnboardingFlow'; +import {getIntroSelectedCompanySize, getOnboardingInitialPath, getOnboardingMessages, getRequired2FAOnboardingResumePath, startOnboardingFlow} from '@libs/actions/Welcome/OnboardingFlow'; import type {GetOnboardingInitialPathParamsType} from '@libs/actions/Welcome/OnboardingFlow'; import getAdaptedStateFromPath from '@libs/Navigation/helpers/getAdaptedStateFromPath'; import navigationRef from '@libs/Navigation/navigationRef'; @@ -329,6 +329,26 @@ describe('OnboardingFlow', () => { }); }); + describe('getIntroSelectedCompanySize', () => { + it('keeps current and legacy company sizes', () => { + // Given company sizes saved by the current onboarding UI and by an older one that the UI no longer offers + // When they are read back for the onboarding request + // Then both are sent, so users who onboarded with a legacy range keep their company size + expect(getIntroSelectedCompanySize({companySize: '5-9'})).toBe(CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM); + expect(getIntroSelectedCompanySize({companySize: '1-10'})).toBe(CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO); + }); + + it('drops a company size that is not a known size', () => { + // Given a stored value that is not one of the known sizes, and no saved value at all + // When they are read back for the onboarding request + // Then no company size is returned, so an unknown string is never sent as a company size + expect(getIntroSelectedCompanySize({companySize: '7-8'})).toBeUndefined(); + expect(getIntroSelectedCompanySize({companySize: ''})).toBeUndefined(); + expect(getIntroSelectedCompanySize({})).toBeUndefined(); + expect(getIntroSelectedCompanySize(undefined)).toBeUndefined(); + }); + }); + describe('getRequired2FAOnboardingResumePath', () => { it('returns personal-details for private domain users with accessible policies and no saved path', () => { const params: GetOnboardingInitialPathParamsType = {