Skip to content

show not found page for deleted duplicate expense.#79530

Merged
dangrous merged 38 commits intoExpensify:mainfrom
marufsharifi:fix/modal-close-reset-browser-history
Feb 25, 2026
Merged

show not found page for deleted duplicate expense.#79530
dangrous merged 38 commits intoExpensify:mainfrom
marufsharifi:fix/modal-close-reset-browser-history

Conversation

@marufsharifi
Copy link
Contributor

@marufsharifi marufsharifi commented Jan 14, 2026

Explanation of Change

This change will show Not found page instead of infinte loading state when deleting a duplicated expense and clicking on the forward button of the browser.

Fixed Issues

$ #78338
PROPOSAL: #78338 (Comment)

Tests

Test 1: Basic duplicate delete + forward button (online)

Go to a workspace chat
Create two expenses with the same amount (e.g., $10.00 each)
Open the expense report
Click "Review duplicates" in the header
Click on the first expense preview to open it
Click More → Delete → confirm deletion
You should navigate back to the Review Duplicates page
Click the browser forward button once
✅ Expected: "Not Found" page (NOT the deleted expense)
Click the browser forward button again (if possible)
✅ Expected: Still "Not Found" or no navigation

Test 2: Basic duplicate delete + forward button (offline)

Repeat steps 1-6 from Test 1
Turn off network (airplane mode / disconnect)
Click the browser forward button once
✅ Expected: "Not Found" page
Click the browser forward button again
✅ Expected: "Not Found" page
Turn network back on
✅ Expected: Page remains "Not Found", no errors in console

Test 3: No brief "Not Found" flash during deletion

Repeat steps 1-6 from Test 1
Watch the screen carefully during step 6 (the delete action)
✅ Expected: No brief flash of "Not Found" page before navigating back. Should see smooth transition (possibly a loading skeleton, then the Review page).
🟡 Regression Tests — Existing Deletion Flows

Test 4: Delete single expense from ReportDetailsPage (existing flow)

Go to a chat and create a single expense
Open the expense
Click the report details (header/3-dot menu)
Delete the expense from the details page
✅ Expected: Navigates back smoothly, no "Not Found" flash, no errors
Click the browser forward button
✅ Expected: "Not Found" page (same behavior as staging/main)

Test 5: Delete expense from MoneyRequestHeader (transaction thread)

Open a chat with a single expense
Click on the expense to open the transaction thread
Click More → Delete → confirm
✅ Expected: Smooth navigation back, no "Not Found" flash
Click the browser forward button
✅ Expected: "Not Found" page

Test 6: Delete expense from MoneyReportHeader (expense report with multiple transactions)

Create a workspace with 3+ expenses in a report
Open the expense report
Open one of the individual expenses
Click More → Delete → confirm
✅ Expected: Navigates back to the expense report (now with fewer transactions), no flash
Check the expense report displays correctly

Test 7: Delete last transaction on a report from search

Open Search, find an expense report with a single transaction
Click on the report to open it in the RHP
Delete the transaction
✅ Expected: Should navigate back or show "Not Found" cleanly — no infinite loading spinner
Click the browser forward button
✅ Expected: "Not Found" page

Test 8: Delete from expense report with multiple transactions from search

Open Search, find an expense report with 2+ transactions
Open the report in the RHP
Delete one transaction
✅ Expected: Report updates to show remaining transactions, no flash
Check that the remaining transaction(s) display correctly
🟢 Edge Case Tests

Test 9: Navigate away from Review Duplicates WITHOUT deleting

