Clear delete navigate back URL when the deleted expense screen unmounts by David-2002065 · Pull Request #105220 · Expensify/App

David-2002065 · 2026-10-28T04:05:49Z

Explanation of Change

On native, deleting an expense leaves nvp_deleteTransactionNavigateBackURL set. The only clear runs when the deleted screen renders unfocused, but the native stack removes a popped screen without that render, so the URL leaks into the next expense. The first time that expense loses focus (Test Tools, View details, etc.) the URL clears, ReportNotFoundGuard swaps its wrapper, the header remounts and the carousel unmount cleanup wipes the arrow list.

This adds clearDeleteTransactionNavigateBackUrlAfterTransitions, which clears the URL after transitions, and calls it on unmount in DeleteTransactionNavigateBackHandler and SearchMoneyRequestReportPage. It reads the URL when it fires since the unmounting screen may not have it yet, and keeps the duplicates review exclusion. On web the existing blur path already clears it, so this is a no-op there.

Fixed Issues

$ #103403
PROPOSAL: #103403 (comment)

Tests

Open Home and make sure Recently added has at least 3 expenses
Open Test Tools and turn on Force offline
Open the newest expense, then More > Delete
Go back to Home and open the expense right under the deleted one
Verify the prev/next arrows are visible
Open Test Tools and turn off Force offline, keep the expense open
Verify the arrows are still visible and navigate between the remaining expenses
Go back to Home and verify the deleted expense is gone from Recently added

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

103403_android.mp4

Android: mWeb Chrome

103403_after_fix_mweb_chrome.mp4

iOS: Native

103403_after_fix_ios_native.mp4

iOS: mWeb Safari

103403_after_fix_mweb.mp4

MacOS: Chrome / Safari

103403_after_fix_web_chrome.mp4

David-2002065 · 2026-10-28T04:09:42Z

@codex review

chatgpt-codex-connector · 2026-10-28T04:10:01Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	🔄 Running since 2026-10-28T05:33:07.190359Z	`349b726`	Draft marked ready

ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 13048d9494

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

…oneyRequestReportPage test

melvin-bot · 2026-10-28T05:33:06Z

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

github-actions · 2026-10-28T05:33:07Z

This PR adds a new Onyx.connectWithoutView call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @luacmartins, @chuckdries) — a review from any one of them is enough. Please add a link in your PR description to the Slack discussion where the @frontend-performance team approved using connectWithoutView here.

…reads

…lete-url-native

github-actions · 2026-10-30T19:26:02Z

This PR adds a new Onyx.get or Onyx.multiGet call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @chuckdries, @luacmartins). A review from any one of them is enough. Please check the call against the Onyx.get() rules in ONYX-DATA-MANAGEMENT and ONYX-1.

github-actions · 2026-11-03T12:26:59Z

This PR adds a new Onyx.get or Onyx.multiGet call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @chuckdries, @luacmartins). A review from any one of them is enough. Please check the call against the Onyx.get() rules in ONYX-DATA-MANAGEMENT and ONYX-1.

codecov · 2026-11-03T17:09:58Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/components/ReportOrNotFoundGuard.tsx	`97.36% <100.00%> (ø)`
...eClearDeleteTransactionNavigateBackUrlOnUnmount.ts	`100.00% <100.00%> (ø)`
src/libs/ExportOnyxState/masking.ts	`93.45% <ø> (ø)`
src/libs/ReportUtils.ts	`90.92% <100.00%> (+0.38%)`	⬆️
src/libs/actions/Report/index.ts	`76.13% <100.00%> (+0.01%)`	⬆️
src/pages/Search/SearchMoneyRequestReportPage.tsx	`92.01% <100.00%> (+0.07%)`	⬆️
...ges/inbox/DeleteTransactionNavigateBackHandler.tsx	`72.72% <100.00%> (+12.72%)`	⬆️
src/pages/inbox/ReportNotFoundGuard.tsx	`67.70% <100.00%> (ø)`
src/pages/inbox/ReportScreen.tsx	`93.54% <100.00%> (+0.10%)`	⬆️
... and 3 more
... and 471 files with indirect coverage changes

dmkt9 · 2026-11-11T09:33:20Z

@David-2002065 Can you merge the latest main branch?

…lete-url-native

github-actions · 2026-11-11T09:44:53Z

This PR adds a new Onyx.get or Onyx.multiGet call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @chuckdries, @luacmartins). A review from any one of them is enough. Please check the call against the Onyx.get() rules in ONYX-DATA-MANAGEMENT and ONYX-1.

David-2002065 · 2026-11-11T09:56:28Z

@dmkt9 ready

dmkt9 · 2026-11-12T10:44:37Z

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
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 any copy / text that was added to the app 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)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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 the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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

android.hybrid.mp4

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

dmkt9

LGTM

luacmartins · 2026-11-12T19:37:47Z

    const isFocused = useIsFocused();
