Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow selecting a payer from the splits page #40388

Merged
merged 36 commits into from
Apr 30, 2024

Conversation

nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented Apr 18, 2024

Details

Fixed Issues

$ #40379
PROPOSAL: #40379 (comment)

Tests

  1. Create a group chat
  2. Go to group chat > FAB > Split expense
  3. Enter a valid amount and go to the next step
  4. In confirmation page, verify that Paid by field appears
  5. Click on this to open split payer page
  6. In this page, verify that the selected split payer option has green check mark icon
  7. Select another one and verify that Paid by field is updated
  8. Create the split bill and verify that it's created successfully
  • Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

  1. Create a group chat
  2. Go to group chat > FAB > Split expense
  3. Enter a valid amount and go to the next step
  4. In confirmation page, verify that Paid by field appears
  5. Click on this to open split payer page
  6. In this page, verify that the selected split payer option has green check mark icon
  7. Select another one and verify that Paid by field is updated
  8. Create the split bill and verify that it's created successfully
  • 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 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 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.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 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.

Screenshots/Videos

Android: Native
Screen.Recording.2024-04-18.at.12.59.37.mov
Android: mWeb Chrome
Screen.Recording.2024-04-18.at.12.57.23.mov
iOS: Native
Screen.Recording.2024-04-18.at.13.04.54.mov
iOS: mWeb Safari
Screen.Recording.2024-04-18.at.12.56.32.mov
MacOS: Chrome / Safari
Screen.Recording.2024-04-18.at.12.55.21.mov
MacOS: Desktop
Screen.Recording.2024-04-18.at.13.06.15.mov

@nkdengineer nkdengineer marked this pull request as ready for review April 18, 2024 06:13
@nkdengineer nkdengineer requested a review from a team as a code owner April 18, 2024 06:13
@melvin-bot melvin-bot bot requested review from dukenv0307 and removed request for a team April 18, 2024 06:13
Copy link

melvin-bot bot commented Apr 18, 2024

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

