Skip to content

Feat standardize pay button#56838

Merged
grgia merged 51 commits intoExpensify:mainfrom
getusha:feat-standardize-pay-button
Jun 24, 2025
Merged

Feat standardize pay button#56838
grgia merged 51 commits intoExpensify:mainfrom
getusha:feat-standardize-pay-button

Conversation

@getusha
Copy link
Contributor

@getusha getusha commented Feb 13, 2025

Explanation of Change

Standardize pay button for IOUs and Expenses

Fixed Issues

$ #61744
$ #55874
#55875
PROPOSAL:

Tests

Paying IOU for the first time - preview

  1. Account B: submits an expense to Account A (a US based account)
  2. Account A: Navigate to the expense preview and press on Pay %amount% button
  3. Verify you are presented with 3 options Pay with personal account, Pay with business account, Mark as paid
  4. Press Pay with personal account
  5. Verify that you are prompted to setup a PBA
  6. Complete steps to add PBA
  7. Press on Pay %amount% button
  8. Verify Pay with business account is present
  9. Press Pay with business account
  10. Verify that a collect workspace is created and the IOU is moved to the new workspace chat
  11. Verify that there is a system message that clarifies the IOU is moved
  12. Navigate to the new workspace
  13. Create a new IOU
  14. Verify that there is Pay via %workspace name% option
  15. Press the option in step 14
  16. Verify that the IOU is moved to the existing workspace

Paid IOU before - preview

  1. Account B: Submit an expense to Account A
  2. Account A: Open the chat to Account B and pay the IOU using any payment method
  3. Verify that the recently used payment method is selected
  4. Account B: Submit another expense
  5. Account A: Tap on the default option on the new IOU
  6. Verify that the IOU is paid

Paying expense report for the first time - preview

  • Preconditions
  1. Have a workspace with a preferred currency of USD
    Steps
  2. Submit an expense to the workspace
  3. Login to the admin account and open the expense chat
  4. Verify that the settlement button matches the design below
  5. Press on the settlement button
  6. Verify that there is Pay with business account and Mark as paid.
  7. Verify the expense view has the same pattern

image

Paying expense report for the first time - held expense

  • Preconditions
  1. A workspace with an expense that has held amount
    Steps
  2. Press on the settlement button
  3. Verify that you're presented with a dropdown to select the payment method first
  4. Press on any payment method
  5. Verify you're presented with a modal to confirm whether you want to pay the full or not-held amount.

Paid expense report before - preview

  • Preconditions
  1. A workspace chat with previously paid expenses using a BBA
  2. A new expense report inside the workspace chat
    Steps
  3. Navigate to the workspace chat
  4. Verify the settlement button matches the pattern below
  • Verify that no errors appear in the JS console

Offline tests

N/a

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
    • MacOS: Desktop
  • 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • 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

Paying IOU for the first time - preview

Screenshot 2025-04-22 at 6 05 19 in the evening

Paid IOU before - preview

Screenshot 2025-04-22 at 6 05 40 in the evening

Paying expense report for the first time - preview

Screenshot 2025-04-22 at 6 06 00 in the evening

Paying expense report for the first time - held expense

Screen.Recording.2025-04-22.at.6.11.01.in.the.evening.mov

Paid expense report before - preview

Screenshot 2025-04-22 at 6 11 46 in the evening

MacOS: Desktop

@hungvu193
Copy link
Contributor

Hey @getusha, can you merge main?

@hungvu193
Copy link
Contributor

Let's merge main and address the linting @getusha 😄

@getusha getusha force-pushed the feat-standardize-pay-button branch 2 times, most recently from 0a499a9 to 4edefdb Compare February 23, 2025 16:06
@getusha getusha marked this pull request as ready for review February 23, 2025 17:31
@getusha getusha requested a review from a team as a code owner February 23, 2025 17:31
@melvin-bot melvin-bot bot requested review from hungvu193 and removed request for a team February 23, 2025 17:31
@melvin-bot
Copy link

melvin-bot bot commented Feb 23, 2025

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

Comment on lines +8 to +12
Iou: string;
iou: string;
/** The lastPaymentMethod of an Expense */
Expense: string;
expense: string;
/** The lastPaymentMethod of an Invoice */
Invoice: string;
invoice: string;
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops, I thought I confirmed these property names with @grgia, may I know why you changed these property names? Is that something that's returned from our BE?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's to fix type error:

selector: (paymentMethod) => getLastPolicyPaymentMethod(policyIDKey, paymentMethod, iouReport?.type as keyof LastPaymentMethodType),

Not sure why we'd want them to be capitalized, aren't they keys?

@hungvu193
Copy link
Contributor

Also can you provide the test steps and complete the checklist? Ty

@getusha
Copy link
Contributor Author

getusha commented Feb 25, 2025

Also can you provide the test steps and complete the checklist? Ty

@hungvu193 thought i'll do that once the BE changes are deployed, so i can test it all together. wdyt?

@hungvu193
Copy link
Contributor

Got it. I posted on slack to move this forward

@hungvu193
Copy link
Contributor

Looks like we still have linting, can you fix it? @getusha

@hungvu193
Copy link
Contributor

Friendly reminder that we also have this PR which also changes the SettlementButton

@hungvu193
Copy link
Contributor

Still have linting, can you just merge your PR with mine? and we start from there?

@getusha getusha force-pushed the feat-standardize-pay-button branch from 826b0ba to 2e0f923 Compare March 13, 2025 10:34
@getusha getusha changed the title Feat standardize pay button [HELD ON BE] Feat standardize pay button Mar 13, 2025
@hungvu193
Copy link
Contributor

hungvu193 commented Mar 14, 2025

@getusha What's being held on BE btw?

@getusha
Copy link
Contributor Author

getusha commented Mar 14, 2025 via email

@hungvu193
Copy link
Contributor

Can you please also update on slack?

Comment on lines +88 to +100
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const policy = policies?.[policyID];
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this one is incorrect because the policyID only includes the ID, not the policy_ part, we should probably keep the old code.

Screenshot 2025-03-17 at 13 37 47

Copy link
Contributor

Choose a reason for hiding this comment

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

OR somethings like this:

const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];

Copy link
Contributor

@hungvu193 hungvu193 left a comment

Choose a reason for hiding this comment

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

I've just found another issue while working on invoice feature.

Comment on lines +88 to +100
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const policy = policies?.[policyID];
Copy link
Contributor

Choose a reason for hiding this comment

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

OR somethings like this:

const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];

@getusha getusha force-pushed the feat-standardize-pay-button branch from 78ea10d to 44f1336 Compare April 2, 2025 14:50
@getusha getusha requested a review from a team as a code owner April 2, 2025 14:50
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 2025

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

Comment on lines +504 to +507
// const isPolicyExpenseChat = !!reports.find((rp) => rp.policyID === transactionItem.policyID && rp.isPolicyExpenseChat);

// console.log({reports})
// console.log({isPolicyExpenseChat});
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is all this code commented out? I see some more below here. We should not merge this kinda changes into main

Copy link
Contributor

Choose a reason for hiding this comment

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

const formattedAmount = convertToDisplayString(Math.abs(amount), currency) ?? '';

// This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
// eslint-disable-next-line deprecation/deprecation
Copy link
Contributor

Choose a reason for hiding this comment

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

Please do not add more usages of getPolicy(). It has been deprecated for a reason and adding more usages is just increasing the work that other people need to do.

@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.1.72-0 🚀

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

1 similar comment
@github-actions
Copy link
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.1.72-0 🚀

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

@luacmartins luacmartins mentioned this pull request Jun 30, 2025
51 tasks
@github-actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.72-10 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.