Fix missing merchant field when using QAB after login by bernhardoj · Pull Request #62718 · Expensify/App

bernhardoj · 2025-05-24T04:54:47Z

Explanation of Change

Fixed Issues

$ #61991
PROPOSAL: #61991 (comment)

Tests

Prerequisite: created a manual money request on a WS chat, account logged out

Login
Press FAB > Select the QAB option
Enter any amount and go next
Verify there is a merchant field

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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
- MacOS: Desktop
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 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.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2025-05-24T04:54:52Z

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

bernhardoj · 2025-05-24T04:58:06Z

I test #51040 too and it still passes.

dominictb · 2025-05-25T15:15:21Z

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.2025-05-25.at.22.37.52.mov

Android: mWeb Chrome

Screen.Recording.2025-05-25.at.22.40.03.mov

iOS: HybridApp

Screen.Recording.2025-05-25.at.22.31.20.mov

iOS: mWeb Safari

Screen.Recording.2025-05-25.at.22.33.32.mov

MacOS: Chrome / Safari

Screen.Recording.2025-05-25.at.22.22.04.mov

MacOS: Desktop

Screen.Recording.2025-05-25.at.22.23.40.mov

dominictb

I also tested #51040 again and several flows that open IOURequestStartPage and found no problem.

MonilBhavsar

Can we add automated test?

…rom-qab-after-login

bernhardoj · 2025-05-28T08:40:03Z

I'm trying to create the test, but the test passes even on main, so I test this manually on main and found that this doesn't happen anymore after #61829. But after #61829, the amount page will be shown again after pressing the Next button.

web.mp4

I have commented on the PR to let them know.

dominictb · 2025-05-28T08:58:01Z

@bernhardoj Seems like our solution can fix #59499 as well, right?

bernhardoj · 2025-05-30T07:23:53Z

src/pages/iou/request/IOURequestStartPage.tsx

