Skip to content

[CP staging] Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out)#96006

Merged
jasperhuangg merged 2 commits into
mainfrom
revert-94973-blocker-95957
Jul 13, 2026
Merged

[CP staging] Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out)#96006
jasperhuangg merged 2 commits into
mainfrom
revert-94973-blocker-95957

Conversation

@jasperhuangg

@jasperhuangg jasperhuangg commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Reverts App #94973 ("Save unsent receipts to the device gallery on sign-out") to clear deploy blocker App #95957. On iOS the storage access modal stopped appearing when signing out with a pending receipt expense. The reviewer for the forward fix (App #95906) is unavailable, so per Vit we revert the original and let the contributor re-raise.

Why the GitHub "Revert" button (a straight git revert) doesn't work here:

  • PR 94973 added the files getPendingReceiptRequests.native.ts and savePendingReceiptsToGalleryTest.ts.
  • Follow-up App #95811 later modified both of those same files.
  • A revert of 94973 tries to delete files that a newer commit has since changed. Git can't tell whether to keep the newer edits or honor the deletion, so it raises a modify/delete conflict and refuses to finish.

How this PR resolves it:

  • We take the deletion for both files (git rm), since the whole feature is going away. That drops 95811's edits to those two files along with them.
  • Verified nothing else imports the removed module, so this doesn't break 95811's other changes or the receipt telemetry.

What changed:

  • Remove the savePendingReceiptsToGallery module and the gallery-save file-download helpers added by 94973.
  • Drop the save-on-sign-out prompt wiring in InitialSettingsPage.tsx, restoring the prior sign-out behavior.
  • Remove the related copy strings from all language files.

Notes:

  • The receipt observability/telemetry from App #94950 and App #95840 is left in place. Nothing there depends on the removed module (verified no dangling imports). RECEIPT_BEARING_COMMANDS stays exported but is now unused.

Fixed Issues

$ #95957

Tests

  1. On iOS, set Photo library access to None in the Expensify app settings.
  2. Open a workspace chat, go offline, create an expense with a receipt so it stays in the upload queue.
  3. Go to Account > Sign out, tap Save and sign out.
  4. Verify sign-out completes and no receipt is written to the gallery (feature removed).
  5. Verify no console errors.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests (step 2 goes offline before creating the receipt expense).

QA Steps

Same as tests.

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

iOS: Native

N/A - revert of a native-only feature, verified via the Tests steps.

Note on the extra commit: this branch also cherry-picks the ExportOnyxStateTest bucket fix (also up as App #96007). That test is red across all of main because App #95809 added two ONYXKEYS without bucketing them. Pulled in here so this revert's CI is green. If 96007 lands first, this commit drops out on rebase.

@melvin-bot

melvin-bot Bot commented Jul 13, 2026

Copy link
Copy Markdown

@eVoloshchak 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 a team and mountiny and removed request for a team July 13, 2026 23:03
@melvin-bot

melvin-bot Bot commented Jul 13, 2026

Copy link
Copy Markdown

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

Julesssss
Julesssss previously approved these changes Jul 13, 2026
@codecov

codecov Bot commented Jul 13, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/ExportOnyxState/common.ts 80.35% <ø> (+80.35%) ⬆️
src/libs/fileDownload/index.ios.ts 3.37% <0.00%> (ø)
src/pages/settings/InitialSettingsPage.tsx 85.40% <50.00%> (+9.92%) ⬆️
src/libs/fileDownload/index.android.ts 0.00% <0.00%> (ø)
... and 215 files with indirect coverage changes

@jasperhuangg jasperhuangg changed the title Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out) [CP staging] Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out) Jul 13, 2026
@jasperhuangg
jasperhuangg merged commit c4029ac into main Jul 13, 2026
43 of 47 checks passed
@jasperhuangg
jasperhuangg deleted the revert-94973-blocker-95957 branch July 13, 2026 23:53
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 13, 2026
@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.

jasperhuangg added a commit that referenced this pull request Jul 14, 2026
Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out)

(cherry picked from commit c4029ac)
jasperhuangg added a commit that referenced this pull request Jul 14, 2026
Revert #94973 to fix deploy blocker #95957 (storage access modal on sign-out)

(cherry picked from commit c4029ac)

(cherry-picked to staging by jasperhuangg)

(cherry-picked to staging by jasperhuangg)
roryabraham added a commit that referenced this pull request Jul 14, 2026
…294424715-1

🍒 Cherry pick PR #96006 to staging 🍒
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/jasperhuangg in version: 9.4.34-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR against App/docs/articles and no help site updates are needed.

Why:

  • This PR reverts App #94973 ("Save unsent receipts to the device gallery on sign-out"), removing that native-only feature along with its modules, sign-out prompt wiring, and language strings.
  • The removed behavior was never documented in App/docs/articles. I searched for related content (receipt-to-gallery, unsent receipts, "save and sign out") and the only nearby match — Attach-and-edit-receipts-on-expenses.md — only references uploading a receipt from the device gallery, which is unrelated and unchanged by this PR.
  • The remaining changes (language string removals, the ExportOnyxState bucket fix, file-download helper cleanup) are all internal code with no user-facing documentation counterpart.

Since there is no existing article describing this behavior and the feature is being removed, there is nothing to add or correct on the help site — so I did not open a docs PR.

jasperhuangg, if you believe a help site article should exist for this flow (or you know of one I may have missed), reply with the article and I'll open a docs PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants