diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 4ea083065270..6ae6254ee58c 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -174,15 +174,16 @@ const onboardingInviteTypes = { const onboardingCompanySize = { MICRO_SMALL: '1-4', - MICRO_MEDIUM: '5-10', - - // This range is deprecated in favor of the smaller ranges above, but the constant is kept to compare against saved data for backwards compatibility. - MICRO: '1-10', - - SMALL: '11-50', + MICRO_MEDIUM: '5-9', + SMALL: '10-50', MEDIUM_SMALL: '51-100', MEDIUM: '101-1000', LARGE: '1001+', + + // These ranges are deprecated, but the constants are kept to compare against saved data for backwards compatibility. + LEGACY_MICRO_MEDIUM: '5-10', + LEGACY_MICRO: '1-10', + LEGACY_SMALL: '11-50', } as const; const onboardingPersonalTrackGoals = { diff --git a/src/components/SidePanel/RHPVariantTest/index.ts b/src/components/SidePanel/RHPVariantTest/index.ts index a859526d94c3..c0d49247d3ef 100644 --- a/src/components/SidePanel/RHPVariantTest/index.ts +++ b/src/components/SidePanel/RHPVariantTest/index.ts @@ -50,7 +50,8 @@ const shouldOpenRHPVariant: ShouldOpenRHPVariant = (variantOverride) => { const isMicroCompany = onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL || onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM || - onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO; + onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM || + onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO; const isRHPConciergeDM = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_CONCIERGE_DM; const isRHPAdminsRoom = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM; const isRHPHomePage = variant === CONST.ONBOARDING_RHP_VARIANT.RHP_HOME_PAGE; diff --git a/src/languages/de.ts b/src/languages/de.ts index 2e048d889719..d0ea7de3c381 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -3373,12 +3373,14 @@ ${amount} für ${merchant} – ${date}`, employees: { title: 'Wie viele Mitarbeitende haben Sie?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1–4 Mitarbeitende', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–10 Mitarbeitende', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1–10 Mitarbeitende', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11–50 Mitarbeitende', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–9 Mitarbeitende', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10–50 Mitarbeitende', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51–100 Mitarbeitende', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101–1.000 Mitarbeitende', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Mehr als 1.000 Mitarbeitende', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5–10 Mitarbeitende', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1–10 Mitarbeitende', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11–50 Mitarbeitende', }, accounting: { title: 'Verwendest du eine Buchhaltungssoftware?', diff --git a/src/languages/el.ts b/src/languages/el.ts index 978da7162459..68a948852050 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -3425,12 +3425,14 @@ ${amount} για ${merchant} - ${date}`, employees: { title: 'Πόσους υπαλλήλους έχετε;', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1–4 εργαζόμενοι', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-10 εργαζόμενοι', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1–10 εργαζόμενοι', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11–50 εργαζόμενοι', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–9 εργαζόμενοι', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10–50 εργαζόμενοι', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51-100 εργαζόμενοι', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101-1.000 εργαζόμενοι', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Περισσότεροι από 1.000 εργαζόμενοι', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5-10 εργαζόμενοι', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1–10 εργαζόμενοι', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11–50 εργαζόμενοι', }, accounting: { title: 'Χρησιμοποιείτε κάποιο λογιστικό λογισμικό;', diff --git a/src/languages/en.ts b/src/languages/en.ts index b5825e8ffeee..f2f3f4012768 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3471,12 +3471,14 @@ const translations = { employees: { title: 'How many employees do you have?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1-4 employees', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-10 employees', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 employees', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11-50 employees', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-9 employees', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10-50 employees', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51-100 employees', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101-1,000 employees', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'More than 1,000 employees', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5-10 employees', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 employees', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11-50 employees', }, accounting: { title: 'Do you use any accounting software?', diff --git a/src/languages/es.ts b/src/languages/es.ts index 44ed1ed628eb..09b6ca7d0e78 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3279,12 +3279,14 @@ ${amount} para ${merchant} - ${date}`, employees: { title: '¿Cuántos empleados tienes?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1-4 empleados', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-10 empleados', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 empleados', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11-50 empleados', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-9 empleados', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10-50 empleados', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51-100 empleados', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101-1,000 empleados', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Más de 1,000 empleados', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5-10 empleados', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 empleados', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11-50 empleados', }, accounting: { title: '¿Utilizas algún software de contabilidad?', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 0d793dae8174..5105bf26266f 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -3379,12 +3379,14 @@ ${amount} pour ${merchant} - ${date}`, employees: { title: 'Combien d’employés avez-vous ?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1 à 4 employés', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5 à 10 employés', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1 à 10 employés', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11 à 50 employés', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5 à 9 employés', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10 à 50 employés', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51 à 100 employés', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101 à 1 000 employés', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Plus de 1 000 employés', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5 à 10 employés', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1 à 10 employés', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11 à 50 employés', }, accounting: { title: 'Utilisez-vous un logiciel de comptabilité ?', diff --git a/src/languages/it.ts b/src/languages/it.ts index 4f26513f54b4..ceba4dcd6586 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -3359,12 +3359,14 @@ ${amount} per ${merchant} - ${date}`, employees: { title: 'Quanti dipendenti hai?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1-4 dipendenti', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-10 dipendenti', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 dipendenti', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11-50 dipendenti', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-9 dipendenti', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10-50 dipendenti', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51-100 dipendenti', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: 'Da 101 a 1.000 dipendenti', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Più di 1.000 dipendenti', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5-10 dipendenti', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 dipendenti', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11-50 dipendenti', }, accounting: { title: 'Usi un software di contabilità?', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 42828ac56568..8393d6f5012e 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -3330,12 +3330,14 @@ ${date} の ${merchant} への ${amount}`, employees: { title: '従業員は何人いますか?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1~4名の従業員', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5~10人の従業員', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '従業員数 1~10 人', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11~50名の従業員', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5~9人の従業員', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10~50名の従業員', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51~100人の従業員', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101~1,000人の従業員', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: '1,000人超の従業員', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5~10人の従業員', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '従業員数 1~10 人', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11~50名の従業員', }, accounting: { title: '会計ソフトを利用していますか?', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 05e69b44940b..c2f0bb7326df 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -3362,12 +3362,14 @@ ${amount} voor ${merchant} - ${date}`, employees: { title: 'Hoeveel medewerkers heb je?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1-4 medewerkers', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-10 medewerkers', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 medewerkers', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11-50 medewerkers', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5-9 medewerkers', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10-50 medewerkers', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51-100 medewerkers', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101-1.000 werknemers', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Meer dan 1.000 medewerkers', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5-10 medewerkers', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 medewerkers', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11-50 medewerkers', }, accounting: { title: 'Gebruikt u een boekhoudprogramma?', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 5c9102171d4b..91751dd81145 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -3391,12 +3391,14 @@ ${amount} dla ${merchant} - ${date}`, employees: { title: 'Ilu masz pracowników?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1–4 pracowników', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–10 pracowników', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1–10 pracowników', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11–50 pracowników', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–9 pracowników', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10–50 pracowników', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51–100 pracowników', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101–1 000 pracowników', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Ponad 1000 pracowników', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5–10 pracowników', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1–10 pracowników', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11–50 pracowników', }, accounting: { title: 'Czy korzystasz z jakiegoś oprogramowania księgowego?', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 3287f909cc82..13932709fb40 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -3350,12 +3350,14 @@ ${amount} para ${merchant} - ${date}`, employees: { title: 'Quantos funcionários você tem?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1–4 funcionários', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–10 funcionários', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 funcionários', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11–50 funcionários', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–9 funcionários', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10–50 funcionários', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51 a 100 funcionários', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101–1.000 funcionários', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: 'Mais de 1.000 funcionários', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5–10 funcionários', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 funcionários', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11–50 funcionários', }, accounting: { title: 'Você usa algum software de contabilidade?', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 8386da74d887..3d8b632906bb 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -3246,12 +3246,14 @@ ${amount},商户:${merchant} - 日期:${date}`, employees: { title: '您有多少名员工?', [CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL]: '1–4 名员工', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–10 名员工', - [CONST.ONBOARDING_COMPANY_SIZE.MICRO]: '1-10 名员工', - [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '11–50 名员工', + [CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM]: '5–9 名员工', + [CONST.ONBOARDING_COMPANY_SIZE.SMALL]: '10–50 名员工', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL]: '51–100 名员工', [CONST.ONBOARDING_COMPANY_SIZE.MEDIUM]: '101–1,000 名员工', [CONST.ONBOARDING_COMPANY_SIZE.LARGE]: '超过 1,000 名员工', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM]: '5–10 名员工', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO]: '1-10 名员工', + [CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL]: '11–50 名员工', }, accounting: { title: '你是否使用任何会计软件?', diff --git a/src/libs/getWorkspaceCreatedAnalyticsEvent.ts b/src/libs/getWorkspaceCreatedAnalyticsEvent.ts index 60bcbdf51d2a..0c1d377930bf 100644 --- a/src/libs/getWorkspaceCreatedAnalyticsEvent.ts +++ b/src/libs/getWorkspaceCreatedAnalyticsEvent.ts @@ -12,6 +12,8 @@ const SALES_ELIGIBLE_COMPANY_SIZES = new Set([ CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL, CONST.ONBOARDING_COMPANY_SIZE.MEDIUM, CONST.ONBOARDING_COMPANY_SIZE.LARGE, + CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM, + CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL, ]); /** diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index 113cdd515238..66997c844b0d 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -88,15 +88,19 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE const isVsb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB; return Object.values(CONST.ONBOARDING_COMPANY_SIZE) .filter((size) => { - // Always hide the deprecated 1-10 option. - if (size === CONST.ONBOARDING_COMPANY_SIZE.MICRO) { + // Always hide deprecated options. + if ( + size === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO_MEDIUM || + size === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO || + size === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_SMALL + ) { return false; } - // For VSB-qualified users (1-9 from landing page), only show 1-4 and 5-10. + // For VSB-qualified users (1-9 from landing page), only show 1-4 and 5-9. if (isVsb) { return size === CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL || size === CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM; } - // For SMB-qualified users, hide 1-4 and 5-10 since they already indicated 10+. + // For SMB-qualified users, hide 1-4 and 5-9 since they already indicated 10+. if (isSmb) { return size !== CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL && size !== CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM; } diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx index 0c5a628b26b2..94be13a4eb84 100644 --- a/src/pages/inbox/HeaderView.tsx +++ b/src/pages/inbox/HeaderView.tsx @@ -222,7 +222,6 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps) isAdminRoom(report) && !!canUserPerformWriteAction(report, isReportArchived) && !isChatThread && - introSelected?.companySize !== CONST.ONBOARDING_COMPANY_SIZE.MICRO && introSelected?.companySize !== CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL; const accountManagerAccountID = bookCallDetails?.accountManagerAccountID; @@ -234,7 +233,6 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps) !accountManagerAccountID && !!accountGuideDetails?.calendarLink && accountGuideDetails?.email !== CONST.EMAIL.CONCIERGE && - introSelected?.companySize !== CONST.ONBOARDING_COMPANY_SIZE.MICRO && introSelected?.companySize !== CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL; // Show the "Book a call" button in the 1:1 DM with the assigned support person, or in the Concierge chat @@ -329,7 +327,7 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps) const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED); const isChatUsedForOnboarding = isChatUsedForOnboardingReportUtils(report, onboarding, conciergeReportID, onboardingPurposeSelected); const shouldShowRegisterForWebinar = - (introSelected?.companySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO || introSelected?.companySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL) && + (introSelected?.companySize === CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO || introSelected?.companySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL) && (isChatUsedForOnboarding || (isAdminRoom(report) && !isChatThread)) && !shouldMirrorSidePanelHeader; const shouldShowOnBoardingHelpDropdownButton = (shouldShowRegisterForWebinar || shouldShowGuideBooking) && !isReportArchived && !shouldMirrorSidePanelHeader; diff --git a/tests/actions/IOUTest/PayMoneyRequestTest.ts b/tests/actions/IOUTest/PayMoneyRequestTest.ts index 66a2cf63d91a..940af85d9d89 100644 --- a/tests/actions/IOUTest/PayMoneyRequestTest.ts +++ b/tests/actions/IOUTest/PayMoneyRequestTest.ts @@ -2259,7 +2259,7 @@ describe('actions/IOU/PayMoneyRequest', () => { const introSelected: IntroSelected = { choice: CONST.ONBOARDING_CHOICES.SUBMIT, inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, }; completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID, undefined, undefined); @@ -2268,7 +2268,7 @@ describe('actions/IOU/PayMoneyRequest', () => { engagementChoice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM, paymentSelected: CONST.PAYMENT_SELECTED.BBA, wasInvited: true, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, introSelected, isSelfTourViewed: false, }), @@ -2350,7 +2350,7 @@ describe('actions/IOU/PayMoneyRequest', () => { const introSelected: IntroSelected = { choice: CONST.ONBOARDING_CHOICES.SUBMIT, inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, }; completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, true, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID, undefined, undefined); @@ -2366,7 +2366,7 @@ describe('actions/IOU/PayMoneyRequest', () => { const introSelected: IntroSelected = { choice: CONST.ONBOARDING_CHOICES.SUBMIT, inviteType: CONST.ONBOARDING_INVITE_TYPES.IOU, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, }; const conciergeChat = {reportID: 'concierge-onboarding-1'}; completePaymentOnboarding(CONST.PAYMENT_SELECTED.BBA, introSelected, false, [CONST.BETAS.ALL], CARLOS_ACCOUNT_ID, conciergeChat, undefined); diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index 461002d895e7..f31acf198b14 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -3319,7 +3319,7 @@ describe('actions/Report', () => { onboardingMessage: onboardingMessages[engagementChoice], adminsChatReportID, onboardingPolicyID, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: null, introSelected: {choice: engagementChoice}, isSelfTourViewed: false, @@ -3356,7 +3356,7 @@ describe('actions/Report', () => { onboardingMessage: onboardingMessages[engagementChoice], adminsChatReportID: '7957055873634068', onboardingPolicyID: 'A70D00C752416808', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: null, selectedInterestedFeatures, introSelected: {choice: engagementChoice}, @@ -3391,7 +3391,7 @@ describe('actions/Report', () => { onboardingMessage: onboardingMessages[engagementChoice], adminsChatReportID: '7957055873634069', onboardingPolicyID: 'A70D00C752416809', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: 'other', userReportedIntegrationName: 'Acme Books', introSelected: {choice: engagementChoice}, @@ -3427,7 +3427,7 @@ describe('actions/Report', () => { onboardingMessage: onboardingMessages[engagementChoice], adminsChatReportID: '7957055873634070', onboardingPolicyID: 'A70D00C752416810', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: 'other', introSelected: {choice: engagementChoice}, isSelfTourViewed: false, @@ -3469,7 +3469,7 @@ describe('actions/Report', () => { const onboardingData = ReportUtils.prepareOnboardingOnyxData({ engagementChoice, onboardingMessage: onboardingMessages[engagementChoice], - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: null, introSelected: {choice: engagementChoice}, isSelfTourViewed: false, @@ -3517,7 +3517,7 @@ describe('actions/Report', () => { const onboardingData = ReportUtils.prepareOnboardingOnyxData({ engagementChoice, onboardingMessage: onboardingMessages[engagementChoice], - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: null, introSelected: {choice: engagementChoice}, isSelfTourViewed: false, @@ -3550,7 +3550,7 @@ describe('actions/Report', () => { const onboardingData = ReportUtils.prepareOnboardingOnyxData({ engagementChoice, onboardingMessage: onboardingMessages[engagementChoice], - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, userReportedIntegration: null, introSelected: {choice: engagementChoice}, isSelfTourViewed: false, diff --git a/tests/ui/OnboardingEmployees.tsx b/tests/ui/OnboardingEmployees.tsx index f3a1e6d221de..cde602d7ac35 100644 --- a/tests/ui/OnboardingEmployees.tsx +++ b/tests/ui/OnboardingEmployees.tsx @@ -83,7 +83,7 @@ describe('OnboardingEmployees Page', () => { jest.clearAllMocks(); }); - it('should display 1-4 and 5-10 options and hide legacy 1-10 when the signupQualifier is not smb', async () => { + it('should display 1-4 and 5-9 options and hide legacy 1-10 when the signupQualifier is not smb', async () => { await TestHelper.signInWithTestUser(); await act(async () => { @@ -99,7 +99,7 @@ describe('OnboardingEmployees Page', () => { await waitFor(() => { expect(screen.getByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL}`))).toBeOnTheScreen(); expect(screen.getByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM}`))).toBeOnTheScreen(); - expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO}`))).not.toBeOnTheScreen(); + expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO}`))).not.toBeOnTheScreen(); }); unmount(); @@ -107,7 +107,7 @@ describe('OnboardingEmployees Page', () => { await waitForBatchedUpdatesWithAct(); }); - it('should display only 1-4 and 5-10 options when the signupQualifier is vsb', async () => { + it('should display only 1-4 and 5-9 options when the signupQualifier is vsb', async () => { await TestHelper.signInWithTestUser(); await act(async () => { @@ -124,7 +124,7 @@ describe('OnboardingEmployees Page', () => { await waitFor(() => { expect(screen.getByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL}`))).toBeOnTheScreen(); expect(screen.getByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM}`))).toBeOnTheScreen(); - expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO}`))).not.toBeOnTheScreen(); + expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO}`))).not.toBeOnTheScreen(); expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.SMALL}`))).not.toBeOnTheScreen(); expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MEDIUM_SMALL}`))).not.toBeOnTheScreen(); expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MEDIUM}`))).not.toBeOnTheScreen(); @@ -212,7 +212,7 @@ describe('OnboardingEmployees Page', () => { await waitForBatchedUpdatesWithAct(); }); - it('should hide 1-4, 5-10, and legacy 1-10 options when the signupQualifier is smb', async () => { + it('should hide 1-4, 5-9, and legacy 1-10 options when the signupQualifier is smb', async () => { await TestHelper.signInWithTestUser(); await act(async () => { @@ -229,7 +229,7 @@ describe('OnboardingEmployees Page', () => { await waitFor(() => { expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL}`))).not.toBeOnTheScreen(); expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO_MEDIUM}`))).not.toBeOnTheScreen(); - expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.MICRO}`))).not.toBeOnTheScreen(); + expect(screen.queryByText(TestHelper.translateLocal(`onboarding.employees.${CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO}`))).not.toBeOnTheScreen(); }); unmount(); diff --git a/tests/ui/OnboardingPurpose.tsx b/tests/ui/OnboardingPurpose.tsx index c896ecaf79c0..dc479b7049e4 100644 --- a/tests/ui/OnboardingPurpose.tsx +++ b/tests/ui/OnboardingPurpose.tsx @@ -359,7 +359,7 @@ describe('OnboardingPurpose Page', () => { const introSelectedValue = { choice: CONST.ONBOARDING_CHOICES.EMPLOYER, inviteType: CONST.ONBOARDING_INVITE_TYPES.CHAT, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, }; await act(async () => { diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts index b6beff47d587..4a2c8125aae0 100644 --- a/tests/unit/ReportUtilsTest.ts +++ b/tests/unit/ReportUtilsTest.ts @@ -976,7 +976,7 @@ describe('ReportUtils', () => { tasks: [{type: CONST.ONBOARDING_TASK_TYPE.CONNECT_CORPORATE_CARD, title: () => '', description: () => '', autoCompleted: false}], }, adminsChatReportID, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); // Tasks are sent to server via guidedSetupData; not added optimistically to avoid flash. @@ -1159,7 +1159,7 @@ describe('ReportUtils', () => { tasks: [{type: CONST.ONBOARDING_TASK_TYPE.CONNECT_CORPORATE_CARD, title: () => '', description: () => '', autoCompleted: false}], }, adminsChatReportID, - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); // Tasks sent to server via guidedSetupData; no optimistic task actions added. @@ -1179,7 +1179,7 @@ describe('ReportUtils', () => { tasks: [{type: CONST.ONBOARDING_TASK_TYPE.CONNECT_CORPORATE_CARD, title: () => '', description: () => '', autoCompleted: false}], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); @@ -1199,7 +1199,7 @@ describe('ReportUtils', () => { tasks: [], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); @@ -1228,7 +1228,7 @@ describe('ReportUtils', () => { tasks: [], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); @@ -1307,7 +1307,7 @@ describe('ReportUtils', () => { tasks: [], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); @@ -1324,7 +1324,7 @@ describe('ReportUtils', () => { tasks: [], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); @@ -1347,7 +1347,7 @@ describe('ReportUtils', () => { tasks: [], }, adminsChatReportID: '1', - companySize: CONST.ONBOARDING_COMPANY_SIZE.MICRO, + companySize: CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, delegateAccountID: undefined, }); diff --git a/tests/unit/getWorkspaceCreatedAnalyticsEventTest.ts b/tests/unit/getWorkspaceCreatedAnalyticsEventTest.ts index b81d29915439..89a6c7246824 100644 --- a/tests/unit/getWorkspaceCreatedAnalyticsEventTest.ts +++ b/tests/unit/getWorkspaceCreatedAnalyticsEventTest.ts @@ -26,7 +26,7 @@ describe('getWorkspaceCreatedAnalyticsEvent', () => { it.each([ // The "1-4" range is below 5 employees, and the deprecated "1-10" range can include fewer than 5 employees. CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL, - CONST.ONBOARDING_COMPANY_SIZE.MICRO, + CONST.ONBOARDING_COMPANY_SIZE.LEGACY_MICRO, ])('treats company size "%s" (possibly under 5 employees) as not sales eligible', (companySize) => { expect(getWorkspaceCreatedAnalyticsEvent(CONST.ONBOARDING_CHOICES.MANAGE_TEAM, companySize, PRIVATE_EMAIL)).toBe(STANDARD); });