[CP Staging] fix: regressions after pay button standardization by getusha · Pull Request #66030 · Expensify/App

getusha · 2025-07-14T07:34:51Z

Explanation of Change

Fixed Issues

PROPOSAL:

Tests

#66004
Precondition:
Have two accounts set with USD as the Payment currency.
The accounts don't have any existing or previous IOUs made in the past.
The account A has been set up with a personal bank account, enable wallet.

Open app
[Account B] Submit an IOU to Account A
Log in as User A
Open the chat with Account B and pay the IOU using any Pay with wallet
Verify that the The IOU is paid with wallet.

#66005
Precondition:
Workspace is set up with bank account.
Admin invites member to the workspace.
Member has a personal bank account.

Open app
[Member] Submit an expense with amount more than $100 to the workspace chat.
[Member] Click Submit on the expense preview.
[Admin] Open the expense report.
[Admin] Click Approve and Pay by bank account.
[Admin] Right click on paid system message > Reply in thread.
Verify that LHN preview shows the same message as the expense report - paid with bank account 1111

#65989
Precondition:
User A default currency is USD.
User B has no workspace.

Open app
[User A] Submit an expense to User B.
[User B] Open DM with User A.
[User B] On the expense preview, click Pay > Pay with business account.
[User A] Submit another expense to User B.
[User B] Go to workspace settings and edit the workspace name to a long name.
[User B] Go back to DM with User A.
Verify that the long workspace name on the Pay button is truncated.

#66003
Precondition:
Workspace is set up with bank account.
Admin invites member to the workspace.
Member has a personal bank account.

Open app
[Member] Submit an expense with amount more than $100 to the workspace chat.
[Member] Click Submit on the expense preview.
[Admin] Open workspace chat with member.
[Admin] Click Approve and Pay by bank account.
[Admin] Create a new workspace and go to workspace chat.
[Admin] Create an expense in the workspace chat.
[Admin] Click Submit and Approve.
[Admin] Click Pay button.
Verify that the Pay button opens an option to select Pay with business account or Mark as paid first and is not split button.
[Member] Send an invoice to admin.
[Admin] Open the invoice report.
[Admin] Click Pay button.
Verify that the Pay button opens an option to select Pay with business account or Mark as paid first and is not split button.

Verify that no errors appear in the JS console

Offline tests

N/a

QA Steps

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

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

Screen.Recording.2025-07-14.at.11.38.32.in.the.morning.mov

Screenshot 2025-07-14 at 11 42 37 in the morning

Screenshot 2025-07-14 at 11 45 23 in the morning

MacOS: Desktop

melvin-bot · 2025-07-14T09:04:28Z

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

hungvu193 · 2025-07-14T09:22:37Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-07-14.at.16.49.10.mov

Screen.Recording.2025-07-14.at.17.04.21.mov

Screen.Recording.2025-07-14.at.17.09.59.mov

MacOS: Desktop

src/components/SettlementButton/index.tsx

hungvu193 · 2025-07-14T09:44:22Z

@getusha I still can reproduce #66005, can you take a look?

Screen.Recording.2025-07-14.at.16.43.47.mov

getusha · 2025-07-14T09:53:08Z

Should be good now. @hungvu193

hungvu193 · 2025-07-14T09:55:38Z

it's now showing bank account with undefined value 🤔

Screen.Recording.2025-07-14.at.16.54.36.mov

getusha · 2025-07-14T10:01:07Z

forgot to pass the digits, should work now.

hungvu193

All yours @grgia

fix: regressions after pay button standardization (cherry picked from commit 5c9a614) (cherry-picked to staging by grgia)

OSBotify · 2025-07-14T12:15: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.

github-actions · 2025-07-14T12:55:37Z

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

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

This reverts commit 82860f0.

kavimuru · 2025-07-14T22:54:53Z

#66003 - Step 14 fails.

66030-Web-4.mp4

#65989 fails

66030-Web-3.mp4

github-actions · 2025-07-15T03:02:04Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.80-8 🚀

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

ishpaul777 · 2025-10-29T21:47:01Z

src/libs/ReportUtils.ts

+                if (automaticAction && originalMessage.paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
                    translationKey = 'iou.automaticallyPaidWithExpensify';
+                } else {
+                    translationKey = 'iou.automaticallyPaidWithBusinessBankAccount';
                }


{bz checklist #71287 } We are not checking if automaticAction true before using automaticallyPaidWithBusinessBankAccount translation key. And we ended up using the wrong translation key.

getusha added 6 commits July 14, 2025 10:31

fix: payment with wallet

4984de7

fix: remove amount from system messages

3c0d4c8

fix: truncate default workspace name

793eb73

fix: Expensify#66003

8888d4a

fix: lint

dea7d64

fix: lint

49ec44f

getusha marked this pull request as ready for review July 14, 2025 09:04

getusha requested a review from a team as a code owner July 14, 2025 09:04

melvin-bot bot requested review from akinwale and removed request for a team July 14, 2025 09:04

hungvu193 suggested changes Jul 14, 2025

View reviewed changes

src/components/SettlementButton/index.tsx Outdated Show resolved Hide resolved

fix: use const values

0e43893

fix: use new system messages

9703faa

fix: use new system messages

39080f9

hungvu193 approved these changes Jul 14, 2025

View reviewed changes

melvin-bot bot requested a review from jasperhuangg July 14, 2025 10:36

grgia self-requested a review July 14, 2025 12:05

grgia approved these changes Jul 14, 2025

View reviewed changes

grgia added the CP Staging marks PRs that have been CP'd to staging label Jul 14, 2025

grgia merged commit 5c9a614 into Expensify:main Jul 14, 2025
18 checks passed

grgia removed the CP Staging marks PRs that have been CP'd to staging label Jul 14, 2025

mountiny changed the title ~~fix: regressions after pay button standardization~~ [CP Staging] fix: regressions after pay button standardization Jul 14, 2025

OSBotify pushed a commit that referenced this pull request Jul 14, 2025

Merge pull request #66030 from getusha/fix-blockers

82860f0

fix: regressions after pay button standardization (cherry picked from commit 5c9a614) (cherry-picked to staging by grgia)

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

github-actions bot mentioned this pull request Jul 14, 2025

Deploy Checklist: New Expensify 2025-07-11 #65958

Closed

73 tasks

luacmartins mentioned this pull request Jul 14, 2025

Revert "[CP Staging] fix: regressions after pay button standardization" #66079

Closed

grgia added a commit that referenced this pull request Jul 14, 2025

Revert "Merge pull request #66030 from getusha/fix-blockers"

28f8718

This reverts commit 82860f0.

grgia mentioned this pull request Jul 14, 2025

Revert pay buttons #66083

Closed

51 tasks

getusha added a commit to getusha/App that referenced this pull request Jul 14, 2025

Revert "Merge pull request Expensify#66030 from getusha/fix-blockers"

18d7f8e

getusha added a commit to getusha/App that referenced this pull request Jul 14, 2025

Revert 'Merge pull request Expensify#66030 from getusha/fix-blockers'

439bfb7

getusha added a commit to getusha/App that referenced this pull request Jul 14, 2025

Revert 'Merge pull request Expensify#66030 from getusha/fix-blockers'

7630c4b

Julesssss mentioned this pull request Jul 15, 2025

Deploy Checklist: New Expensify 2025-04-29 Expensify/App-Test-Fork#56

Closed

68 tasks

ishpaul777 reviewed Oct 29, 2025

View reviewed changes

ishpaul777 mentioned this pull request Oct 29, 2025

[Due for payment 2025-10-21] [$250] Expense - Paid with bank account system message has different content when copied #71287

Closed

8 tasks

Conversation

getusha commented Jul 14, 2025 • edited by mountiny 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 Jul 14, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

hungvu193 commented Jul 14, 2025

Uh oh!

getusha commented Jul 14, 2025

Uh oh!

hungvu193 commented Jul 14, 2025

Uh oh!

getusha commented Jul 14, 2025

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jul 14, 2025

Uh oh!

github-actions bot commented Jul 14, 2025

Uh oh!

kavimuru commented Jul 14, 2025

Uh oh!

github-actions bot commented Jul 15, 2025

Uh oh!

ishpaul777 Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

getusha commented Jul 14, 2025 •

edited by mountiny

Loading

hungvu193 commented Jul 14, 2025 •

edited

Loading

ishpaul777 Oct 29, 2025 •

edited

Loading