Skip to content

[No QA] Revert #96228#96661

Merged
puneetlath merged 4 commits into
Expensify:mainfrom
thelullabyy:revert/96228
Jul 21, 2026
Merged

[No QA] Revert #96228#96661
puneetlath merged 4 commits into
Expensify:mainfrom
thelullabyy:revert/96228

Conversation

@thelullabyy

@thelullabyy thelullabyy commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #93854
$ #96593
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • 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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
evidences.mov

@thelullabyy
thelullabyy marked this pull request as ready for review July 21, 2026 16:28
@thelullabyy
thelullabyy requested review from a team as code owners July 21, 2026 16:28
@melvin-bot
melvin-bot Bot requested review from ikevin127 and trjExpensify July 21, 2026 16:28
@melvin-bot

melvin-bot Bot commented Jul 21, 2026

Copy link
Copy Markdown

@ikevin127 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: a8f29f96fd

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

>
<ScreenWrapper
shouldEnableKeyboardAvoidingView
shouldEnableKeyboardAvoidingView={isNewManualExpenseFlowEnabled}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Keep keyboard avoidance for the legacy amount step

When NEW_MANUAL_EXPENSE_FLOW is off, this page renders IOURequestStepAmountWithTransactionOnly for the manual tab, and that amount step is embedded without its own ScreenWrapper in the create flow. Tying the parent ScreenWrapper's keyboard avoiding view to the beta therefore disables keyboard avoidance for the legacy amount form; on mobile/touch devices the keyboard can cover the amount input or submit controls. Keep keyboard avoidance enabled for the non-beta manual amount flow as well.

Useful? React with 👍 / 👎.

@codecov

codecov Bot commented Jul 21, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 94.81% <ø> (ø)
...onents/MoneyRequestConfirmationFields/Provider.tsx 100.00% <100.00%> (ø)
...mponents/MoneyRequestConfirmationFields/context.ts 80.00% <ø> (ø)
...onfirmationList/hooks/useConfirmationValidation.ts 83.33% <100.00%> (ø)
...stConfirmationList/hooks/useFormErrorManagement.ts 90.38% <100.00%> (ø)
...eyRequestConfirmationList/sections/AmountField.tsx 43.96% <100.00%> (+0.98%) ⬆️
...oneyRequestConfirmationList/sections/DateField.tsx 78.26% <100.00%> (+19.56%) ⬆️
...uestConfirmationList/sections/DescriptionField.tsx 76.66% <100.00%> (+6.66%) ⬆️
...RequestConfirmationList/sections/MerchantField.tsx 71.73% <100.00%> (+21.73%) ⬆️
.../components/MoneyRequestConfirmationListFooter.tsx 100.00% <100.00%> (ø)
... and 11 more
... and 10 files with indirect coverage changes

@puneetlath
puneetlath merged commit dcd250e into Expensify:main Jul 21, 2026
39 of 41 checks passed
@puneetlath

Copy link
Copy Markdown
Contributor

Merged as its a straight revert of a PR that had many deploy blockers. Asking for CP.

@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 pushed a commit that referenced this pull request Jul 21, 2026
[No QA] Revert #96228

(cherry picked from commit dcd250e)

(cherry-picked to staging by puneetlath)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 21, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.4.41-2 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles and did not create a docs PR.

Why no docs update is needed:

This PR is a straight revert of #96228 ("feat: remove isNewManualExpenseFlowEnabled beta flag"). It re-introduces the NEW_MANUAL_EXPENSE_FLOW beta and re-gates the money-request confirmation logic behind isBetaEnabled(CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW). The change is entirely internal feature-flag plumbing:

  • Adds the beta constant back and threads an isNewManualExpenseFlowEnabled flag through the MoneyRequestConfirmationList component and its hooks/sections.
  • Conditions inline amount/date/tax fields, validation, error surfacing, and the confirm-button label on that beta.

For the general (non-beta) audience this restores the prior behavior that shipped before #96228, so it does not introduce any new user-facing behavior that the help site would need to describe. Beta-gated flows are not documented on the public help site, and the existing help articles already reflect the pre-#96228 (restored) behavior — no article edits are needed.

@thelullabyy, since this is a revert that restores previously-documented behavior, there's nothing to update on the help site. If you believe a specific help article no longer matches current behavior, let me know which one and I'll take another look.

This was referenced Jul 21, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.41-4 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review — no changes required

I reviewed the changes in this PR against the help site articles under App/docs/articles and no documentation updates are needed. I did not create a draft docs PR.

Why: This is [No QA] Revert #96228, which re-gates the "new manual expense flow" behind the NEW_MANUAL_EXPENSE_FLOW beta (CONST.BETAS.NEW_MANUAL_EXPENSE_FLOW). Every behavior change here is wrapped in an isNewManualExpenseFlowEnabled check, so for users without the beta the manual-expense confirmation flow returns to its previous, already-documented behavior (separate amount step, "Create expense with amount" button, navigation to the participants page, footer-level validation errors, etc.).

Since the new inline flow is not generally available and the default behavior reverts to what the help site already describes, there is nothing new to document and nothing existing that becomes inaccurate. I also searched the articles for the affected UI strings/flow ("create expense with amount", "manual expense flow", inline amount editing) and found no article that documents the reverted behavior.

If/when the new manual expense flow ships to all users (beta removed), that would be the point to add or update help site coverage.

@thelullabyy, no linked help site PR was created since no docs changes are required. Please confirm this assessment matches the intended behavior — if you believe a help article does need updating, let me know which article/flow and I'll create the draft PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.42-1 🚀

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.

4 participants