-    const [deleteTransactionNavigateBackUrl] = useOnyx(ONYXKEYS.NVP_DELETE_TRANSACTION_NAVIGATE_BACK_URL);
+    const [deleteTransactionNavigateBackUrl] = useOnyx(ONYXKEYS.RAM_ONLY_PENDING_TRANSACTION_DELETE_URL);
+    const [isTransactionThread = false] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`, {selector: isReportTransactionThread});


Could we subscribe to the parent report and action too? isReportTransactionThread reads both, but this selector only reruns when the thread changes. If the parent data loads later, this stays false and we still skip clearing the URL on native unmount.

good point, updated. the handler now subscribes to the parent report and parent action too and passes them into a new pure helper isReportTransactionThreadNew, so it rechecks once the parent data loads. added a test where the parent arrives after the thread mounts

luacmartins · 2026-11-12T19:37:47Z

+                Onyx.get(ONYXKEYS.RAM_ONLY_PENDING_TRANSACTION_DELETE_URL).then((url) => {
+                    if (!url || doesDeleteNavigateBackUrlIncludeDuplicatesReview(url)) {
+                        return;
+                    }
+                    requestAnimationFrame(clearDeleteTransactionNavigateBackUrl);


Let's also cancel the queued animation frame when a new deletion starts. Once the transition callback fires, there's no pending handle left to cancel. If another deletion sets its URL before this frame runs, the old callback clears that new URL and can show Not Found while the screen is closing.

done, the cancel handle now covers the whole chain: the transition, the Onyx.get result and the queued frame (cancelAnimationFrame). so a new deletion cancels it even after the transition callback already ran. added a test for that case too

…queued clear frame

github-actions · 2026-11-13T06:10:05Z

This PR adds a new Onyx.get or Onyx.multiGet call, so I've requested a review from the Onyx performance reviewers (@tgolen, @mountiny, @chuckdries, @luacmartins). A review from any one of them is enough. Please check the call against the Onyx.get() rules in ONYX-DATA-MANAGEMENT and ONYX-1.

Clear delete navigate back URL when the deleted expense screen unmounts

13048d9

melvin-bot Bot assigned David-2002065 Oct 28, 2026

chatgpt-codex-connector Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread src/libs/actions/Report/index.ts Resolved

David-2002065 added 2 commits October 28, 2026 10:12

Mock clearDeleteTransactionNavigateBackUrlAfterTransitions in SearchM…

8f27a00

…oneyRequestReportPage test

Cancel a pending delete URL clear when a newer deletion sets the URL

349b726

David-2002065 marked this pull request as ready for review October 28, 2026 05:32

David-2002065 requested review from a team as code owners October 28, 2026 05:32

melvin-bot Bot requested review from shubham1206agra and removed request for a team October 28, 2026 05:33

github-actions Bot requested review from chuckdries, luacmartins, mountiny and tgolen October 28, 2026 05:33

melvin-bot Bot requested review from flaviadefaria and removed request for a team October 28, 2026 05:33

github-actions Bot reviewed Oct 28, 2026

View reviewed changes

Comment thread src/pages/Search/SearchMoneyRequestReportPage.tsx Resolved

David-2002065 added 2 commits October 28, 2026 10:37

Document the unmount clear in SearchMoneyRequestReportPage

67b98ba

Only clear the delete navigate back URL on unmount for transaction th…

8859381

…reads

tgolen requested changes Oct 28, 2026

View reviewed changes

Comment thread src/libs/actions/Report/index.ts Resolved

Comment thread src/libs/actions/Report/index.ts Resolved

Move the delete URL read out of the action into a hook

592cf6b

tgolen previously approved these changes Oct 28, 2026

View reviewed changes

luacmartins removed their request for review October 28, 2026 16:15

Merge remote-tracking branch 'upstream/main' into fix/103403-clear-de…

5fa19e0

…lete-url-native

github-actions Bot requested a review from luacmartins October 30, 2026 19:26

github-actions Bot requested review from luacmartins and mountiny November 3, 2026 12:26

Move the delete navigate back URL to a RAM_ONLY key with a clearer name

a6171a7

chuckdries removed their request for review November 3, 2026 18:30

luacmartins removed their request for review November 4, 2026 14:58

tgolen previously approved these changes Nov 4, 2026

View reviewed changes

mountiny removed their request for review November 5, 2026 05:00

shubham1206agra requested review from dmkt9 and removed request for shubham1206agra November 9, 2026 14:14

Merge remote-tracking branch 'upstream/main' into fix/103403-clear-de…

fc6be12

…lete-url-native

github-actions Bot requested review from chuckdries, luacmartins and mountiny November 11, 2026 09:44

Use connection.unsubscribe in the delete navigate back handler test

6e8abda

David-2002065 dismissed tgolen’s stale review via 6e8abda November 11, 2026 09:50

dmkt9 approved these changes Nov 12, 2026

View reviewed changes

melvin-bot Bot requested a review from iwiznia November 12, 2026 10:45

chuckdries removed their request for review November 12, 2026 16:38

luacmartins reviewed Nov 12, 2026

View reviewed changes

mountiny removed their request for review November 13, 2026 01:24

Recheck the transaction thread when parent data loads and cancel the …

7042e80

…queued clear frame

github-actions Bot requested review from chuckdries and mountiny November 13, 2026 06:10

Conversation

David-2002065 commented Oct 28, 2026 • 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!

David-2002065 commented Oct 28, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

melvin-bot Bot commented Oct 28, 2026

Uh oh!

github-actions Bot commented Oct 28, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Oct 30, 2026

Uh oh!

github-actions Bot commented Nov 3, 2026

Uh oh!

codecov Bot commented Nov 3, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dmkt9 commented Nov 11, 2026

Uh oh!

github-actions Bot commented Nov 11, 2026

Uh oh!

David-2002065 commented Nov 11, 2026

Uh oh!

dmkt9 commented Nov 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

dmkt9 left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins Nov 12, 2026

Choose a reason for hiding this comment

Uh oh!

David-2002065 Nov 13, 2026

Choose a reason for hiding this comment

Uh oh!

luacmartins Nov 12, 2026

Choose a reason for hiding this comment

Uh oh!

David-2002065 Nov 13, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Nov 13, 2026

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

David-2002065 commented Oct 28, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Oct 28, 2026 •

edited

Loading

codecov Bot commented Nov 3, 2026 •

edited by github-actions Bot

Loading