[CP Staging] Uneven splits follow up #41717

youssef-lr · 2024-05-07T01:55:24Z

Details

cc @dubielzyk-expensify

Follow up to #40386 and Fixes this issue where the participants show up as being focused

Fixed Issues

$ #41761
$ #41758

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

Create a split request with 3 participants
Make sure they don't show up highlighted.
Go back to the participants page and remove one participant
Make sure the amounts have been properly updated in the next screen and no error is shown.
Create a split using a scanned receipt.
Click on the split preview and complete the split yourself without for smartscan.
Click on the split preview to reveal details, make sure the amounts are shown next to the participants.

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 / Chrome
- iOS / native
- iOS / 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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(themeColors.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 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.
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-05-07.at.20.34.16.mov

MacOS: Desktop

melvin-bot · 2024-05-07T01:55:51Z

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

shawnborton · 2024-05-07T13:19:51Z

Looks like we're missing screenshots.

melvin-bot · 2024-05-07T19:26:20Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

youssef-lr · 2024-05-07T19:27:46Z

Pushing one more fix for split amounts not shown in smartscanned split details page

youssef-lr · 2024-05-07T20:16:56Z

This should be ready for review @cristipaval!

youssef-lr · 2024-05-07T20:19:10Z

Looks like it's pretty late for Cristi, @allroundexperts has jumped to the rescue

allroundexperts · 2024-05-07T20:20:06Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Screen.Recording.2024-05-08.at.2.13.23.AM.mov

Screen.Recording.2024-05-08.at.2.12.24.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-05-08.at.2.11.13.AM.mov

Screen.Recording.2024-05-08.at.2.08.58.AM.mov

iOS: Native

Screen.Recording.2024-05-08.at.2.07.16.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-05-08.at.2.03.30.AM.mov

Screen.Recording.2024-05-08.at.2.04.22.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-08.at.2.01.54.AM.mov

Screen.Recording.2024-05-08.at.1.56.08.AM.mov

MacOS: Desktop

Screen.Recording.2024-05-08.at.2.00.47.AM.mov

Screen.Recording.2024-05-08.at.1.52.18.AM.mov

youssef-lr · 2024-05-07T20:20:56Z

src/libs/actions/IOU.ts

-
-        // This function expects the length of participants without current user
-        const splitAmount = IOUUtils.calculateAmount(accountIDs.length - 1, amount, currency, isPayer);
+        const participantsLength = newAccountIDs.includes(userAccountID) ? newAccountIDs.length - 1 : newAccountIDs.length;


Context: newAccountIDs may or may not contain the current user accountID depending on where this is called from. If we're splitting from within an existing group, it will have the user's accountID. If from Global Create, it won't. We need to send the participants length - 1 to calculateAmount

src/components/MoneyRequestAmountInput.tsx

allroundexperts

Looks good to me!

melvin-bot · 2024-05-07T21:32:55Z

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

allroundexperts · 2024-05-07T22:07:05Z

@youssef-lr Can you please create a payment issue for this PR?

youssef-lr · 2024-05-07T22:08:06Z

on it!

youssef-lr · 2024-05-07T22:09:01Z

Done #41758 (comment)

[CP Staging] Uneven splits follow up (cherry picked from commit dcda83e)

OSBotify · 2024-05-07T22:40:49Z

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

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

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

OSBotify · 2024-05-09T02:14:01Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

Fix row being focused

60aae42

youssef-lr self-assigned this May 7, 2024

youssef-lr requested a review from a team as a code owner May 7, 2024 01:55

melvin-bot bot requested review from cristipaval and removed request for a team May 7, 2024 01:55

Fix bug when changing participants

5b4415c

youssef-lr changed the title ~~Fix row being focused~~ Uneven splits follow up May 7, 2024

Fix focused state

51901d7

youssef-lr requested a review from a team as a code owner May 7, 2024 05:46

amyevans mentioned this pull request May 7, 2024

[HOLD for payment 2024-06-05] [$250] mweb - Split - Split amount input is partially input and scrollable horizontally #41766

Closed

6 tasks

marcaaron changed the title ~~Uneven splits follow up~~ [CP Staging] Uneven splits follow up May 7, 2024

youssef-lr added 2 commits May 7, 2024 20:32

Fix split amounts not displayed in scanned splits details page

0b8aa3d

Cleanup

936bb93

youssef-lr requested a review from allroundexperts May 7, 2024 20:19

youssef-lr commented May 7, 2024

View reviewed changes

marcaaron requested review from marcaaron and removed request for cristipaval May 7, 2024 20:57

allroundexperts reviewed May 7, 2024

View reviewed changes

src/components/MoneyRequestAmountInput.tsx Show resolved Hide resolved

allroundexperts approved these changes May 7, 2024

View reviewed changes

melvin-bot bot requested a review from NikkiWines May 7, 2024 21:32

youssef-lr removed the request for review from NikkiWines May 7, 2024 21:33

marcaaron approved these changes May 7, 2024

View reviewed changes

marcaaron merged commit dcda83e into main May 7, 2024
21 of 22 checks passed

marcaaron deleted the youssef_fix_focused_option branch May 7, 2024 22:05

OSBotify pushed a commit that referenced this pull request May 7, 2024

Merge pull request #41717 from Expensify/youssef_fix_focused_option

aa52e2b

[CP Staging] Uneven splits follow up (cherry picked from commit dcda83e)

github-actions bot mentioned this pull request May 7, 2024

Deploy Checklist: New Expensify 2024-05-07 #41716

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Uneven splits follow up #41717

[CP Staging] Uneven splits follow up #41717

youssef-lr commented May 7, 2024 •

edited

Loading

melvin-bot bot commented May 7, 2024

shawnborton commented May 7, 2024

melvin-bot bot commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

allroundexperts commented May 7, 2024 •

edited

Loading

youssef-lr May 7, 2024 •

edited

Loading

allroundexperts left a comment

melvin-bot bot commented May 7, 2024

allroundexperts commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

OSBotify commented May 7, 2024

OSBotify commented May 9, 2024

[CP Staging] Uneven splits follow up #41717

[CP Staging] Uneven splits follow up #41717

Conversation

youssef-lr commented May 7, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 7, 2024

shawnborton commented May 7, 2024

melvin-bot bot commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

allroundexperts commented May 7, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

youssef-lr May 7, 2024 • edited Loading

Choose a reason for hiding this comment

allroundexperts left a comment

Choose a reason for hiding this comment

melvin-bot bot commented May 7, 2024

allroundexperts commented May 7, 2024

youssef-lr commented May 7, 2024

youssef-lr commented May 7, 2024

OSBotify commented May 7, 2024

OSBotify commented May 9, 2024

youssef-lr commented May 7, 2024 •

edited

Loading

allroundexperts commented May 7, 2024 •

edited

Loading

youssef-lr May 7, 2024 •

edited

Loading