Skip to content

Use a platform shim for the iOS-only export staging cleanup - #104268

Merged
NicolasBonet merged 3 commits into
mainfrom
claude-moveExportStagingCleanupToIosFile
Oct 16, 2026
Merged

NicolasBonet merged 3 commits into
mainfrom
claude-moveExportStagingCleanupToIosFile

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

This is a follow-up to Only remove the old export staging directory on iOS. That PR stopped the MoveFilesOutOfDocuments migration from deleting Android's share staging folder (filesDir/Expensify) on cold start. It did this with a getPlatform() check inside the migration.

The cross-platform guidelines say platform-only features must use no-op shims in platform files instead. This PR:

  • Moves the real cleanup into MoveFilesOutOfDocuments/removeStaleExportStagingDir.ios.ts.
  • Adds a no-op MoveFilesOutOfDocuments/removeStaleExportStagingDir.ts used on all other platforms, including Android.
  • Removes the getPlatform() check and its test mock.

The shim files sit beside the migration, the same way UnreadIndicatorUpdater keeps load.android.ts and load.ts beside its index.ts. They are their own module, so the rule against putting index.native.ts and index.ios.ts in the same module does not apply.

There is no behavior change. iOS still removes the stale export folder, and Android still keeps the share staging folder.

AI Tests

  • npm test -- tests/unit/MoveFilesOutOfDocumentsTest.ts: 12/12 passed
  • npm run lint-changed: passed
  • npm run typecheck: passed
  • npm run spell-changed: passed
  • oxfmt on changed files: no changes
  • Not run locally: the full Jest suite, full npm run lint, and the Storybook smoke test. This PR changes no UI.

Fixed Issues

$ #103662
PROPOSAL: #103662 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".
// Please describe what QA needs to do to validate your changes and what areas do they need to test for regressions.

  • 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)
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

Co-authored-by: Pujan Shah <Pujan92@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team October 16, 2026 18:03
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 16, 2026
@MelvinBot

MelvinBot commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Web test steps verification results: ⚠️ partial

The app loaded, onboarding finished, and Home, Inbox, and Settings worked with no visible errors and no failed network calls. The browser's JS console could not be read directly, because the web test tool has no console command.
Settings/Profile page loaded cleanly

Step Status
App loads on web after onboarding and reaches the signed-in Home/Inbox screenFinished onboarding (skipped work email, chose "Something else", entered a name, continued). Landed on Home with the Search button and the Home, Inbox, Spend, Workspaces, and Account tabs visible.
Home screen after onboarding completed
✅
Verify that no errors appear in the JS consoleThe JS console could not be read directly on web. As a proxy, about 100 network requests across Home, Inbox (Concierge chat), and Settings all returned 200, with no 4xx or 5xx responses. No error banners, broken layouts, or stuck loading states appeared. Nothing related to MoveFilesOutOfDocuments was seen, which matches the no-op shim web uses.
Inbox showing Concierge report thread, no error states
Settings/Profile page loaded cleanly
⚠️

view run · view recording

@Pujan92

Pujan92 commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot how about not creating a new directory

@MelvinBot
MelvinBot marked this pull request as ready for review October 16, 2026 18:18
@MelvinBot
MelvinBot requested a review from a team as a code owner October 16, 2026 18:18
@melvin-bot
melvin-bot Bot requested review from Pujan92 and removed request for a team October 16, 2026 18:18
@melvin-bot

melvin-bot Bot commented Oct 16, 2026

Copy link
Copy Markdown

@Pujan92 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 requested review from dylanexpensify and removed request for a team October 16, 2026 18:18
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 16, 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-16T18:21:21.174986Z f2fab22 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.

…in a new directory

Co-authored-by: Pujan Shah <Pujan92@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team as a code owner October 16, 2026 18:28
@melvin-bot
melvin-bot Bot requested review from NicolasBonet and removed request for a team October 16, 2026 18:28
@melvin-bot

melvin-bot Bot commented Oct 16, 2026

Copy link
Copy Markdown

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Done. The new directory is gone. The shim now sits beside the migration as two flat files:

index.native.ts still imports ./removeStaleExportStagingDir, so it did not change. UnreadIndicatorUpdater uses the same layout (load.android.ts and load.ts beside index.ts). Behavior is unchanged.

The unit test (12/12), lint-changed, typecheck, and spell-changed all pass. I also updated the PR description.


view run

@Pujan92

Pujan92 commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot my bad, revert to the previous one

…tead of in a new directory"

This reverts commit f7601a7.
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Done. I reverted the flat-file change, so the shim is back in its own directory:

The revert is a new commit, 893c03a. The code now matches f2fab22 exactly. That version passed MoveFilesOutOfDocumentsTest (12/12), lint, and typecheck earlier. I didn't rerun them for this commit.


view run

@Pujan92

Pujan92 commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

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 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 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)
  • 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)
  • 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.
  • 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
abc1.webm
iOS: HybridApp
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-10-17.at.00.18.05.mov

@Pujan92 Pujan92 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.

LGTM!

@NicolasBonet
NicolasBonet merged commit 20d5f49 into main Oct 16, 2026
43 of 45 checks passed
@NicolasBonet
NicolasBonet deleted the claude-moveExportStagingCleanupToIosFile branch October 16, 2026 21:18
@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.14-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update needed. This PR is an internal refactor of a file-storage migration, with no change users can see.

@IuliiaHerets

Copy link
Copy Markdown

Any QA steps here?

cc @NicolasBonet @DylanDylann @Pujan92

@NicolasBonet

Copy link
Copy Markdown
Contributor

No QA needed @IuliiaHerets

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.14-3 🚀

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

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants