Fix optimistic merchant #32200

dukenv0307 · 2023-11-29T16:55:59Z

Details

Fix optimistic merchant

Fixed Issues

$ #32183
PROPOSAL:

Tests

Create a split bill
Verify that the participant data doesn't appear briefly

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Create a split bill
Verify that the participant data doesn't appear briefly

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 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 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 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 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.2023-11-29.at.23.46.25.mov

Android: mWeb Chrome

Screen.Recording.2023-11-29.at.23.42.45.mov

iOS: Native

Screen.Recording.2023-11-29.at.23.49.18.mov

iOS: mWeb Safari

Screen.Recording.2023-11-29.at.23.41.36.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-29.at.23.38.00.mov

MacOS: Desktop

Screen.Recording.2023-11-29.at.23.52.36.mov

melvin-bot · 2023-11-29T16:56:16Z

@aimane-chnaif 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]

aimane-chnaif · 2023-11-29T18:17:12Z

Job 1 is still running. Something wrong with this PR or main?

aimane-chnaif · 2023-11-29T18:22:07Z

ok so failed finally

aimane-chnaif · 2023-11-29T19:40:44Z

@dukenv0307 are you working on fixing unit test?

pecanoro · 2023-11-29T21:36:29Z

@dukenv0307 Any updates of that failed test?

pecanoro · 2023-11-29T23:29:04Z

We ended up reverting the original PR because it was blocking the deploy, we can work on this PR to add the code we reverted and fix the bug we found.

dukenv0307 · 2023-11-30T03:10:25Z

@aimane-chnaif @pecanoro Sorry for the delay, it's too late in my timezone yesterday. Updated PR to contain the previous PR changed and fixed test.

aimane-chnaif · 2023-12-01T13:06:12Z

@dukenv0307 please merge main

dukenv0307 · 2023-12-01T13:12:55Z

@aimane-chnaif Updated.

aimane-chnaif · 2023-12-01T15:38:25Z

@dukenv0307 I am not able to split. Confirmed not happening on main

Screen.Recording.2023-12-01.at.4.36.57.PM.mov

src/libs/actions/IOU.js

Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

dukenv0307 · 2023-12-01T15:45:52Z

@aimane-chnaif Thanks, updated.

aimane-chnaif · 2023-12-01T15:47:23Z

src/libs/actions/IOU.js

