fix: maintain tax assign when tax code changes by daledah · Pull Request #47327 · Expensify/App

daledah · 2024-08-13T14:02:28Z

Details

Fixed Issues

$ #45861
PROPOSAL: #45861 (comment)

Tests

Click a distance rate > Tax rate > Assign tax rate
Go to taxes
Click on the tax assigned in step 1 > Tax code > Edit tax code and save it
Go back to distance rate
Click on assigned distance rate
Verify that: the tax rate is still assigned

Verify that no errors appear in the JS console

Offline tests

QA Steps

Click a distance rate > Tax rate > Assign tax rate
Go to taxes
Click on the tax assigned in step 1 > Tax code > Edit tax code and save it
Go back to distance rate
Click on assigned distance rate
Verify that: the tax rate is still assigned

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-13.at.23.27.14.mov

Android: mWeb Chrome

Screen.Recording.2024-08-13.at.23.19.07.mov

iOS: Native

Screen.Recording.2024-08-13.at.23.50.25.mov

iOS: mWeb Safari

Screen.Recording.2024-08-13.at.23.47.52.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-13.at.20.28.04.mov

MacOS: Desktop

Screen.Recording.2024-08-13.at.23.56.25.mov

melvin-bot · 2024-08-15T03:11:43Z

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

rushatgabhane · 2024-08-27T13:46:02Z

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-08-27.at.17.56.12.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-08-27.at.17.53.13.mov

iOS: mWeb Safari

Screen.Recording.2024-08-27.at.17.54.14.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-27.at.17.51.42.mov

MacOS: Desktop

dangrous · 2024-08-27T16:25:21Z

+    const customUnits = Object.values(policy?.customUnits ?? {});
+    const optimisticCustomUnit = {
+        customUnits: {
+            ...customUnits.reduce((units, customUnit) => {


Maybe I'm misunderstanding but wouldn't this be better as a map instead of a reduce? Same with the rates.reduce below

As far as I know, we can't add properties to an object using map, so I need to use reduce here.

customUnits is an array though right? Could do something here like

customUnits: customUnits.map((customUnit) => { let newUnit = customUnit; // modify rates return newUnit })

Seems a little cleaner? And could use a forEach for the rates object?

what do you think @rushatgabhane

agree with ^

But since customUnits in optimistic data is of type Record<string, any>, after this we will have to either do an Array.reduce or Object.assign to the updated customUnits anyway.

oh yeah, fair. Okay then I think this works for me! Thank you for the explanation, that was helpful!

dangrous · 2024-08-28T15:52:01Z

+                            if (customUnit.rates[rateID].attributes?.taxRateExternalID === oldTaxCode) {
+                                // eslint-disable-next-line no-param-reassign
+                                rates[rateID] = {
+                                    attributes: {


also do we need to spread the old rate here? to make sure we don't remove everything but attributes?

This is a merge call, so I think we don't need to include everything inside.

OSBotify · 2024-08-29T16:22:59Z

✋ 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-08-30T18:49:06Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.0.27-0 🚀

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

OSBotify · 2024-09-02T23:26:48Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.27-1 🚀

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

daledah added 3 commits August 13, 2024 20:58

fix: maintain tax assign when tax code changes

30c56d1

refactor: simplify optimistic and failture data

2aef27d

refactor: simplify failureCustomUnits

d43e7a8

daledah marked this pull request as ready for review August 15, 2024 03:11

daledah requested a review from a team as a code owner August 15, 2024 03:11

melvin-bot Bot requested review from rushatgabhane and removed request for a team August 15, 2024 03:11

daledah mentioned this pull request Aug 15, 2024

[HOLD for payment 2024-09-09][$250] Track tax - Tax rate is no longer assigned to the distance rate after changing the tax code #45861

Closed

6 tasks

rushatgabhane approved these changes Aug 27, 2024

View reviewed changes

melvin-bot Bot requested a review from dangrous August 27, 2024 14:53

dangrous reviewed Aug 27, 2024

View reviewed changes

Merge branch 'main' into fix/45861

569e76a

dangrous reviewed Aug 28, 2024

View reviewed changes

dangrous approved these changes Aug 29, 2024

View reviewed changes

dangrous merged commit c867918 into Expensify:main Aug 29, 2024

github-actions Bot mentioned this pull request Aug 30, 2024

Deploy Checklist: New Expensify 2024-08-30 #48360

Closed

45 tasks

Conversation

daledah commented Aug 13, 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 Aug 15, 2024

Uh oh!

rushatgabhane commented Aug 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 29, 2024

Uh oh!

OSBotify commented Aug 30, 2024

Uh oh!

OSBotify commented Sep 2, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

daledah commented Aug 13, 2024 •

edited

Loading

rushatgabhane commented Aug 27, 2024 •

edited

Loading