Revert "Revert "Handle tax for split requests"" and fix reported bugs by MonilBhavsar · Pull Request #42737 · Expensify/App

MonilBhavsar · 2024-05-29T06:01:11Z

Details

Pass taxCode and taxAmount to Split API commands.
Tracks tax both online and offline optimistically for split expense with policy expense chat

Fixed Issues

$ #39690
PROPOSAL:

Tests

Same as QA steps

And test #42642

Create a split scan.
When the receipt is scanning, click on the split preview.
Click Amount.
Change the currency to foreign currency.
Enter amount and save it.
Click Tax rate.
Ensure no duplicate tax rates are rendered

And test #42649

Create a split scan expense
While the receipt is scanning, click on the split preview
Click Amount and enter amount
Click Tax rate and select a non-zero tax rate
Click Tax amount
Click Save without modifying the current value
Ensure tax amount is saved and no error is displayed

And test #42682

Navigate to a workspace chat
Click '+' icon > Split expense > Enter amount > Select a tax rate
Change the previously selected tax rate with a new rate
Verify Tax amount should be updated with the new tax rate

And test #42655

Submit expense to any user.
Go to transaction thread.
Click Amount.
Click on the currency.
Select a different currency.
Verify new currency was saved

Verify that no errors appear in the JS console

Offline tests

Same as QA steps

QA Steps

Prerequisite: Tax is enabled on workspace

Go to FAB > Split > Select a workspace chat
Ensure tax rate and tax amount are selected
Update currency, expense amount and tax rate and ensure tax rate and tax amount are updated accordingly. Note the taxAmount at this point
Split the expense
Go to money request with workspace and ensure tax rate is selected as it is and tax amount is divided by half

Now we repeat by splitting with individuals

Go to FAB > Split > Select a workspace chat
Ensure tax rate and tax amount are not displayed
Go to individual money requests and ensure tax rate and tax amount are no displayed
Repeat for offline

Testing split scans

Go to FAB and select Split Expense and select Scan
Add a receipt
While in scanning state, update tax rate and ensure tax rate and tax amount are updated in draft transaction accordingly and no API call is being made
While in scanning state, update tax amount and ensure tax amount are updated in draft transaction accordingly and no API call is being made
While in scanning state, update expense amount and currency and ensure tax rate and tax amount are updated in draft transaction accordingly and no API call is being made

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

See MacOS: Chrome / Safari

Android: mWeb Chrome

See MacOS: Chrome / Safari

iOS: Native

See MacOS: Chrome / Safari

iOS: mWeb Safari

See MacOS: Chrome / Safari

MacOS: Chrome / Safari

https://drive.google.com/file/d/1C6T9vQ1VwujJJKlCbNNo8cZ_udQZmc3W/view?usp=sharing

MacOS: Desktop

See MacOS: Chrome / Safari

melvin-bot · 2024-05-29T12:33:33Z

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

MonilBhavsar · 2024-05-29T12:34:31Z

@dukenv0307 I'm back with a followup PR. I have updated tests section to test and address deploy blockers created on former PR. Please take a look, thank you!

dukenv0307 · 2024-05-30T04:30:42Z

While in scanning state, update tax amount and ensure tax amount are updated in draft transaction accordingly and no API call is being made

@MonilBhavsar This step is failed.

Go to FAB and select Split Expense
Enter large amount with currency VND
Go to confirmation page
Edit tax amount
Observe that users can not delete the amount from right to left, but they can replace it with other one

Screen.Recording.2024-05-30.at.11.27.57.mov

MonilBhavsar · 2024-05-30T05:38:40Z

@dukenv0307 sorry, I am not understanding it. Could you please explain it again. In Video, i see you're only updating taxAmount?

dukenv0307 · 2024-05-30T07:37:35Z

web-resize.mp4

@MonilBhavsar Pls check this video. Nothing happens when I press the delete button.

MonilBhavsar · 2024-05-30T09:16:23Z

This happens on staging too and is specific to currencies like VND where we don't support decimals. I would address that in another issue and PR

trjExpensify · 2024-05-30T13:56:23Z

With that cleared up, @dukenv0307. Can you complete the review?

