From 835c74564a1b0069cf96b4024efec1873543b258 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 27 Jan 2026 20:31:59 +0800 Subject: [PATCH 1/6] refactor subscription size page to use useSubPage hook --- src/CONST/index.ts | 25 +++++++++++------ src/ROUTES.ts | 9 ++++-- .../MissingPersonalDetailsContent.tsx | 16 +++++------ src/pages/MissingPersonalDetails/utils.ts | 10 +++---- .../Subscription/SubscriptionSize/index.tsx | 28 ++++++++++++------- 5 files changed, 55 insertions(+), 33 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index afc7b1ec4cc3..eb6c980d75a0 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -2690,16 +2690,25 @@ const CONST = { VENDOR_BILL: 'VENDOR_BILL', }, - MISSING_PERSONAL_DETAILS: { - STEP_INDEX_LIST: ['1', '2', '3', '4'], - PAGE_NAME: { - LEGAL_NAME: 'legal-name', - DATE_OF_BIRTH: 'date-of-birth', - ADDRESS: 'address', - PHONE_NUMBER: 'phone-number', - CONFIRM: 'confirm', + SUB_PAGE: { + MISSING_PERSONAL_DETAILS: { + STEP_INDEX_LIST: ['1', '2', '3', '4'], + PAGE_NAME: { + LEGAL_NAME: 'legal-name', + DATE_OF_BIRTH: 'date-of-birth', + ADDRESS: 'address', + PHONE_NUMBER: 'phone-number', + CONFIRM: 'confirm', + }, + }, + SUBSCRIPTION_SIZE: { + PAGE_NAME: { + SIZE: 'size', + CONFIRM: 'confirm', + }, }, }, + MISSING_PERSONAL_DETAILS_INDEXES: { MAPPING: { LEGAL_NAME: 0, diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 83db556a2b2e..079f3ae37f7b 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -235,8 +235,13 @@ const ROUTES = { getRoute: (backTo?: string) => getUrlWithBackToParam('settings/subscription', backTo), }, SETTINGS_SUBSCRIPTION_SIZE: { - route: 'settings/subscription/subscription-size', - getRoute: (canChangeSize: 0 | 1) => `settings/subscription/subscription-size?canChangeSize=${canChangeSize as number}` as const, + route: 'settings/subscription/subscription-size/:subPage?', + getRoute: (canChangeSize: 0 | 1, subPage?: string) => { + if (!subPage) { + return `settings/subscription/subscription-size?canChangeSize=${canChangeSize as number}` as const; + } + return `settings/subscription/subscription-size/${subPage}?canChangeSize=${canChangeSize as number}` as const; + }, }, SETTINGS_SUBSCRIPTION_SETTINGS_DETAILS: 'settings/subscription/details', SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD: 'settings/subscription/add-payment-card', diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx index 331804ac065d..dc12480de6bb 100644 --- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx +++ b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx @@ -36,11 +36,11 @@ type MissingPersonalDetailsContentProps = { }; const formPages = [ - {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME, component: LegalName}, - {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.DATE_OF_BIRTH, component: DateOfBirth}, - {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.ADDRESS, component: Address}, - {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.PHONE_NUMBER, component: PhoneNumber}, - {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME, component: LegalName}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.DATE_OF_BIRTH, component: DateOfBirth}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.ADDRESS, component: Address}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.PHONE_NUMBER, component: PhoneNumber}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, ]; function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, headerTitle, onComplete}: MissingPersonalDetailsContentProps) { @@ -67,12 +67,12 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, hea const handleBackButtonPress = () => { if (isEditing) { - Navigation.goBack(ROUTES.MISSING_PERSONAL_DETAILS.getRoute(CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM)); + Navigation.goBack(ROUTES.MISSING_PERSONAL_DETAILS.getRoute(CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM)); return; } // Clicking back on the first screen should dismiss the modal - if (currentPageName === CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME) { + if (currentPageName === CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME) { clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM); Navigation.closeRHPFlow(); return; @@ -92,7 +92,7 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, hea /> diff --git a/src/pages/MissingPersonalDetails/utils.ts b/src/pages/MissingPersonalDetails/utils.ts index 03a4321d8011..22816af349a2 100644 --- a/src/pages/MissingPersonalDetails/utils.ts +++ b/src/pages/MissingPersonalDetails/utils.ts @@ -25,10 +25,10 @@ function getSubPageValues(privatePersonalDetails: OnyxEntry> = [Size, Confirmation]; - type SubscriptionSizePageProps = PlatformStackScreenProps; +const pages = [ + {pageName: CONST.SUB_PAGE.SUBSCRIPTION_SIZE.PAGE_NAME.SIZE, component: Size}, + {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, +]; + function SubscriptionSizePage({route}: SubscriptionSizePageProps) { const privateSubscription = usePrivateSubscription(); const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT, {canBeMissing: false}); @@ -35,14 +38,19 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) { const onFinished = () => { updateSubscriptionSize(subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0, privateSubscription?.userCount ?? 0); - Navigation.goBack(); + Navigation.goBack(ROUTES.SETTINGS_SUBSCRIPTION_SETTINGS_DETAILS); }; - const {componentToRender: SubStep, screenIndex, nextScreen, prevScreen, moveTo} = useSubStep({bodyContent, startFrom, onFinished}); + const {CurrentPage, pageIndex, prevPage, nextPage, moveTo} = useSubPage({ + pages, + onFinished, + startFrom, + buildRoute: (pageName) => ROUTES.SETTINGS_SUBSCRIPTION_SIZE.getRoute(route.params?.canChangeSize, pageName), + }); const onBackButtonPress = () => { - if (screenIndex !== 0 && startFrom === 0) { - prevScreen(); + if (pageIndex !== 0 && startFrom === 0) { + prevPage(); return; } @@ -77,9 +85,9 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) { title={translate('subscription.subscriptionSize.title')} onBackButtonPress={onBackButtonPress} /> - From a34677ce5f3e7022529d0fd861b9cd3c696939ce Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 28 Jan 2026 11:41:19 +0800 Subject: [PATCH 2/6] make the canChangeSize optional --- src/ROUTES.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 079f3ae37f7b..7e613877d40b 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -236,11 +236,12 @@ const ROUTES = { }, SETTINGS_SUBSCRIPTION_SIZE: { route: 'settings/subscription/subscription-size/:subPage?', - getRoute: (canChangeSize: 0 | 1, subPage?: string) => { - if (!subPage) { - return `settings/subscription/subscription-size?canChangeSize=${canChangeSize as number}` as const; - } - return `settings/subscription/subscription-size/${subPage}?canChangeSize=${canChangeSize as number}` as const; + getRoute: (canChangeSize?: 0 | 1, subPage?: string) => { + const baseRoute = 'settings/subscription/subscription-size'; + const subPageParam = subPage ? `/${subPage}` : ''; + const canChangeSizeParam = canChangeSize !== undefined ? `?canChangeSize=${canChangeSize as number}` : ''; + + return `${baseRoute}${subPageParam}${canChangeSizeParam}` as const; }, }, SETTINGS_SUBSCRIPTION_SETTINGS_DETAILS: 'settings/subscription/details', From e803e3deb377b01c9eec79401cbb247253fd9fcc Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 28 Jan 2026 12:55:27 +0800 Subject: [PATCH 3/6] refactor back the const --- src/CONST/index.ts | 29 +++++++++---------- .../MissingPersonalDetailsContent.tsx | 16 +++++----- src/pages/MissingPersonalDetails/utils.ts | 10 +++---- .../Subscription/SubscriptionSize/index.tsx | 4 +-- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index eb6c980d75a0..db99b5452c67 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -2690,22 +2690,21 @@ const CONST = { VENDOR_BILL: 'VENDOR_BILL', }, - SUB_PAGE: { - MISSING_PERSONAL_DETAILS: { - STEP_INDEX_LIST: ['1', '2', '3', '4'], - PAGE_NAME: { - LEGAL_NAME: 'legal-name', - DATE_OF_BIRTH: 'date-of-birth', - ADDRESS: 'address', - PHONE_NUMBER: 'phone-number', - CONFIRM: 'confirm', - }, + MISSING_PERSONAL_DETAILS: { + STEP_INDEX_LIST: ['1', '2', '3', '4'], + PAGE_NAME: { + LEGAL_NAME: 'legal-name', + DATE_OF_BIRTH: 'date-of-birth', + ADDRESS: 'address', + PHONE_NUMBER: 'phone-number', + CONFIRM: 'confirm', }, - SUBSCRIPTION_SIZE: { - PAGE_NAME: { - SIZE: 'size', - CONFIRM: 'confirm', - }, + }, + + SUBSCRIPTION_SIZE: { + PAGE_NAME: { + SIZE: 'size', + CONFIRM: 'confirm', }, }, diff --git a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx index dc12480de6bb..331804ac065d 100644 --- a/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx +++ b/src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx @@ -36,11 +36,11 @@ type MissingPersonalDetailsContentProps = { }; const formPages = [ - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME, component: LegalName}, - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.DATE_OF_BIRTH, component: DateOfBirth}, - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.ADDRESS, component: Address}, - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.PHONE_NUMBER, component: PhoneNumber}, - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME, component: LegalName}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.DATE_OF_BIRTH, component: DateOfBirth}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.ADDRESS, component: Address}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.PHONE_NUMBER, component: PhoneNumber}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, ]; function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, headerTitle, onComplete}: MissingPersonalDetailsContentProps) { @@ -67,12 +67,12 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, hea const handleBackButtonPress = () => { if (isEditing) { - Navigation.goBack(ROUTES.MISSING_PERSONAL_DETAILS.getRoute(CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM)); + Navigation.goBack(ROUTES.MISSING_PERSONAL_DETAILS.getRoute(CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM)); return; } // Clicking back on the first screen should dismiss the modal - if (currentPageName === CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME) { + if (currentPageName === CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.LEGAL_NAME) { clearDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM); Navigation.closeRHPFlow(); return; @@ -92,7 +92,7 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues, hea /> diff --git a/src/pages/MissingPersonalDetails/utils.ts b/src/pages/MissingPersonalDetails/utils.ts index 22816af349a2..03a4321d8011 100644 --- a/src/pages/MissingPersonalDetails/utils.ts +++ b/src/pages/MissingPersonalDetails/utils.ts @@ -25,10 +25,10 @@ function getSubPageValues(privatePersonalDetails: OnyxEntry; const pages = [ - {pageName: CONST.SUB_PAGE.SUBSCRIPTION_SIZE.PAGE_NAME.SIZE, component: Size}, - {pageName: CONST.SUB_PAGE.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, + {pageName: CONST.SUBSCRIPTION_SIZE.PAGE_NAME.SIZE, component: Size}, + {pageName: CONST.MISSING_PERSONAL_DETAILS.PAGE_NAME.CONFIRM, component: Confirmation}, ]; function SubscriptionSizePage({route}: SubscriptionSizePageProps) { From 992d71e3c12434964dc791e25da5105cfe8c7499 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Fri, 30 Jan 2026 15:16:57 +0800 Subject: [PATCH 4/6] use the correct constant --- src/pages/settings/Subscription/SubscriptionSize/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx index d9bf926bd5a9..2a6d4fa7908c 100644 --- a/src/pages/settings/Subscription/SubscriptionSize/index.tsx +++ b/src/pages/settings/Subscription/SubscriptionSize/index.tsx @@ -26,7 +26,7 @@ type SubscriptionSizePageProps = PlatformStackScreenProps Date: Tue, 3 Feb 2026 17:47:43 +0800 Subject: [PATCH 5/6] show loading indicator when redirecting --- src/pages/settings/Subscription/SubscriptionSize/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx index 2a6d4fa7908c..df2746021874 100644 --- a/src/pages/settings/Subscription/SubscriptionSize/index.tsx +++ b/src/pages/settings/Subscription/SubscriptionSize/index.tsx @@ -41,7 +41,7 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) { Navigation.goBack(ROUTES.SETTINGS_SUBSCRIPTION_SETTINGS_DETAILS); }; - const {CurrentPage, pageIndex, prevPage, nextPage, moveTo} = useSubPage({ + const {CurrentPage, pageIndex, prevPage, nextPage, moveTo, isRedirecting} = useSubPage({ pages, onFinished, startFrom, @@ -68,7 +68,7 @@ function SubscriptionSizePage({route}: SubscriptionSizePageProps) { return ; } - if (!privateSubscription) { + if (isRedirecting || !privateSubscription) { return ; } From 5236203bc627a2ed206db2e4f6c20276604ae8db Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 4 Feb 2026 01:13:58 +0800 Subject: [PATCH 6/6] update route type --- src/libs/Navigation/types.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index a29fb057fbda..cb65cdbd7f07 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -612,6 +612,8 @@ type SettingsNavigatorParamList = { }; [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: { canChangeSize: 0 | 1; + subPage?: string; + action?: 'edit'; }; [SCREENS.SETTINGS.SUBSCRIPTION.SETTINGS_DETAILS]: undefined; [SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: undefined;