src/languages/es.ts Outdated Show resolved Hide resolved
src/languages/en.ts Outdated Show resolved Hide resolved
item: (
<MenuItem
label={translate('moneyRequestConfirmationList.paidBy')}
interactive={!transaction?.isFromGlobalCreate}
Copy link
Contributor

Choose a reason for hiding this comment

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

@nkdengineer Why do you use this condition? Do you mean that we shouldn't allow editing payer in split request created global

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes because when we create split request from global, maybe we cannot know the current user accountID of other user. So I'm disabling this.

@youssef-lr What do you think about this?

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe we cannot know the current user accountID of other user

Good point, but this is only true if we're splitting with new accounts as we'll only have their optimistic accountIDs. We can handle this in the backend though so it should be fine to just send the optimistic accountID, we'll use the real accountID once it's created in the backend.

So to answer your question @nkdengineer we should still allow selection of payer from Global Create.

@dukenv0307
Copy link
Contributor

@rafecolton @joekaufmanexpensify

Screen.Recording.2024-04-18.at.15.04.49.mov

When creating split request in workspace the payer list only have the request creator. Should we disable the payer field on the confirmation page in this case?

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
@@ -5808,6 +5817,10 @@ function setMoneyRequestParticipantsFromReport(transactionID: string, report: On
? [{accountID: 0, reportID: chatReport?.reportID, isPolicyExpenseChat: ReportUtils.isPolicyExpenseChat(chatReport), selected: true}]
: (chatReport?.participantAccountIDs ?? []).filter((accountID) => currentUserAccountID !== accountID).map((accountID) => ({accountID, selected: true}));

if (iouType === CONST.IOU.TYPE.SPLIT) {
Copy link
Contributor

Choose a reason for hiding this comment

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

@nkdengineer Could you explain about this change?

Copy link
Contributor

Choose a reason for hiding this comment

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

+1, we're also removing the option to select participants from the split.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved this logic to confirmation page since we're now allow skip confirmation step for QAB. The new design include the current user in split amounts section, that is the reason I add the current user to participants of transaction #40379 (comment).

@rafecolton
Copy link
Member

@nkdengineer you have merge conflicts, please resolve. Also would mind resolving any comments that you no longer need feedback on? I'll go through the remaining ones later today and give some feedback.

@nkdengineer
Copy link
Contributor Author

I resolved the conflict and update the translation key.

@youssef-lr
Copy link
Contributor

@nkdengineer heads up we have conflicts again

Copy link
Member

@rafecolton rafecolton left a comment

Choose a reason for hiding this comment

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

Found a little bug messing around with this while working on https://github.com/Expensify/Expensify/issues/388965

  1. Create a new group and add two other users
  2. Create a new manual split within that group
  3. Try to uncheck the current payer - it doesn't work (expected)
  4. Uncheck a different user who is not the current payer
  5. Set the user you just unchecked as the payer

Now you are taken back to the split creation screen...

  • Expected behavior: Payer is checked (included in the split) and cannot be unchecked
  • Actual behavior: Payer is unchecked (not included in the split) AND trying to include them by checking the box is blocked 🙈

@dukenv0307
Copy link
Contributor

@nkdengineer Currently, I see 2 payer fields

Screenshot 2024-04-25 at 23 31 18

@nkdengineer
Copy link
Contributor Author

@dukenv0307 Please ignore it, after testing complete we will hide the first paid by menu item before merging. Context here: #40388

@youssef-lr youssef-lr mentioned this pull request Apr 25, 2024
59 tasks
@youssef-lr
Copy link
Contributor

Bump @dukenv0307, we hope to get this merged today please 🙏🏼🙏🏼

@dukenv0307
Copy link
Contributor

I'm reviewing. Will finish in a few hours.

@dukenv0307
Copy link
Contributor

@nkdengineer Could you help to merge the latest main?

@dukenv0307
Copy link
Contributor

dukenv0307 commented Apr 26, 2024

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-04-26.at.17.26.29.mov
Android: mWeb Chrome
Screen.Recording.2024-04-26.at.16.03.47.mov
iOS: Native
Screen.Recording.2024-04-26.at.16.02.26.mov
iOS: mWeb Safari
Screen.Recording.2024-04-26.at.16.00.45.mov
MacOS: Chrome / Safari
Screen.Recording.2024-04-26.at.15.14.55.mov
MacOS: Desktop
Screen.Recording.2024-04-26.at.15.57.23.mov

@@ -3594,6 +3613,7 @@ function splitBillAndOpenReport({
createdReportActionID: splitData.createdReportActionID,
policyID: splitData.policyID,
chatType: splitData.chatType,
splitPayerAccountIDs: [],
Copy link
Contributor

Choose a reason for hiding this comment

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

@nkdengineer Is this expectation?

Copy link
Contributor Author

@nkdengineer nkdengineer Apr 26, 2024

Choose a reason for hiding this comment

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

I think we should also add splitPayerAccountIDs here. I passed splitPayerAccountIDs to splitBillAndOpenReport but missed to pass it to API.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dukenv0307 Updated and merged main.

@dukenv0307
Copy link
Contributor

One more comment, everything else looks good

@dukenv0307
Copy link
Contributor

@nkdengineer BUG: The payer field is wrong after creating split request (It always be the current user even though we change the payer)

Screen.Recording.2024-04-26.at.15.14.55.mov

@nkdengineer
Copy link
Contributor Author

@dukenv0307 This will require BE change and I think it will be fixed here #40386. One more note, we will hide this option before merging this PR and all logics to change or display the paid by after API is complete will be handled here #40386.

@dukenv0307
Copy link
Contributor

@youssef-lr Should we note this comment to #40386

Copy link

melvin-bot bot commented Apr 26, 2024

We did not find an internal engineer to review this PR, trying to assign a random engineer to #40379 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@dukenv0307
Copy link
Contributor

@youssef-lr Everything else looks good. All yours

@rafecolton
Copy link
Member

Will test against the back-end changes here in a bit. @nkdengineer can you please resolve merge conflicts again?

@rafecolton rafecolton merged commit a462d58 into Expensify:main Apr 30, 2024
16 checks passed
@OSBotify
Copy link
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
Copy link
Contributor

OSBotify commented May 1, 2024

🚀 Deployed to staging by https://github.com/rafecolton in version: 1.4.69-0 🚀

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

@kbecciv
Copy link

kbecciv commented May 1, 2024

This PR is failing because of issue #40379

The issue is reproducible in: All Platforms

1714555140450.Screen_Recording_2024-05-01_at_12.18.06_in_the_afternoon.mp4
1714546054224.40388_web.mp4
1714575665304.RPReplay_Final1714575196.mp4
1714574894549.az_recorder_20240501_104526.mp4
1714574355802.RPReplay_Final1714574179.mp4

@rafecolton
Copy link
Member

@kbecciv yeah unfortunately it won't really be possible to QA this PR by itself, as the feature is actually disabled here and the back-end requirements are not merged yet. I think we could skip it and test when the other PRs for #40379 are merged. @youssef-lr what do you think?

@nkdengineer
Copy link
Contributor Author

I agree with @rafecolton, this feature will be enabled again in this PR #40386.

@OSBotify
Copy link
Contributor

OSBotify commented May 2, 2024

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.69-2 🚀

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

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.

6 participants