Fix unending skeleton when deleting an expense and navigating back to self DM by marufsharifi · Pull Request #78966 · Expensify/App

marufsharifi · 2026-01-07T03:56:45Z

Explanation of Change

Navigation back to Self DM, when the report is already deleted.

Fixed Issues

$ #71761
PROPOSAL: #71761 (Comment)

Tests

Have a workspace with an empty report
Create a manual expense in self-dm
Click on the report field of expense and select the empty report of the workspace
Go to workspace chat using the link in the header.
Delete the expense report
Click on the browser back button, it should take you to the self-dm

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

Screenshots/Videos

Android: Native

Screen.Recording.1404-10-17.at.9.07.10.AM.mov

Android: mWeb Chrome

Screen.Recording.1404-10-17.at.9.09.27.AM.mov

iOS: Native

Screen.Recording.1404-10-17.at.9.12.17.AM.mov

iOS: mWeb Safari

Screen.Recording.1404-10-17.at.9.14.45.AM.mov

MacOS: Chrome / Safari

Screen.Recording.1404-10-17.at.8.52.57.AM.mov

codecov · 2026-01-07T04:04:47Z

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/pages/home/ReportScreen.tsx	`68.09% <54.54%> (-0.37%)`	⬇️
... and 2 files with indirect coverage changes

melvin-bot · 2026-01-07T04:51:17Z

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

marufsharifi · 2026-01-07T05:25:37Z

@akinwale, the PR is ready for your review. However, I think it would be best to wait for #74045 to be merged first, as it may already address this issue. If not, we can continue with this PR afterward.

cc @francoisl

akinwale · 2026-01-07T21:51:24Z

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

78966-android-hybrid.mp4

Android: mWeb Chrome

78966-android-chrome.mp4

iOS: HybridApp

78966-ios-hybrid.mp4

iOS: mWeb Safari

78966-ios-safari.mp4

MacOS: Chrome / Safari

78966-web.mp4

akinwale

LGTM.

marufsharifi · 2026-01-08T02:57:51Z

@akinwale, Thanks for the review. What are your thoughts on this comment

akinwale · 2026-01-08T05:22:39Z

@akinwale, Thanks for the review. What are your thoughts on this comment

I missed the comment somehow. We can pull and test the other PR to see if it actually solves the issue here. Would you be able to do this @marufsharifi?

marufsharifi · 2026-01-09T11:04:28Z

@akinwale, I will test it and update here. thanks.

marufsharifi · 2026-01-16T14:17:03Z

@akinwale, thanks for your patience. I tested this using PR #74045 and got the following result, which I believe is expected. Since the expense is deleted, it shows Not Found, and after another back action it navigates to the self-DM.

That PR hasn’t been approved yet, so I think it’s best to wait for it to be merged first. If any changes are still required after that, we can address them then.

Screen.Recording.1404-10-26.at.6.37.25.PM.mov

cc @francoisl

akinwale · 2026-01-17T01:51:24Z

@marufsharifi I don't think the Not Found page is the desired outcome here, since in the bug report, the expected result is that the user should be navigated back to self-DM.

So I believe this can be merged without waiting for the other PR.

@francoisl Thoughts?

francoisl · 2026-01-20T01:28:32Z

Yes it's good like this, the important part is that it doesn't redirect to a Page Not Found error, or an infinite loading skeleton view.

OSBotify · 2026-01-20T17:41:29Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.3.5-0 🚀

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

OSBotify · 2026-01-21T23:05:58Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.5-7 🚀

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

…ing-skeleton-on-delete" This reverts commit a297d92, reversing changes made to 964ddb9.

Fix unending skeleton after deleting expense and returning to self DM

14b4e50

melvin-bot bot assigned marufsharifi Jan 7, 2026

marufsharifi marked this pull request as ready for review January 7, 2026 04:51

marufsharifi requested review from a team as code owners January 7, 2026 04:51

melvin-bot bot requested review from JmillsExpensify and akinwale and removed request for a team January 7, 2026 04:51

melvin-bot bot removed the request for review from a team January 7, 2026 04:51

akinwale approved these changes Jan 7, 2026

View reviewed changes

melvin-bot bot requested a review from francoisl January 7, 2026 21:51

francoisl approved these changes Jan 20, 2026

View reviewed changes

francoisl merged commit a297d92 into Expensify:main Jan 20, 2026
33 of 34 checks passed

OSBotify mentioned this pull request Jan 20, 2026

Deploy Checklist: New Expensify 2026-01-20 #80009

Closed

85 tasks

This was referenced Jan 23, 2026

[Due for payment 2026-02-19] [$250] Invited to chat only user can't open expense report from the first try #80062

Closed

[$250] Chat - After merging expenses, navigating back, leads to chat again. #80306

Closed

MobileMage mentioned this pull request Jan 26, 2026

[Due for payment][$250] Share code link doesn't work after deleting an expense #80474

Closed

7 tasks

Bar-Maz mentioned this pull request Jan 26, 2026

fix: offline merge visibility for track distance expenses #77862

Closed

52 tasks

Bar-Maz mentioned this pull request Jan 27, 2026

[$250] Chat - Skeleton loader when merging self DM distance exp with WS distance exp in offline mode #75267

Closed

16 tasks

akinwale mentioned this pull request Jan 29, 2026

[$250] Expense - Unending skeleton when deleting expense and navigating back to self DM #71761

Open

8 tasks

francoisl added a commit that referenced this pull request Jan 30, 2026

Revert "Merge pull request #78966 from marufsharifi/fix/expense-unend…

896b30f

…ing-skeleton-on-delete" This reverts commit a297d92, reversing changes made to 964ddb9.

francoisl mentioned this pull request Jan 30, 2026

Revert "Fix unending skeleton when deleting an expense and navigating back to self DM" #80980

Closed

53 tasks

Conversation

marufsharifi commented Jan 7, 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!

codecov bot commented Jan 7, 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!

melvin-bot bot commented Jan 7, 2026

Uh oh!

marufsharifi commented Jan 7, 2026

Uh oh!

akinwale commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

akinwale left a comment

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Jan 8, 2026

Uh oh!

akinwale commented Jan 8, 2026

Uh oh!

marufsharifi commented Jan 9, 2026

Uh oh!

marufsharifi commented Jan 16, 2026

Uh oh!

akinwale commented Jan 17, 2026

Uh oh!

francoisl commented Jan 20, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 20, 2026

Uh oh!

OSBotify commented Jan 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

marufsharifi commented Jan 7, 2026 •

edited

Loading

codecov bot commented Jan 7, 2026 •

edited by github-actions bot

Loading

akinwale commented Jan 7, 2026 •

edited

Loading