@@ -96,6 +96,7 @@ function IOURequestStartPage({
            if (
                (transaction?.reportID === reportID && iouType !== CONST.IOU.TYPE.CREATE && iouType !== CONST.IOU.TYPE.SUBMIT) ||


Ok, I can't reproduce the double amount page anymore and our issue too after this condition is updated. The prev condition is

transaction?.reportID === reportID

which will only trigger the money request init function (resetIOUTypeIfChanged) whenever the reportID changes, but now we ignore it if the iouType is SUBMIT, which is true in our case. However, this causes the resetIOUTypeIfChanged to be called twice whenever we change tab because useFocusEffect is triggered whenever the deps change, and in this case, when we change the tab, transactionRequestType will also change. Not sure how to approach this.

@dominictb so, how do we proceed with this?

Seems like our solution can fix #59499 as well, right?

Btw, this PR won't fix #59499, but we have another issue where I already proposed a solution that will fix #59499 too.

In my opinion, we should merge this PR, fix #63361, then revert #60940 so we won't have 2 initMoneyRequest every time switching tabs and have a proper fix too.

@bernhardoj Okay let proceed with this PR, add unit test (important) and let that potential regression be fixed in #63361.

Btw, I think your proposal #63361 does not address the root cause that resetIOUTypeIfChanged gets called twice.

Yes, #63361 won't fix the double resetIOUTypeIfChanged calls, that's why we need to revert #60940. Fix from #63361 will fix #60940 too. They have the same root cause.

add unit test (important) and let that potential regression be fixed in #63361.

So, do you agree that we revert #60940 in this PR?

@bernhardoj Can you confirm your PR #63526 did fix #59499? If so, please merge main and proceed next steps.

Bump @bernhardoj

Sorry, I missed this. Checking..

Yeah, I can confirm #63526 fix #59499. I'll continue the PR.

Updated the PR. Unit test left.

I keep getting an error when running the test after react-native-tab-view is updated. I have asked for help in Slack.

…rom-qab-after-login

dominictb · 2025-06-18T08:19:40Z

@bernhardoj How is the fix going?

bernhardoj · 2025-06-20T02:36:37Z

Sorry, I was OOO. The error I'm getting on the unit test is fixed now.

…rom-qab-after-login

dominictb · 2025-06-20T02:39:14Z

@bernhardoj So is this ready for review?

bernhardoj · 2025-06-20T04:58:46Z

@dominictb Now it's ready for review

dominictb

Retested well

dominictb · 2025-06-23T20:30:12Z

Bump @MonilBhavsar

MonilBhavsar · 2025-06-23T20:49:14Z

Looking

MonilBhavsar · 2025-06-23T20:51:29Z

src/pages/iou/request/IOURequestStartPage.tsx

+    // This is currently only being used for testing
+    defaultSelectedTab = CONST.TAB_REQUEST.SCAN,


What does this mean?

It was used for the unit test here to simulate the case where manual tab is selected by default.

Okay thanks!

MonilBhavsar

Can you add QA steps, or copy Test steps?

MonilBhavsar

Looks good, thanks!

OSBotify · 2025-06-23T21:10:59Z

✋ 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-24T19:17:04Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.1.71-0 🚀

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

github-actions · 2025-06-27T23:10:46Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.1.71-11 🚀

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

fix missing merchant field when using QAB after login

c9a096a

bernhardoj requested a review from a team as a code owner May 24, 2025 04:54

melvin-bot bot requested review from dominictb and removed request for a team May 24, 2025 04:54

dominictb approved these changes May 25, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar May 25, 2025 15:34

MonilBhavsar reviewed May 27, 2025

View reviewed changes

Merge branch 'main' into fix/61991-merchant-field-missing-when-open-f…

d94eb8e

…rom-qab-after-login

bernhardoj commented May 30, 2025

View reviewed changes

bernhardoj added 4 commits June 16, 2025 13:59

Merge branch 'main' into fix/61991-merchant-field-missing-when-open-f…

3a4fb32

…rom-qab-after-login

remove workaround

b60f842

prettier

21f0fa8

Merge branch 'main' into fix/61991-merchant-field-missing-when-open-f…

d1e3a6c

…rom-qab-after-login

Merge branch 'main' into fix/61991-merchant-field-missing-when-open-f…

0964324

…rom-qab-after-login

add test

7b8fa82

lint

92d2cd5

dominictb approved these changes Jun 20, 2025

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar June 20, 2025 15:07

MonilBhavsar reviewed Jun 23, 2025

View reviewed changes

MonilBhavsar approved these changes Jun 23, 2025

View reviewed changes

MonilBhavsar merged commit ff9ddc0 into Expensify:main Jun 23, 2025
22 checks passed

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

Deploy Checklist: New Expensify 2025-06-24 #64820

Closed

dominictb mentioned this pull request Jun 24, 2025

[Due for payment 2025-07-04] [$250] QAB - Create the first expense after logging in missing the amount, merchant, and date #61991

Closed

8 tasks

		@@ -96,6 +96,7 @@ function IOURequestStartPage({
		if (
		(transaction?.reportID === reportID && iouType !== CONST.IOU.TYPE.CREATE && iouType !== CONST.IOU.TYPE.SUBMIT) \|\|

		// This is currently only being used for testing
		defaultSelectedTab = CONST.TAB_REQUEST.SCAN,

Conversation

bernhardoj commented May 24, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented May 24, 2025

Uh oh!

bernhardoj commented May 24, 2025

Uh oh!

dominictb commented May 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb left a comment • 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!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented May 28, 2025

Uh oh!

dominictb commented May 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dominictb Jun 3, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dominictb commented Jun 18, 2025

Uh oh!

bernhardoj commented Jun 20, 2025

Uh oh!

dominictb commented Jun 20, 2025

Uh oh!

bernhardoj commented Jun 20, 2025

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

dominictb commented Jun 23, 2025

Uh oh!

MonilBhavsar commented Jun 23, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dominictb commented May 25, 2025 •

edited

Loading

dominictb left a comment •

edited

Loading

dominictb Jun 3, 2025 •

edited

Loading