fix: app restarts per diem creation flow after subrate step by mkzie2 · Pull Request #64212 · Expensify/App

mkzie2 · 2025-06-15T21:37:28Z

Explanation of Change

Fixed Issues

$ #63111
PROPOSAL: #63111 (comment)

Tests

Precondition:

No workspace with per diem enabled

Create a workspace > Enable Per diem > Import per diem rates
Go to the workspace chat > + > Create report
Click "Add expense" on the report preview > Create new expense
Select Per diem > Select any destination country > Proceed to confirmation step > Create expense
Verify the expense is created and linked to the selected report from step 3

Click FAB > Create expense > Per diem
Proceed to create a per diem expense
Verify the expense is created and linked to the workspace chat with per diem enabled

Create another workspace with per diem enabled and rates imported
Click FAB > Create expense
Select any destination workspace
Proceed to create a per diem expense
Verify the expense is created and linked to the selected workspace chat from step 3

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-06-16.at.11.17.18-compressed.mov

Android: mWeb Chrome

Screen.Recording.2025-06-16.at.11.20.24-compressed.mov

iOS: Native

Screen.Recording.2025-06-16.at.10.59.49-compressed.mov

iOS: mWeb Safari

Screen.Recording.2025-06-16.at.11.01.35-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-16.at.10.21.01-compressed.mov

MacOS: Desktop

Screen.Recording.2025-06-16.at.10.49.50-compressed.mov

melvin-bot · 2025-06-16T03:54:44Z

@brunovjk 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]

mkzie2 · 2025-06-16T04:11:25Z

src/pages/iou/request/step/IOURequestStepDestination.tsx

            navigateBack();
-        } else if (explicitPolicyID) {
+        } else if (explicitPolicyID && transaction?.isFromGlobalCreate) {
            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TIME.getRoute(action, iouType, transactionID, policyExpenseReport?.reportID ?? reportID));


My RCA was not completely correct. This logic is not to guaranteer the report to open after creating the expense. It is to indicate the destination workspace report to link the expense to when there are multiple workspaces with per diem enabled.

When you create expense from global create button and there are multiple workspaces with per diem rates, you would have to choose the destination workspace. After selecting the destination workspace, explicitPolicyID is set to that workspace ID. That means we should only execute this logic if the flow was initialized from the global create button.

The logic for navigation after creating the report is unchanged from production:

When you create the expense from the "Add expense" button on the expense report preview > Open the expense report

When you create the expense from the workspace chat's create button > Open the workspace chat report

Apologies for the delay @mkzie2, in my tests everything works fine:

MacOS: Chrome

Screen.Recording.2025-06-17.at.15.24.39.mov

To clarify, what about implement backToReport URL param for all the per diem steps? Isn't that necessary? Thank you.

Yes, it's not necessary now. I misunderstood the explicitPolicyID navigation logic.

Great! I will continue with the checklist.

brunovjk · 2025-06-18T19:00:22Z

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

64212_android_native.mov

Android: mWeb Chrome

64212_web_android.mov

iOS: HybridApp

64212_ios_native.mov

iOS: mWeb Safari

64212_web_ios.mov

MacOS: Chrome / Safari

64212_web_chrome.mov

MacOS: Desktop

64212_web_desktop.mov

brunovjk

LGTM

OSBotify · 2025-06-19T07:00:01Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-20T13:16:12Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.1.70-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

github-actions · 2025-06-24T18:50:18Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

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

github-actions · 2025-06-24T19:01:59Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

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

github-actions · 2025-06-24T19:23:00Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

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

github-actions · 2025-06-24T20:38:21Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

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

github-actions · 2025-06-24T21:18:36Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.70-7 🚀

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

fix: app restarts per diem creation flow after subrate step

d80cc4c

mkzie2 marked this pull request as ready for review June 16, 2025 03:54

mkzie2 requested a review from a team as a code owner June 16, 2025 03:54

melvin-bot bot requested review from brunovjk and removed request for a team June 16, 2025 03:54

mkzie2 commented Jun 16, 2025

View reviewed changes

brunovjk approved these changes Jun 18, 2025

View reviewed changes

melvin-bot bot requested a review from lakchote June 18, 2025 19:00

lakchote approved these changes Jun 19, 2025

View reviewed changes

lakchote merged commit de3f8af into Expensify:main Jun 19, 2025
24 of 28 checks passed

github-actions bot mentioned this pull request Jun 20, 2025

Deploy Checklist: New Expensify 2025-06-20 #64643

Closed

53 tasks

vincdargento mentioned this pull request Jun 20, 2025

[Due for payment 2025-07-17] [$250] Expense - App opens expense report after submitting per diem expense from empty report preview #64671

Closed

8 tasks

melvin-bot bot mentioned this pull request Jun 24, 2025

[Due for payment 2025-07-01] [$250] Per diem - App restarts per diem expense creation flow after clicking Save on subrate page #63111

Closed

8 tasks

lanitochka17 mentioned this pull request Jul 9, 2025

[Due for payment 2025-08-11] [$250] Android - Expense - Trying to scroll Per diem search result on create expense flow directs to distance tab #65746

Closed

16 tasks

Conversation

mkzie2 commented Jun 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 16, 2025

Uh oh!

mkzie2 Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

brunovjk Jun 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mkzie2 Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

brunovjk Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

brunovjk commented Jun 18, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

brunovjk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jun 19, 2025

Uh oh!

github-actions bot commented Jun 20, 2025

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

mkzie2 commented Jun 15, 2025 •

edited

Loading

brunovjk Jun 17, 2025 •

edited

Loading