[CP Staging] fix: share sheet upload edited receipt and keep Category after upgrade by TaduJR · Pull Request #88095 · Expensify/App

TaduJR · 2026-04-16T11:25:24Z

Explanation of Change

Fixes four deploy blockers from #87142 in the native share sheet flow:

Native share - Original receipt is uploaded despite choosing a new receipt from confirm page #88068 — Replace/Crop receipt: original receipt was uploaded instead of the new one
Native share - Category is missing on confirm page when receipt is shared from gallery #88045 — Category disappeared on the confirm page after upgrading from a free workspace in self-DM
iOS - Native share - Unable to submit expense from device media library #88100 — Create expense button unresponsive on iOS when OS location permission was pre-granted

All exposed by UI surfaces #87142 newly enabled inheriting broken downstream reads or missing gates except #88100.

onConfirm was reading from currentAttachment (frozen original file). Now reads from transaction.receipt (which Replace/Crop updates), with fallback to the original.

#88045

SubmitDetailsPage passed policyID from useOnyx(POLICY + report?.policyID). For self-DM, report?.policyID === "_FAKE_", so the subscription never resolved to a real workspace after upgrade. Now uses usePolicyForTransaction (same hook MoneyRequestConfirmationList uses internally), which returns the active workspace for self-DM track expenses.

Also added !!iouCategory to the track branch of shouldShowCategories in MoneyRequestConfirmationList — one-line consistency fix matching the non-track branch's existing safeguard, so a selected category stays visible while categories load.

#88100

PR changed onGrant={onConfirm} to onGrant={() => onConfirm(undefined, true)}, which re-entered onConfirm with gpsRequired=true. On iOS with permission pre-granted, LocationPermissionModal fires onGrant immediately — the re-entry hit the same "permission flow" branch, setStartLocationPermissionFlow(true) was a no-op (state already true), and the button stayed dead. Extracted a performUpload(participant, locationPermissionGranted) helper (mirrors IOURequestStepConfirmation's createTransaction pattern); modal callbacks now call it directly with the correct location flag instead of re-entering onConfirm.

Enhancement

SubmitDetailsPage had no file-size validation while ShareDetailsPage did. Extracted the shared logic into a new useShareFileSizeValidation hook and wired both consumers to it — Submit flow now shows the same "too large / too small" error as the Share flow.

Fixed Issues

$ #88068
$ #88045
$ #88100
PROPOSAL:

Tests

Test 1: Replace receipt (#88068)

Share a receipt image from device gallery to Expensify app
Go to Submit tab
Select a workspace chat
On the confirm page, tap on the receipt thumbnail
Tap Replace
Select a different receipt image
Tap Create expense
Open the created expense
Verify: The new receipt from step 6 is shown — not the original

Test 2: Crop receipt (#88068)

Share a receipt from gallery → Submit tab → select a workspace chat
On the confirm page, tap on the receipt thumbnail
Crop the receipt
Tap Create expense
Open the created expense
Verify: The cropped receipt is shown — not the uncropped original

Test 3: Category visible after upgrade in self-DM (#88045)

Precondition: Account does NOT have a workspace.

Share a receipt image from gallery to Expensify app
Go to Submit tab
Select self DM
Verify: Category field is visible (because !policy is true)
Tap Show more → tap Category
Tap Upgrade → Confirm → Got it, thanks
Select a category (e.g., Advertising)
Verify: Category field still appears on the confirm page (does not disappear), with the selected value shown

Test 4: Large file size validation in Submit flow

From device gallery, pick a file larger than the API max attachment size (~25 MB — e.g., a long PDF or high-resolution image)
Share it to Expensify app
Go to Submit tab
Select a workspace chat (or self DM)
Verify: An error alert is shown ("Attachment too large / size exceeded") and the user is returned to the inbox
Repeat the flow but pick an extremely small file
Verify: An error alert is shown ("Attachment too small / size not met")
Repeat the flow with a normally-sized file
Verify: The confirm page renders normally — no false-positive size errors

Test 5: Create expense button responsive with location permission pre-granted (#88100)

Precondition: Expensify already has location permission granted at the OS level (iOS).

On iOS, share a receipt image from device gallery to Expensify
Go to Submit tab
Select a workspace (or self DM)
Tap Create expense
Verify: The expense is created and the user lands on the confirmation/report screen — the button is not stuck
Repeat the flow but with location permission denied at the OS level
Tap Create expense → system permission prompt appears (if not seen recently)
Tap Allow or Don't allow
Verify (Allow): Expense is created with GPS coordinates attached
Verify (Don't allow): Expense is created without GPS coordinates — still works

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…gory visible after upgrade

melvin-bot · 2026-04-16T11:25:31Z

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

hoangzinh · 2026-04-16T11:29:18Z

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

Screen.Recording.2026-04-17.at.05.59.26.mov

iOS: HybridApp

Screen.Recording.2026-04-17.at.06.08.12.mov

codecov · 2026-04-16T11:34:14Z

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/components/MoneyRequestConfirmationList.tsx	`67.56% <0.00%> (-0.82%)`	⬇️
src/pages/Share/ShareDetailsPage.tsx	`0.00% <0.00%> (ø)`
src/pages/Share/useShareFileSizeValidation.ts	`0.00% <0.00%> (ø)`
src/pages/Share/SubmitDetailsPage.tsx	`0.00% <0.00%> (ø)`
... and 111 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6390d2361c

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

…lenames

…ails pages

…sion is pre-granted

TaduJR · 2026-04-16T14:01:15Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a1fe8165f6

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

…to oversized)

TaduJR · 2026-04-16T14:28:08Z

@codex review

chatgpt-codex-connector · 2026-04-16T14:42:20Z

Codex Review: Didn't find any major issues. 🚀

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

hoangzinh · 2026-04-16T23:04:48Z

@MelvinBot, please review this PR

MelvinBot · 2026-04-16T23:07:31Z

🤖 Code Review

Overall this is a well-structured PR that fixes real deploy blockers with clean patterns (extracting performUpload to break the re-entry deadlock, using usePolicyForTransaction for the self-DM policy, sharing size validation via a hook). A few items to consider:

1. useShareFileSizeValidation — both size checks can set error state independently (minor)

In useShareFileSizeValidation.ts:22-29, both the MAX_SIZE and MIN_SIZE checks use independent if statements. If a file somehow satisfies both conditions (impossible in practice since a file can't be both too large and too small), both would fire sequentially. More practically, the hook never clears a previous error — if the content URI changes from an invalid file to a valid one (e.g., Replace flow swaps an oversized receipt for a normal one), the old error persists because neither branch calls setErrorTitle(undefined). Consider adding an else clause that clears the error when the file is within bounds:

if (size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
    setErrorTitle(translate('attachmentPicker.attachmentTooLarge'));
    setErrorMessage(translate('attachmentPicker.sizeExceeded'));
} else if (size < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
    setErrorTitle(translate('attachmentPicker.attachmentTooSmall'));
    setErrorMessage(translate('attachmentPicker.sizeNotMet'));
} else {
    setErrorTitle(undefined);
    setErrorMessage(undefined);
}

2. getFileName can throw on raw filenames with malformed % sequences

At SubmitDetailsPage.tsx:155, currentReceiptName falls back to transaction?.receipt?.filename?.split('/').pop(), which bypasses getFileName — good. But sharedFileName at line 147 still calls getFileName(currentAttachment?.content ?? ''). The comment on line 153 acknowledges this risk but only for the transaction.receipt.filename path. If currentAttachment?.content itself contains a malformed % (unlikely for a file URI but possible), getFileName → decodeURIComponent will throw. This is pre-existing behavior from the original code, so not a blocker for this PR — just worth noting.

3. formHasBeenSubmitted ref is never reset on navigation/remount

formHasBeenSubmitted (line 108) prevents double-submit, which is good. The ref resets on file-read failure (line 340), but if the user navigates away and comes back to the same mounted component (e.g., via back navigation), the ref stays true and blocks future submissions. This may be fine if the component always unmounts on navigation — worth confirming.

4. onConfirm / performUpload / onSuccess are not wrapped in useCallback

onConfirm, performUpload, and onSuccess are plain functions redeclared every render. Since onConfirm is passed to MoneyRequestConfirmationList as a prop, this causes unnecessary re-renders of that (large) component tree. Consider wrapping at least onConfirm in useCallback. This is a minor perf observation, not a blocker.

Nits (non-blocking)

The useShareFileSizeValidation hook swallows getFileSize promise rejections. If RNFS.stat fails (e.g., file deleted between share and validation), the promise rejects with no .catch(). Adding .catch(() => {}) or a .catch that sets an appropriate error would be more robust.
selectedParticipantList state (line 105) duplicates selectedParticipants derived value. It's only used to pass participants through the permission modal flow, which is fine — just noting the duplication is intentional.

None of these are merge blockers. The core fixes for #88068, #88045, and #88100 look correct and well-motivated. Item 1 (error not clearing on Replace) is the most impactful to address before merge.

hoangzinh

🙏

mountiny

Thanks!

mountiny · 2026-04-17T00:20:57Z

@TaduJR can you follow up with creating robust unit tests for this?

github-actions · 2026-04-17T01:42:34Z

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

github-actions · 2026-04-17T01:47:59Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #88095.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a23ae1b-4f35ca2-feb786b4a3c5a45f08f7131d3497286607300c9a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a23ae1b-4f35ca2-8202d90cddbdc506b6ce84a34258ba94f9ed9e44/index.html

Web 🕸️
https://88095.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-17T01:51:05Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…flow-to-native-share-sheet-creation-flow [CP Staging] fix: share sheet upload edited receipt and keep Category after upgrade (cherry picked from commit a23ae1b) (cherry-picked to staging by mountiny)

OSBotify · 2026-04-17T03:25:56Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.60-12 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-17T03:28:21Z

No help site changes are required for this PR.

The changes are internal bug fixes and a code refactor in the native share sheet flow (receipt replacement, category visibility after upgrade, iOS location permission handling, and shared file-size validation). None of these introduce new user-facing features, rename UI elements, or alter documented behavior — the help site has no articles covering the native share sheet flow.

fix: resolve active workspace policyID for self-DM share to keep Cate…

6390d23

…gory visible after upgrade

TaduJR requested review from a team as code owners April 16, 2026 11:25

melvin-bot bot assigned TaduJR Apr 16, 2026

melvin-bot bot requested review from JmillsExpensify and hoangzinh April 16, 2026 11:25

melvin-bot bot removed request for a team April 16, 2026 11:25

hoangzinh reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx Outdated

chatgpt-codex-connector bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx Outdated

hoangzinh reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx Outdated

TaduJR added 5 commits April 16, 2026 15:35

fix: consolidate policy/receipt sources and handle '%' in replaced fi…

906d825

…lenames

chore: CI restart

b60d319

refactor: extract useShareFileSizeValidation hook shared by share det…

cb429c5

…ails pages

refactor: simplify useShareFileSizeValidation API and add async cleanup

d2c4413

fix: extract performUpload to break onConfirm deadlock when OS permis…

a1fe816

…sion is pre-granted

chatgpt-codex-connector bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx Outdated

fix: validate the same source that is uploaded (catches Replace/Crop …

c1b3f70

…to oversized)

hoangzinh reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx

fix: add double-submit guard, userLocation shortcut, isConfirming state

cbd3dc0

hoangzinh reviewed Apr 16, 2026

View reviewed changes

Comment thread src/pages/Share/SubmitDetailsPage.tsx

hoangzinh approved these changes Apr 16, 2026

View reviewed changes

melvin-bot bot requested a review from marcochavezf April 16, 2026 23:15

mountiny changed the title ~~fix: share sheet upload edited receipt and keep Category after upgrade~~ [CP Staging] fix: share sheet upload edited receipt and keep Category after upgrade Apr 17, 2026

mountiny approved these changes Apr 17, 2026

View reviewed changes

mountiny merged commit a23ae1b into Expensify:main Apr 17, 2026
37 of 42 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 17, 2026

OSBotify mentioned this pull request Apr 17, 2026

Deploy Checklist: New Expensify 2026-04-16 #88022

Open

Conversation

TaduJR commented Apr 16, 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!

melvin-bot bot commented Apr 16, 2026

Uh oh!

hoangzinh commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

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

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

TaduJR commented Apr 16, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

TaduJR commented Apr 16, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector bot commented Apr 16, 2026

Uh oh!

Uh oh!

hoangzinh commented Apr 16, 2026

Uh oh!

MelvinBot commented Apr 16, 2026

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 17, 2026

Uh oh!

github-actions bot commented Apr 17, 2026

Uh oh!

OSBotify commented Apr 17, 2026

Uh oh!

OSBotify commented Apr 17, 2026

Uh oh!

MelvinBot commented Apr 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TaduJR commented Apr 16, 2026 •

edited

Loading

hoangzinh commented Apr 16, 2026 •

edited

Loading

codecov bot commented Apr 16, 2026 •

edited by github-actions bot

Loading