Skip to content

Only remove the old export staging directory on iOS - #103623

Merged
NicolasBonet merged 5 commits into
mainfrom
nicolas-ios-only-export-staging-cleanup
Oct 12, 2026
Merged

NicolasBonet merged 5 commits into
mainfrom
nicolas-ios-only-export-staging-cleanup

Conversation

@NicolasBonet

@NicolasBonet NicolasBonet commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Follow-up to #96531 (review comment).

A month after shipping, the MoveFilesOutOfDocuments migration still logs removed the old export staging directory about 100-190 times a day (~1,100 times for ~690 users in the last 8 days), with no downward trend. About 95% of those come from Android, often several times a day for the same user on the same app version.

The cleanup removes ${RNFS.DocumentDirectoryPath}/Expensify. On iOS that is the old Documents/Expensify export staging folder, as intended. On Android, DocumentDirectoryPath is the app's internal files/ directory, and files/Expensify is where the native share intent handler stages files shared into the app (android/app/src/main/java/com/expensify/chat/utils/FileUtils.kt). So on every launch after a share, the migration deleted the staged file, including on a cold-start share where it can run before the share screen reads it. This is one of the causes discussed in #101425.

This change makes the export staging cleanup iOS-only. The other cleanups (attachment cache move, attachment record paths, stale Onyx dump) are unchanged on both platforms.

Fixed Issues

$ #96531 (comment)
PROPOSAL: N/A

Tests

  1. On Android, sign out, then share an image from the gallery to Expensify
  2. Sign in and confirm the share flow still has the image (the file under files/Expensify is not deleted on launch)
  3. Kill and relaunch the app and verify the logs do not contain MoveFilesOutOfDocuments removed the old export staging directory
  4. On iOS, create Documents/Expensify (e.g. via the Files app or by installing an old build and cancelling a CSV export share sheet), relaunch, and verify the folder is removed and the log line appears once
Android emulator results (HybridApp dev build, cold-start share from Google Photos while signed out)
Before (main) After (this PR)
Shared image staged at files/Expensify/share-test.png Yes Yes
MoveFilesOutOfDocuments removed the old export staging directory logged Yes No
Staged image after startup migrations Deleted (~20s after the share), while shareActionHandler prefs still point at it Kept
After another cold relaunch without sharing n/a Still kept, nothing logged

Before:

t+2s: ls: files/Expensify: No such file or directory
t+3s: share-test.png
...
t+20s: share-test.png
t+21s: ls: files/Expensify: No such file or directory

shareObject: {"content":"/data/user/0/org.me.mobiexpensifyg.dev/files/Expensify/share-test.png","mimeType":"image/png"}

12:38:02.177 I FileUtils: Internal storage directory removed successfully.
12:38:18.199 D ReactNativeJS: [Migrate Onyx] start
12:38:21.868 D ReactNativeJS: [Migrate Onyx] MoveFilesOutOfDocuments removed the old export staging directory
12:38:22.016 D ReactNativeJS: [Migrate Onyx] finished in 3819ms

After:

12:39:25.810 I FileUtils: Internal storage directory removed successfully.
12:40:16.948 D ReactNativeJS: [Migrate Onyx] start
12:40:18.187 D ReactNativeJS: [Migrate Onyx] finished in 1243ms

$ ls -la files/Expensify
-rw------- 1 u0_a228 u0_a228  178 2026-10-09 12:39 share-test.png

shareObject: {"content":"/data/user/0/org.me.mobiexpensifyg.dev/files/Expensify/share-test.png","mimeType":"image/png"}

(FileUtils: Internal storage directory removed is the native share handler clearing previous shares before staging the new file, which is expected.)

  • Verify that no errors appear in the JS console

Offline tests

N/A, this only runs once at startup and does not depend on the network.

QA Steps

Same as tests (1-3) on Android.

  • 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 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 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)
  • 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 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).
  • 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

Cold-start share of a receipt image from Google Photos into the app (signed in):

Before (main): the startup migration deletes the staged image, so the share falls back to text and only the Share tab is offered. The message is the internal file path.

Before: share falls back to the file path

before-android-share.mp4

After (this PR): the staged image survives startup, the Submit tab is offered and the receipt shows on the confirmation page.

After: receipt on the confirmation page

after-android-share.mp4

On Android, filesDir/Expensify is where the native share intent handler
stages files shared into the app, so the cleanup was deleting them.
@NicolasBonet
NicolasBonet marked this pull request as ready for review October 9, 2026 18:52
@NicolasBonet
NicolasBonet requested review from a team as code owners October 9, 2026 18:52
@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team October 9, 2026 18:52
@chatgpt-codex-connector

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

Copy link
Copy Markdown

Codex Review Summary

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

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-09T19:02:59.054370Z ed5d979 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.

@melvin-bot
melvin-bot Bot requested review from carlosmiceli and removed request for a team October 9, 2026 18:53
@melvin-bot

melvin-bot Bot commented Oct 9, 2026

Copy link
Copy Markdown

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

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

Copy link
Copy Markdown

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

ℹ️ 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".

expect(mockRNFS.unlink).toHaveBeenCalledWith(OLD_EXPORT_STAGING_DIR);
});

it('keeps the Android share staging directory, which uses the same path as the old iOS export staging directory', async () => {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Document the new test's Given/When/Then phases

This newly added test omits the required literal // Given, // When, and // Then comments explaining why its setup, action, and assertion are necessary. Add those three sections so the test complies with the repository's documented testing convention.

AGENTS.md reference: AGENTS.md:L3-L3

Useful? React with 👍 / 👎.

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Good for product

@carlosmiceli

Copy link
Copy Markdown
Contributor

@NicolasBonet jest test fialing 🙇

@NicolasBonet
NicolasBonet merged commit bf148dd into main Oct 12, 2026
41 checks passed
@NicolasBonet
NicolasBonet deleted the nicolas-ios-only-export-staging-cleanup branch October 12, 2026 20:26
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
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
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/NicolasBonet in version: 9.5.8-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This is a bug fix inside a startup migration: on Android it stops deleting files that are shared into the app, so sharing now works the way you'd expect. No article sentence is now wrong, and nothing new is visible to users.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.8-5 🚀

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

Bundle Size Analysis (Sentry):

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.

5 participants