dukenv0307 · 2024-05-31T02:48:26Z

Ah thank you, I'll finish reviewing in an hour

dukenv0307 · 2024-05-31T03:34:56Z

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-24.at.11.11.22.mov

Android: mWeb Chrome

web-resize.mp4

iOS: Native

web-resize.mp4

iOS: mWeb Safari

web-resize.10.30.52.mp4

MacOS: Chrome / Safari

web-resize.mp4

MacOS: Desktop

web-resize.mp4

dukenv0307 · 2024-05-31T03:46:46Z

src/components/MoneyRequestConfirmationList.tsx

+    }, []);
+
+    useEffect(() => {
+        if (!shouldShowTax || prevTaxAmount !== transaction?.taxAmount || (prevAmount === transaction?.amount && prevCurrency === transaction?.currency)) {


@MonilBhavsar Is this expectation? This is inconsistency with the below flow where the new amount is saved

Create a split scan.

When the receipt is scanning, click on the split preview.

Edit tax amount

Save it

Reload page

Observe the new amount is saved

web-resize.mp4

What do you think should be expected behavior here?
The expense amount is also saved in a similar way, so looks good to me

The expense amount is also saved in a similar way

@MonilBhavsar Sorry, I don't understand your mean. Pls check the video below, the expense amount is saved but tax amount.

web-resize.mp4

I'm not sure, if it's the expectation we can go ahead

Ah okay, I got you're saying now. Looking

@dukenv0307 I have fixed this bug. Hopefully, I didn't break anything in fixing it 🙏

Thanks, I'll re-check again

…Update

dukenv0307 · 2024-06-03T08:42:43Z

overall, it looks good, I just left a minor comment ^

dukenv0307 · 2024-06-04T03:35:11Z

I re-tested and they worked well

melvin-bot · 2024-06-04T03:35:16Z

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

…Update

MonilBhavsar · 2024-06-04T11:28:37Z

Resolved conflicts

dangrous · 2024-06-04T18:30:47Z

I can look today but now there are conflicts - I'll start my review and see how far I get, and can finish up post-conflicts tomorrow!

MonilBhavsar · 2024-06-05T07:21:57Z

Okay thanks! I'll make sure to resolve it before Mountain time, so we don't get it again 😅

dangrous

Okay this looks good to me! I can take another final look (and merge) once conflicts are resolved.

…Update

MonilBhavsar · 2024-06-05T15:31:14Z

@dangrous thanks! Conflicts resolved. Doing a quick test

MonilBhavsar · 2024-06-05T15:45:54Z

tested again and works fine!
In last commit, I moved code around, so it does not show up in difference unnecessarily

dangrous

Looks good! Do we think @dukenv0307 should give it one more set of tests, since there have been some changes since last time, or am I good to merge?

MonilBhavsar · 2024-06-05T18:09:32Z

Okay cool! @dukenv0307 could you please take a final look, please 🙇

trjExpensify · 2024-06-05T18:51:48Z

Were the changes material?

dukenv0307 · 2024-06-06T02:50:20Z

will give the final feedback soon

dukenv0307 · 2024-06-06T04:05:29Z

works well. We're good to merge

MonilBhavsar · 2024-06-06T05:21:44Z

Nice, thanks for checking!

OSBotify · 2024-06-06T05:30:56Z

✋ 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 · 2024-06-11T23:32:46Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

rlinoz · 2024-06-12T12:00:57Z

src/pages/iou/request/step/IOURequestStepAmount.tsx

-        const transactionCurrency = TransactionUtils.getCurrency(transaction);
-        if (newAmount === TransactionUtils.getAmount(transaction) && currency === transactionCurrency) {
+        const transactionCurrency = TransactionUtils.getCurrency(currentTransaction);
+        if (newAmount === TransactionUtils.getAmount(currentTransaction) && currency === transactionCurrency) {


Changing how to get the transaction caused this blocker #43259

Revert "Revert "Handle tax for split requests""

457af02

MonilBhavsar self-assigned this May 29, 2024

MonilBhavsar added 3 commits May 29, 2024 16:36

Fix duplicate tax rates being rendered

c008c45

Use correct transaction and fix allowing tax amount to zero

47b72b7

Use draft transaction for currency

fa8bc7e

MonilBhavsar marked this pull request as ready for review May 29, 2024 12:33

MonilBhavsar requested a review from a team as a code owner May 29, 2024 12:33

melvin-bot bot requested review from dukenv0307 and removed request for a team May 29, 2024 12:33

MonilBhavsar added 2 commits May 29, 2024 18:38

Fix lint

e18c0c1

Pass tax params to start and complete split bill requests

2114fec

dukenv0307 reviewed May 31, 2024

View reviewed changes

Merge branch 'main' into revert-42670-revert-40240-monil-splitBillTax…

812406f

…Update

MonilBhavsar mentioned this pull request May 31, 2024

Set default tax #42126

Closed

50 tasks

MonilBhavsar added 2 commits June 3, 2024 20:32

Reset tax amount on first step and update hook

49cbba5

Update function definition and fix lint and typecheck

029c4dc

dukenv0307 approved these changes Jun 4, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous June 4, 2024 03:35

Merge branch 'main' into revert-42670-revert-40240-monil-splitBillTax…

524a9d0

…Update

dangrous previously approved these changes Jun 5, 2024

View reviewed changes

MonilBhavsar added 2 commits June 5, 2024 20:46

Merge branch 'main' into revert-42670-revert-40240-monil-splitBillTax…

92366d8

…Update

Merge branch 'main' into revert-42670-revert-40240-monil-splitBillTax…

b32543a

…Update

MonilBhavsar dismissed dangrous’s stale review via b32543a June 5, 2024 15:29

Revert some unnecessary changes

62169f6

dangrous approved these changes Jun 5, 2024

View reviewed changes

MonilBhavsar merged commit 0ae7feb into main Jun 6, 2024

MonilBhavsar deleted the revert-42670-revert-40240-monil-splitBillTaxUpdate branch June 6, 2024 05:21

github-actions bot mentioned this pull request Jun 6, 2024

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

lanitochka17 mentioned this pull request Jun 6, 2024

IOU - Mapbox "Refused to load the script" console errors when Clicking on Submit expense #43221

Closed

6 tasks

rlinoz mentioned this pull request Jun 7, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] Split - App closes split details RHP when saving existing amount without editing it #43259

Closed

6 tasks

melvin-bot bot mentioned this pull request Jun 11, 2024

[$250] [HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [Track Tax] Support tax tracking for split requests with workspace #39690

Closed

6 tasks

rlinoz reviewed Jun 12, 2024

View reviewed changes

Conversation

MonilBhavsar commented May 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented May 29, 2024

Uh oh!

MonilBhavsar commented May 29, 2024

Uh oh!

dukenv0307 commented May 30, 2024

Uh oh!

MonilBhavsar commented May 30, 2024

Uh oh!

dukenv0307 commented May 30, 2024

Uh oh!

MonilBhavsar commented May 30, 2024

Uh oh!

trjExpensify commented May 30, 2024

Uh oh!

dukenv0307 commented May 31, 2024

Uh oh!

dukenv0307 commented May 31, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 May 31, 2024 • 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!

MonilBhavsar May 31, 2024 • 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!

dukenv0307 Jun 3, 2024 • 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!

MonilBhavsar Jun 3, 2024

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar Jun 3, 2024

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Jun 4, 2024

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Jun 3, 2024

Uh oh!

dukenv0307 commented Jun 4, 2024

Uh oh!

melvin-bot bot commented Jun 4, 2024

Uh oh!

MonilBhavsar commented Jun 4, 2024

Uh oh!

dangrous commented Jun 4, 2024

Uh oh!

MonilBhavsar commented Jun 5, 2024

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented Jun 5, 2024

Uh oh!

MonilBhavsar commented Jun 5, 2024

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented Jun 5, 2024

Uh oh!

trjExpensify commented Jun 5, 2024

Uh oh!

dukenv0307 commented Jun 6, 2024

Uh oh!

MonilBhavsar commented May 29, 2024 •

edited

Loading

dukenv0307 May 31, 2024 •

edited

Loading

MonilBhavsar May 31, 2024 •

edited

Loading

dukenv0307 Jun 3, 2024 •

edited

Loading