Create duplicate expenses → open expense report → click "Review duplicates"
Click on an expense preview
Click the browser back button (don't delete anything)
✅ Expected: Returns to Review Duplicates page normally
Click forward/back a few times
✅ Expected: Normal navigation, no "Not Found" showing

Test 10: "Keep All" on Review Duplicates

Create duplicate expenses → open expense report → click "Review duplicates"
Click "Keep All"
✅ Expected: Navigates back normally
Click the browser forward button
✅ Expected: Should NOT show the duplicates review page (or show Not Found)

  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

// 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
  • 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

Not Applicable.

Android: mWeb Chrome
Screen.Recording.1404-10-24.at.11.35.44.AM.mov
iOS: Native

Not Applicable.

iOS: mWeb Safari
Screen.Recording.1404-10-24.at.11.41.05.AM.mov
MacOS: Chrome / Safari
Screen.Recording.1404-10-24.at.11.24.50.AM.mov

@melvin-bot
Copy link

melvin-bot bot commented Jan 14, 2026

@Krishna2323 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 request for a team January 14, 2026 07:33
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5c3298d594

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@codecov
Copy link

codecov bot commented Jan 14, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/libs/TransactionNavigationUtils.ts 100.00% <100.00%> (ø)
src/components/MoneyRequestHeader.tsx 0.00% <0.00%> (ø)
src/components/MoneyReportHeader.tsx 0.00% <0.00%> (ø)
src/pages/inbox/ReportScreen.tsx 67.91% <63.63%> (-0.27%) ⬇️
src/pages/TransactionDuplicate/Review.tsx 0.00% <0.00%> (ø)
src/pages/Search/SearchMoneyRequestReportPage.tsx 0.00% <0.00%> (ø)
... and 15 files with indirect coverage changes

@Krishna2323

This comment was marked as outdated.

@Krishna2323
Copy link
Contributor

@marufsharifi could you please check this comment and update the test steps? We can navigate twice with the forward button.

@marufsharifi
Copy link
Contributor Author

@marufsharifi could you please check this comment and update the test steps? We can navigate twice with the forward button.

@Krishna2323, thanks for the review. applied.

@Krishna2323
Copy link
Contributor

@marufsharifi did you forgot to push the commit? I don't see any fix for this.

@marufsharifi
Copy link
Contributor Author

@Krishna2323, thanks for your patience. I updated the code and resolved the conflicts.

@marufsharifi
Copy link
Contributor Author

@Krishna2323, kindly bump. thanks.

@marufsharifi
Copy link
Contributor Author

@Krishna2323, thanks for the review. I applied your feedback.

@marufsharifi
Copy link
Contributor Author

marufsharifi commented Jan 23, 2026

@Krishna2323, kindly bump. thanks

@Krishna2323
Copy link
Contributor

I was OOO for the last five days; I’ll review it today.

@Krishna2323
Copy link
Contributor

@marufsharifi please merge main

@Krishna2323
Copy link
Contributor

@marufsharifi the issue is still reproducible, could you please check?

Monosnap.screencast.2026-01-28.15-45-23.mp4

@marufsharifi
Copy link
Contributor Author

@Krishna2323, kindly bump. thanks.

Copy link
Contributor

@Krishna2323 Krishna2323 left a comment

Choose a reason for hiding this comment

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

LGTM and works well! 🚀

@marufsharifi could you please add tests in the OP from here? Thanks!

@melvin-bot melvin-bot bot requested a review from dangrous February 23, 2026 03:54
@dangrous
Copy link
Contributor

Looks good to me but we've got conflicts, can you update please? Thank you!

@marufsharifi
Copy link
Contributor Author

@dangrous, resolved the conflicts. thanks

@dangrous
Copy link
Contributor

@marufsharifi prettier error should be resolved by merging main and running it locally! #83231

@marufsharifi
Copy link
Contributor Author

@dangrous, this is ready. Could you please take another look? thanks.

@dangrous
Copy link
Contributor

augh now conflicts again.... we'll get there soon!

@marufsharifi
Copy link
Contributor Author

@dangrous, resolved again. thanks.

@dangrous dangrous merged commit b23e3a3 into Expensify:main Feb 25, 2026
29 checks passed
@github-actions
Copy link
Contributor

🚧 @dangrous has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 9.3.26-0 🚀

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

@mitarachim
Copy link

mitarachim commented Feb 26, 2026

Deploy Blocker #83519 and #83521 was identified to be related to this PR.

@mitarachim
Copy link

mitarachim commented Feb 26, 2026

@marufsharifi This PR is failing because of a regression issue #83519, #83521 , and #83532

The issue is reproducible in: Web

issue #83519 [Test 2: Basic duplicate delete + forward button (offline)]

Bug7088609_1772050708997.Screen_Recording_2026-02-25_at_11.00.21_at_night.mp4

issue #83521 [Test 4: Delete single expense from ReportDetailsPage (existing flow)]

Bug7088623_1772052012444.Screen_Recording_2026-02-25_at_11.29.09_at_night.mp4

issue #83532 [Test 10: "Keep All" on Review Duplicates]

Uploading Bug7088660_1772054906158!bug33.mp4…

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.26-8 🚀

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

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.

6 participants