@@ -919,12 +919,13 @@ function requestMoney(
 * @param {Number} amount - always in the smallest unit of the currency
 * @param {String} comment
 * @param {String} currency
+ * @param {String} merchant


also reorder this

aimane-chnaif · 2023-12-01T15:48:53Z

src/libs/actions/IOU.js

 */
-function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category) {
- const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category);
+function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category, merchant = '') {


I see that empty string is set as merchant default value here.
And not set in all other places.
Can you make them consistent? What issue happens if default value not set?

I missed it.

Update now.

I confirmed it's redundant. Remove all default values
It's handled here:

App/src/libs/TransactionUtils.ts

Line 43 in 48b5a29

merchant = '',

dukenv0307 · 2023-12-01T15:54:34Z

@aimane-chnaif Updated.

aimane-chnaif · 2023-12-01T16:04:16Z

BUG: merchant is replaced with description

Screen.Recording.2023-12-01.at.5.03.06.PM.mov

dukenv0307 · 2023-12-01T17:00:39Z

@aimane-chnaif Actually now, we are not handle merchant for split manual request in BE. I believe we are handling this in the PR which you're reviewing.

dukenv0307 · 2023-12-01T17:01:18Z

The previous PR fix to display merchant for split scan request.

aimane-chnaif · 2023-12-01T17:09:44Z

@aimane-chnaif Actually now, we are not handle merchant for split manual request in BE. I believe we are handling this in the PR which you're reviewing.

So you tried to send merchant in split api commands and not working?

dukenv0307 · 2023-12-01T17:22:47Z

@aimane-chnaif we don't pass merchant as param now in SplitBill API. Are we handling this here #30721?

aimane-chnaif · 2023-12-01T17:23:35Z

@aimane-chnaif we don't pass merchant as param now in SplitBill API. Are we handling this here #30721?

If you review code on that PR, not yet.

dukenv0307 · 2023-12-01T17:28:10Z

@aimane-chnaif I just tested to pass merchant param to split bill and BE return merchant now. Do you think we can pass merchant param in this PR?

aimane-chnaif · 2023-12-01T17:29:42Z

@aimane-chnaif I just tested to pass merchant param to split bill and BE return merchant now. Do you think we can pass merchant param in this PR?

yes. @pecanoro do you agree?

pecanoro · 2023-12-01T17:31:51Z

I agree, if it's working as expected, I don't see why not.

dukenv0307 · 2023-12-01T17:40:07Z

@aimane-chnaif Updated.

aimane-chnaif · 2023-12-01T18:36:57Z

@dukenv0307 conflicts

aimane-chnaif · 2023-12-01T18:43:29Z

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 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 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(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 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 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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web1.mov

web2.mov

MacOS: Desktop

desktop.mov

dukenv0307 · 2023-12-02T01:35:17Z

@aimane-chnaif Updated.

aimane-chnaif · 2023-12-02T03:47:28Z

src/libs/actions/IOU.js

 * @param {String} tag
 */
-function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category, tag) {
- const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category, tag);
+function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, category, merchant, tag) {


can you update order so tag next to category and merchant is last?

@aimane-chnaif Updated.

aimane-chnaif

Retested on latest branch.
LGTM 🎉

OSBotify · 2023-12-04T17:37:06Z

✋ 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 · 2023-12-05T02:56:47Z

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 1.4.7-4 🚀

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 · 2023-12-05T13:41:53Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.4.8-0 🚀

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

OSBotify · 2023-12-06T20:32:00Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.8-3 🚀

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

OSBotify · 2023-12-06T20:41:32Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.8-3 🚀

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

fix optimistic merchant

8a8ce84

dukenv0307 marked this pull request as ready for review November 29, 2023 16:56

dukenv0307 requested a review from a team as a code owner November 29, 2023 16:56

melvin-bot bot requested review from aimane-chnaif and removed request for a team November 29, 2023 16:56

dukenv0307 added 2 commits November 30, 2023 00:25

Merge branch 'main' into fix/32183

b91478f

fix jest test

94f30d3

dukenv0307 added 3 commits November 30, 2023 10:04

edit test

55eb7f3

Merge branch 'main' into fix/32183

b49a446

add change of previous pr

d4baf33

aimane-chnaif mentioned this pull request Nov 30, 2023

Allow setting merchant for split bill #30721

Merged

57 tasks

Merge branch 'main' into fix/32183

ec32acd

aimane-chnaif reviewed Dec 1, 2023

View reviewed changes

src/libs/actions/IOU.js Outdated Show resolved Hide resolved

Update src/libs/actions/IOU.js

eb126a1

Co-authored-by: Aimane Chnaif <96077027+aimane-chnaif@users.noreply.github.com>

aimane-chnaif reviewed Dec 1, 2023

View reviewed changes

dukenv0307 added 2 commits December 1, 2023 22:49

re-order param

a1d15a9

add default value for merchant param

6642c60

remove default value

76569f5

dukenv0307 added 2 commits December 2, 2023 00:33

add merchant param in split bill API

1083e35

add merchant in optimistic data of child transaction

db14284

merge main

f179348

aimane-chnaif reviewed Dec 2, 2023

View reviewed changes

re-order tag param

4708fed

aimane-chnaif approved these changes Dec 2, 2023

View reviewed changes

melvin-bot bot requested a review from pecanoro December 2, 2023 16:00

pecanoro approved these changes Dec 4, 2023

View reviewed changes

pecanoro merged commit 385e835 into Expensify:main Dec 4, 2023
17 checks passed

github-actions bot mentioned this pull request Dec 5, 2023

Deploy Checklist: New Expensify 2023-12-05 #32463

Closed

66 tasks

pecanoro mentioned this pull request Dec 7, 2023

[$500] Payment issue for E/App PR#32200 #32677

Closed

Fix optimistic merchant #32200

Fix optimistic merchant #32200

Conversation

dukenv0307 commented Nov 29, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 29, 2023

aimane-chnaif commented Nov 29, 2023

aimane-chnaif commented Nov 29, 2023

aimane-chnaif commented Nov 29, 2023

pecanoro commented Nov 29, 2023

pecanoro commented Nov 29, 2023

dukenv0307 commented Nov 30, 2023 • edited Loading

aimane-chnaif commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023

aimane-chnaif Dec 1, 2023

Choose a reason for hiding this comment

aimane-chnaif Dec 1, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 1, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 1, 2023

Choose a reason for hiding this comment

aimane-chnaif Dec 1, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 1, 2023

Choose a reason for hiding this comment

dukenv0307 commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023 • edited Loading

dukenv0307 commented Dec 1, 2023 • edited Loading

aimane-chnaif commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

pecanoro commented Dec 1, 2023

dukenv0307 commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

aimane-chnaif commented Dec 1, 2023

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Dec 2, 2023

aimane-chnaif Dec 2, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 2, 2023 • edited Loading

Choose a reason for hiding this comment

aimane-chnaif left a comment

Choose a reason for hiding this comment

OSBotify commented Dec 4, 2023

OSBotify commented Dec 5, 2023

OSBotify commented Dec 5, 2023

OSBotify commented Dec 6, 2023

OSBotify commented Dec 6, 2023

dukenv0307 commented Nov 30, 2023 •

edited

Loading

dukenv0307 commented Dec 1, 2023 •

edited

Loading

dukenv0307 commented Dec 1, 2023 •

edited

Loading

dukenv0307 Dec 2, 2023 •

edited

Loading