Dismiss modal when closing receipt view by bernhardoj · Pull Request #60698 · Expensify/App

bernhardoj · 2025-04-23T06:27:46Z

Explanation of Change

Fixed Issues

$ #60101
PROPOSAL: #60101 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Open a workspace chat with no unsettled expenses
Create a new money request
Go to Reports and then switch to Expense Reports type
Open the expense report from step 2
Press on the receipt
Close the receipt
On Web/Desktop, verify that you stay at the search report screen
On mWeb/Android/iOS, go back twice and verify that you stay at the search screen

Verify that no errors appear in the JS console

PR Author Checklist

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-04-23T06:27:52Z

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

…ter-dismissing-receipt-view

rushatgabhane · 2025-04-25T02:52:46Z

reviewing friday

rushatgabhane · 2025-04-28T19:52:35Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- 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: Native

WhatsApp.Video.2025-04-28.at.22.05.50.mp4

Android: mWeb Chrome

iOS: Native

Screen.Recording.2025-04-29.at.00.50.31.mov

iOS: mWeb Safari

Screen.Recording.2025-04-29.at.00.53.26.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-29.at.00.53.57.mov

MacOS: Desktop

rushatgabhane · 2025-04-28T19:55:55Z

+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
+    const [transactionMain] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
+    const [transactionDraft] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
+    const [reportMetadata = {isLoadingInitialReportActions: true}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: true});


we aren't fetching the data from actions. so canBeMissing should be false in all cases here. right??

Suggested change

const [reportMetadata = {isLoadingInitialReportActions: true}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: true});

const [reportMetadata = {isLoadingInitialReportActions: true}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: false});

@bernhardoj see https://expensify.slack.com/archives/C01GTK53T8Q/p1745872527961489?thread_ts=1745579616.289599&cid=C01GTK53T8Q for correct usage

We load the report here and reportMetadata is updated inside openReport.

App/src/pages/TransactionReceiptPage.tsx

Lines 52 to 60 in 1d48288

useEffect(() => {

if ((!!report && !!transaction) || isDraftTransaction) {

return;

}

openReport(reportID);

// I'm disabling the warning, as it expects to use exhaustive deps, even though we want this useEffect to run only on the first render.

// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps

}, []);

For the transactions, I think I intentionally set it to true, as you already experienced, the alert keeps showing for transactions_undefined. It can happen for transactions_0, transactions_123, or any invalid key. I personally don't like the canBeMissing since a user can easily open the page without the data available.

rushatgabhane

everything else, LGTM

OSBotify · 2025-05-03T03:47:20Z

✋ 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-05-06T01:26:35Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.1.40-0 🚀

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

github-actions · 2025-05-07T00:07:19Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.1.40-7 🚀

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

dismiss modal when closing receipt view

4fc8c42

bernhardoj requested a review from a team as a code owner April 23, 2025 06:27

melvin-bot Bot requested a review from rushatgabhane April 23, 2025 06:27

melvin-bot Bot removed the request for review from a team April 23, 2025 06:27

bernhardoj added 4 commits April 23, 2025 20:31

lint

b78b65e

Merge branch 'main' into fix/60101-user-navigated-to-report-screen-af…

59a1aff

…ter-dismissing-receipt-view

prettier

82427f5

lint

6e69954

rushatgabhane suggested changes Apr 28, 2025

View reviewed changes

rushatgabhane approved these changes Apr 28, 2025

View reviewed changes

melvin-bot Bot requested a review from youssef-lr April 28, 2025 22:55

youssef-lr approved these changes May 3, 2025

View reviewed changes

youssef-lr merged commit 74b93b9 into Expensify:main May 3, 2025

This was referenced May 5, 2025

[Better Expense Report View] Fix incorrect navigation when dismissing attachment modal #61058

Closed

[Better Expense Report View] Incorrect navigation when dismissing attachment modal #60439

Closed

github-actions Bot mentioned this pull request May 6, 2025

Deploy Checklist: New Expensify 2025-05-06 #61424

Closed

77 tasks

melvin-bot Bot mentioned this pull request May 7, 2025

[Due for payment 2025-05-14] [$250] Expense Reports-After closing receipt view, app opens Inbox (web), iOS app reopens same report #60101

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Dismiss modal when closing receipt view#60698

Dismiss modal when closing receipt view#60698
youssef-lr merged 5 commits into
Expensify:mainfrom
bernhardoj:fix/60101-user-navigated-to-report-screen-after-dismissing-receipt-view

bernhardoj commented Apr 23, 2025

Uh oh!

melvin-bot Bot commented Apr 23, 2025

Uh oh!

rushatgabhane commented Apr 25, 2025

Uh oh!

rushatgabhane commented Apr 28, 2025 •

edited

Loading

Uh oh!

rushatgabhane Apr 28, 2025 •

edited

Loading

Uh oh!

rushatgabhane Apr 28, 2025 •

edited

Loading

Uh oh!

bernhardoj Apr 29, 2025

Uh oh!

rushatgabhane left a comment

Uh oh!

OSBotify commented May 3, 2025

Uh oh!

github-actions Bot commented May 6, 2025

Uh oh!

github-actions Bot commented May 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	const [reportMetadata = {isLoadingInitialReportActions: true}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: true});
	const [reportMetadata = {isLoadingInitialReportActions: true}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {canBeMissing: false});

	useEffect(() => {
	if ((!!report && !!transaction) \|\| isDraftTransaction) {
	return;
	}
	openReport(reportID);
	// I'm disabling the warning, as it expects to use exhaustive deps, even though we want this useEffect to run only on the first render.
	// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
	}, []);

Uh oh!

Conversation

bernhardoj commented Apr 23, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 23, 2025

Uh oh!

rushatgabhane commented Apr 25, 2025

Uh oh!

rushatgabhane commented Apr 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rushatgabhane Apr 28, 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!

rushatgabhane Apr 28, 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!

bernhardoj Apr 29, 2025

Choose a reason for hiding this comment

Uh oh!

rushatgabhane left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 3, 2025

Uh oh!

github-actions Bot commented May 6, 2025

Uh oh!

github-actions Bot commented May 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rushatgabhane commented Apr 28, 2025 •

edited

Loading

rushatgabhane Apr 28, 2025 •

edited

Loading

rushatgabhane Apr 28, 2025 •

edited

Loading