Skip to content

fix: useSubPage followup#80497

Merged
arosiclair merged 5 commits intoExpensify:mainfrom
callstack-internal:fix/use-sub-page-followup
Feb 2, 2026
Merged

fix: useSubPage followup#80497
arosiclair merged 5 commits intoExpensify:mainfrom
callstack-internal:fix/use-sub-page-followup

Conversation

@MrMuzyk
Copy link
Contributor

@MrMuzyk MrMuzyk commented Jan 26, 2026

Explanation of Change

We now display a loading indicator while we're calculating the step to which user will get navigated. All animations should be executed correctly now

Fixed Issues

$ #80403
PROPOSAL:

Tests

Same as QA steps

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition: User is assigned a physical Expensify card.

  1. Go to workspace chat.
  2. Click Add shipping details.
  3. Proceed to confirm page.
  4. Close the confirm page.
  5. Refresh the page.
  6. Click Add shipping details.
  7. RHP should appear with a loading indicator and then correct page sliding in from right side
  8. Confirm page RHP will not appear twice.
  9. Close the RHP
  10. Click Add shipping details
  11. RHP should appear with a loading indicator and then correct page sliding in from right side
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android.native.mp4
Android: mWeb Chrome
android.web.mp4
iOS: Native
ios.native.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
web.mp4

@codecov
Copy link

codecov bot commented Jan 26, 2026

Codecov Report

❌ Patch coverage is 70.00000% with 3 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...gPersonalDetails/MissingPersonalDetailsContent.tsx 0.00% 3 Missing ⚠️
Files with missing lines Coverage Δ
src/hooks/useSubPage/index.tsx 100.00% <100.00%> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 7.85% <ø> (-0.13%) ⬇️
...gPersonalDetails/MissingPersonalDetailsContent.tsx 0.00% <0.00%> (ø)

... and 388 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@MrMuzyk MrMuzyk force-pushed the fix/use-sub-page-followup branch from 6be78ec to eeb0777 Compare January 28, 2026 11:02
@MrMuzyk MrMuzyk marked this pull request as ready for review January 28, 2026 13:04
@MrMuzyk MrMuzyk requested review from a team as code owners January 28, 2026 13:04
@melvin-bot melvin-bot bot requested review from dukenv0307 and joekaufmanexpensify and removed request for a team and joekaufmanexpensify January 28, 2026 13:04
@melvin-bot
Copy link

melvin-bot bot commented Jan 28, 2026

@dukenv0307 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot removed the request for review from a team January 28, 2026 13:04
import {findLastPageIndex, findPageIndex} from '@libs/SubPageUtils';
import type {SubPageProps, UseSubPageProps} from './types';

const AMOUNT_OF_FRAMES_TO_WAIT_FOR = 20;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ CONSISTENCY-2 (docs)

The value 20 for AMOUNT_OF_FRAMES_TO_WAIT_FOR lacks justification. While there's a comment explaining the general purpose of waiting frames, it doesn't explain why specifically 20 frames is the right amount.

Suggested fix:
Add a comment documenting why 20 frames was chosen:

// Wait 20 frames (~333ms at 60fps) to ensure modal animations complete before navigation
// This value was empirically determined to prevent visual flickers during the transition
const AMOUNT_OF_FRAMES_TO_WAIT_FOR = 20;

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@dukenv0307
Copy link
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Screen.Recording.2026-01-28.at.22.53.05.mov
Android: mWeb Chrome
Screen.Recording.2026-01-28.at.22.51.10.mov
iOS: HybridApp
Screen.Recording.2026-01-28.at.22.53.18.mov
iOS: mWeb Safari
Screen.Recording.2026-01-28.at.22.50.05.mov
MacOS: Chrome / Safari
Screen.Recording.2026-01-28.at.22.44.52.mov

Copy link
Contributor

@dukenv0307 dukenv0307 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot melvin-bot bot requested a review from arosiclair January 28, 2026 15:57
@dukenv0307
Copy link
Contributor

@arosiclair All yours

});

if (isRedirecting) {
return <FullScreenLoadingIndicator />;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we render the loading here, it won't have a header and its back button.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm aware and did it on purpose

@bernhardoj
Copy link
Contributor

bernhardoj commented Jan 30, 2026

Also, btw, I follow the pattern by making the subPage param optional, and passing the startFrom index to useSubPage.

For example,

const hasAuthError = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.NETSUITE);
...
startFrom: hasAuthError ? CREDENTIALS_PAGE_INDEX : 0,

Can we instead make subPage param required and then decide where to start from when navigating to the page instead of doing it inside the useSubPage hook? Example,

function getNetsuiteTokenInputStartFromPage(policy) {
    const hasAuthError = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.NETSUITE);
    return hasAuthError ? CONST.NETSUITE_CONFIG.TOKEN_INPUT_PAGE_NAME.CREDENTIALS : CONST.NETSUITE_CONFIG.TOKEN_INPUT_PAGE_NAME.INSTALL
}
...
Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID, getNetsuiteTokenInputStartFromPage(policy)));

So we won't have this issue.

@dukenv0307
Copy link
Contributor

@bernhardoj We already discussed this issue in https://expensify.slack.com/archives/C05LX9D6E07/p1769613606220809?thread_ts=1768850966.717579&cid=C05LX9D6E07. Can you please take a look and let us know in the Slack thread if you have any ideas? Thanks 😊

@MrMuzyk
Copy link
Contributor Author

MrMuzyk commented Feb 2, 2026

Can we instead make subPage param required and then decide where to start from when navigating to the page instead of doing it inside the useSubPage hook?

@bernhardoj We've discussed it on slack in detail but here is a short version. Calculating the the step to navigate to will differ. Sometimes it's always the same, sometimes its based on some BE values that are often fetched but thats not always the case.

When we have multiple places in the app that navigate to certain flow and initial step is calculated based on BE response you need to calculate the step in each of this places. It gets even more tricky if you don't have the data before navigating and you need to fetch it. For such cases we need to show the loader and do it inside the hook.

What we can possibly do is to navigate to correct screen if you can and it doesn't bring a lot of overhead and use the way with loader as an alternative for more complex cases.

@bernhardoj
Copy link
Contributor

What we can possibly do is to navigate to correct screen if you can and it doesn't bring a lot of overhead and use the way with loader as an alternative for more complex cases.

I see. That make sense. Thanks!

@arosiclair
Copy link
Contributor

GH actions are down so PR Reviewer Checklist is not running. The checklist is complete - I'm gonna merge this.

@arosiclair arosiclair merged commit 50c493c into Expensify:main Feb 2, 2026
32 of 34 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Feb 3, 2026

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.3.11-19 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 cancelled 🔪
🍎 iOS 🍎 cancelled 🔪

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2026

🚀 Deployed to production by https://github.com/Julesssss in version: 9.3.12-1 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants