[CP Staging] [Submit] Fix blockers for submit email submitter by hungvu193 · Pull Request #95115 · Expensify/App

hungvu193 · 2026-07-02T05:12:09Z

Explanation of Change

Fixed Issues

$ #95093
$ #95095
$ #95111
$ #95097
$ #95139
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Test 1: Delete or cancel the payment

Create an expense.
Go to that expense > More > Delete > Verify you can Delete that expense
Submit that expense > Approve > Pay > More > Cancel payment > Verify that you can cancel the payment.

Test 2: Keyboard issue

Create a submit workspace and submit an expense.
When the Submit To open, click on the input
Verify that keyboard is pushed when open click on that input.

Test 3: More button and next steps text:

Submit an expense.
Verify that More button and next steps text aren't overlapped.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2026-07-02.at.15.02.31.mov

iOS: Native

Screen.Recording.2026-07-02.at.14.57.11.mov

iOS: mWeb Safari

Screen.Recording.2026-07-02.at.15.01.31.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-02.at.15.00.05.mov

Co-authored-by: Hans Vu <hungvu193@users.noreply.github.com>

codecov · 2026-07-02T06:27:43Z

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/MoneyReportHeaderMoreContent.tsx	`100.00% <100.00%> (ø)`
src/pages/ReportSubmitToContent.tsx	`0.00% <ø> (ø)`
src/components/MoneyReportHeader.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyReportHeaderKYCDropdown.tsx	`0.00% <0.00%> (ø)`
src/hooks/useExpenseActions.ts	`0.00% <0.00%> (ø)`
src/hooks/useReportSubmitToPopover.tsx	`69.23% <81.81%> (-4.69%)`	⬇️
...nents/CollapsibleHeaderOnKeyboard/index.native.tsx	`60.52% <0.00%> (-1.02%)`	⬇️
src/hooks/useLifecycleActions.tsx	`57.97% <0.00%> (ø)`
...eaderActions/MoneyReportHeaderSecondaryActions.tsx	`0.69% <0.00%> (+<0.01%)`	⬆️
src/libs/showConfirmModalAfterMoreMenuDismiss.ts	`0.00% <0.00%> (ø)`
... and 35 files with indirect coverage changes

melvin-bot · 2026-07-02T07:17:28Z

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c6eb1c6310

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

abzokhattab · 2026-07-02T07:46:46Z

Is it yet ready? No screenshots were added

hungvu193 · 2026-07-02T07:51:33Z

Is it yet ready? No screenshots were added

Yes please go ahead and review the logics. Screenshots are on the way 😄

hungvu193 · 2026-07-02T09:19:27Z

@abzokhattab can you help me verify this (#95139) on Android in the mean time? I'm having some issue with my simulator :(

hungvu193 · 2026-07-02T09:41:42Z

Oh I can verify it's fixed as well

abzokhattab · 2026-07-02T10:06:46Z

Looks fine to me

Screen.Recording.2026-07-02.at.12.03.45.mov

abzokhattab · 2026-07-02T11:15:22Z

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

Screen.Recording.2026-07-02.at.12.03.45.mov

Screen.Recording.2026-07-02.at.12.33.55.mov

Screen.Recording.2026-07-02.at.12.57.49.mov

Android: mWeb Chrome

iOS: HybridApp

Screen.Recording.2026-07-02.at.13.07.45.mov

Screen.Recording.2026-07-02.at.13.04.55.mov

Screen.Recording.2026-07-02.at.13.00.07.mov

iOS: mWeb Safari

Screen.Recording.2026-07-02.at.13.11.25.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-02.at.13.07.03.mov

Screen.Recording.2026-07-02.at.13.02.10.mov

abzokhattab · 2026-07-02T11:15:38Z

LGTM the popover modals are showing correctly

abzokhattab · 2026-07-02T11:19:46Z

can we also add more tests cases to increase the coverage

OSBotify · 2026-07-02T11:25:42Z

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

[Submit] Fix blockers for submit email submitter (cherry picked from commit f12e4b0) (cherry-picked to staging by mountiny)

github-actions · 2026-07-02T11:38:16Z

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

github-actions · 2026-07-02T11:43:26Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f12e4b0db4b-4183c64-b172d38361af88cfe9c687e0d5194b3a9b041d6e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f12e4b0-4183c64-44ba81775b6fc4e3ce9a6d266db69916781fa412/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-02T12:01:14Z

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

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

MelvinBot · 2026-07-02T12:04:20Z

🤖 I reviewed the changes in this PR against the help site articles under docs/articles, and no help site documentation changes are required.

Why: All five linked issues are UI/interaction bug fixes with no change to documented product behavior:

[Due for payment 2026-07-13] Android - More button overlaps with next step message and is hardly tappable #95093 — More button overlapping the next-step message (layout fix)
[Due for payment 2026-07-13] iOS - Expense - Unable to cancel payment #95095 — Unable to cancel payment (More-menu modal dismissal timing)
[Due for payment 2026-07-13] iOS - Report - User cannot delete an expense or report using "More > Delete" #95111 — Cannot delete an expense/report via More > Delete (modal dismissal timing)
[Due for payment 2026-07-13] Android - Workspace - Contact list modal does not move up when keyboard is opened #95097 — Contact list modal not moving up when keyboard opens (keyboard collapse behavior)
[Due for payment 2026-07-13] Expense report - More dropdown is not visible in expense report view #95139 — More dropdown not visible in expense report view (layout/render fix)

The diff is entirely rendering, layout, keyboard-collapse, and confirm-modal-after-dismiss plumbing (CollapsibleHeaderOnKeyboard, MoneyReportHeader*, useExpenseActions, useLifecycleActions, useReportSubmitToPopover, showConfirmModalAfterMoreMenuDismiss). The user-facing steps for deleting an expense, canceling a payment, and submitting a report are unchanged — this PR just makes those existing actions work correctly. Help articles describe what these actions do, not the internal modal/layout mechanics being fixed here.

No draft docs PR has been created since there is nothing to document.

@hungvu193, please confirm you agree no help site changes are needed here. If you believe a specific article should be updated, let me know which behavior changed and I'll create the docs PR.

OSBotify · 2026-07-03T16:44:58Z

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

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

MelvinBot · 2026-07-03T16:46:51Z

🤖 I reviewed the changes in this PR against the help site content in App/docs/articles.

No help site changes are required.

This PR is a set of UI/layout and interaction bug fixes for the money report header and submit-to flow — it doesn't add or change any documented product feature, setting, or workflow. The five linked issues are all rendering/interaction bugs:

Expensify/App#95093 — More button overlaps the next-step message and is hard to tap
Expensify/App#95095 — Unable to cancel payment (confirm modal didn't appear)
Expensify/App#95111 — Cannot delete an expense/report via More > Delete
Expensify/App#95097 — Contact list modal doesn't move up when the keyboard opens
Expensify/App#95139 — More dropdown not visible in expense report view

The fixes correct how the header, the More dropdown, confirm modals, and the keyboard-aware collapsible header render and behave — they restore the already-documented behavior rather than changing it. The underlying user-facing actions (delete an expense/report, cancel a payment, submit an expense) continue to work exactly as the existing help articles describe, so there's nothing in App/docs/articles that becomes inaccurate as a result of these changes.

No draft docs PR was created since there are no required updates.

@hungvu193, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-07-06T15:33:30Z

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot and others added 2 commits July 2, 2026 04:14

Fix: separate More button from next step message in narrow report header

973354b

Co-authored-by: Hans Vu <hungvu193@users.noreply.github.com>

Fix blockers submit email promt

9b06c00

melvin-bot Bot assigned hungvu193 Jul 2, 2026

hungvu193 mentioned this pull request Jul 2, 2026

[Due for payment 2026-07-13] Android - More button overlaps with next step message and is hardly tappable #95093

Closed

7 tasks

Fix cancel payments

26878c9

hungvu193 mentioned this pull request Jul 2, 2026

[Due for payment 2026-07-13] iOS - Expense - Unable to cancel payment #95095

Closed

7 tasks

Fix delete button

b3b184d

fix failing check

c6eb1c6

hungvu193 marked this pull request as ready for review July 2, 2026 07:17

hungvu193 requested review from a team as code owners July 2, 2026 07:17

melvin-bot Bot requested review from abzokhattab and flaviadefaria and removed request for a team and abzokhattab July 2, 2026 07:17

Fix keyboard issue

8a07b85

hungvu193 requested a review from abzokhattab July 2, 2026 07:17

chatgpt-codex-connector Bot reviewed Jul 2, 2026

View reviewed changes

Comment thread src/libs/showConfirmModalAfterMoreMenuDismiss.ts

hungvu193 mentioned this pull request Jul 2, 2026

[Due for payment 2026-07-13] Expense report - More dropdown is not visible in expense report view #95139

Closed

7 tasks

abzokhattab approved these changes Jul 2, 2026

View reviewed changes

melvin-bot Bot requested review from MonilBhavsar, iwiznia and stitesExpensify July 2, 2026 11:16

iwiznia approved these changes Jul 2, 2026

View reviewed changes

iwiznia merged commit f12e4b0 into Expensify:main Jul 2, 2026
39 of 48 checks passed

hungvu193 mentioned this pull request Jul 2, 2026

[CP Staging] Revert "[Submit] Submit button with manager email prompt take 2" #95144

Closed

mountiny changed the title ~~[Submit] Fix blockers for submit email submitter~~ [CP Staging] [Submit] Fix blockers for submit email submitter Jul 2, 2026

OSBotify pushed a commit that referenced this pull request Jul 2, 2026

Merge pull request #95115 from hungvu193/fix-blocker-email-submitter

a5ad02f

[Submit] Fix blockers for submit email submitter (cherry picked from commit f12e4b0) (cherry-picked to staging by mountiny)

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

OSBotify mentioned this pull request Jul 2, 2026

Deploy Checklist: New Expensify 2026-07-01 #95081

Closed

97 tasks

This was referenced Jul 6, 2026

[Due for payment 2026-07-13] iOS - Report - User cannot delete an expense or report using "More > Delete" #95111

Closed

[Due for payment 2026-07-13] Android - Workspace - Contact list modal does not move up when keyboard is opened #95097

Closed

Uh oh!

Conversation

hungvu193 commented Jul 2, 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 Jul 2, 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 Jul 2, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

abzokhattab commented Jul 2, 2026

Uh oh!

hungvu193 commented Jul 2, 2026

Uh oh!

hungvu193 commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hungvu193 commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abzokhattab commented Jul 2, 2026

Uh oh!

abzokhattab commented Jul 2, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abzokhattab commented Jul 2, 2026

Uh oh!

Uh oh!

OSBotify commented Jul 2, 2026

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

OSBotify commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

OSBotify commented Jul 3, 2026

Uh oh!

MelvinBot commented Jul 3, 2026

Uh oh!

OSBotify commented Jul 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hungvu193 commented Jul 2, 2026 •

edited

Loading

codecov Bot commented Jul 2, 2026 •

edited by github-actions Bot

Loading

hungvu193 commented Jul 2, 2026 •

edited

Loading

hungvu193 commented Jul 2, 2026 •

edited

Loading

abzokhattab commented Jul 2, 2026 •

edited

Loading