fix: "Default" label changes to "Workspace currency default" after changing tax code #48105

etCoderDysto · 2024-08-27T16:34:21Z

Details

Fixed Issues

$ #48088
PROPOSAL: #48088 (comment)

Tests

Go offline
Go to staging.new.expensify.com
Go to workspace settings > Taxes.
Click on the default tax code.
Click Tax code.
Edit tax code and save it.
Close the RHP

Verify that Default badge is displayed on the default tax rate
Verify that no errors appear in the JS console

Offline tests

Same as test steps

QA Steps

Same as test steps

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

Android: mWeb Chrome

mweb.mp4

iOS: Native

iOS: mWeb Safari

safari.mp4

MacOS: Chrome / Safari

Web.mp4

MacOS: Desktop

desktop.mp4

puneetlath · 2024-08-27T17:16:33Z

@etCoderDysto is this ready for review?

melvin-bot · 2024-08-27T17:21:42Z

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

etCoderDysto · 2024-08-27T17:22:45Z

@etCoderDysto is this ready for review?

@puneetlath I am having a build issue for android and ios. Except that it is ready for review. Should we go on with a review while I am try to fix a build issue I am having?

puneetlath · 2024-08-27T17:26:00Z

Yes, let's go ahead and start that. A lot of people seem to be having those build issues since the upgrade.

etCoderDysto · 2024-08-27T17:29:17Z

Yes, let's go ahead and start that. A lot of people seem to be having those build issues since the upgrade.

Alright! Thanks @puneetlath! @rushatgabhane PR is ready for review to fix this regression.

rushatgabhane · 2024-08-27T17:32:54Z

Same here -

rushatgabhane · 2024-08-27T17:33:05Z

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

Android won't build after latest RN upgrade - https://expensify.slack.com/archives/C01GTK53T8Q/p1724842994690509

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-08-28.at.15.39.13.mov

iOS: mWeb Safari

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

MacOS: Chrome / Safari

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

MacOS: Desktop

rushatgabhane · 2024-08-27T18:33:36Z

src/libs/actions/TaxRate.ts

@@ -514,7 +517,6 @@ function setPolicyTaxCode(policyID: string, oldTaxCode: string, newTaxCode: stri
                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                value: {
                    taxRates: {
-                        defaultExternalID: oldTaxCode === policy?.taxRates?.defaultExternalID ? newTaxCode : policy?.taxRates?.defaultExternalID,


@etCoderDysto why don't we need to set successData?

For offline pattern B, we should set successData - https://github.com/Expensify/App/blob/main/contributingGuides/OFFLINE_UX.md#b---optimistic-with-feedback-pattern

I am checking if removing it causes any issue.

@rushatgabhane When we updated tax code of default tax rate, BE will update the defaultExternalID and foreignTaxDefault with the new tax code we have updated the default tax code, and merges the data to onyx.

Just to make sure I understand, you're saying that setting the successData does cause a problem?

@rushatgabhane I can defaultExternalID and foreignTaxDefault to abide by the docs

Let's do that then.

puneetlath · 2024-08-27T18:50:30Z

@etCoderDysto could you respond to @rushatgabhane's question?

rushatgabhane

BUG: for default rate, the lock button is unlocked and delete button is showed briefly

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

etCoderDysto · 2024-08-27T20:11:53Z

BUG: for default rate, the lock button is unlocked and delete button is showed briefly

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

Checking..

etCoderDysto · 2024-08-27T21:21:56Z

BUG: for default rate, the lock button is unlocked and delete button is showed briefly

Screen.Recording.2024-08-27.at.23.06.42.mov
@rushatgabhane

On the first render, taxID is not updated with the new value but defaultExternalID and foreignTaxDefault are updated with the new value and canEditTaxRate becomes true. Then delete button is displayed

App/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx

Line 41 in b2cd099

const canEditTaxRate = policy && PolicyUtils.canEditTaxRate(policy, taxID);

App/src/libs/PolicyUtils.ts

Lines 462 to 463 in b2cd099

    
           function canEditTaxRate(policy: Policy, taxID: string): boolean { 
        
               return policy.taxRates?.defaultExternalID !== taxID && policy.taxRates?.foreignTaxDefault !== taxID;

On the second render, taxID is updated with the new value and canEditTaxRate becomes false. Then delete button is hidden,
Here currentTaxID gets the updated taxID since getCurrentTaxID returns the newly updated taxID by checking if previousTaxCode matches with the current taxID or the current taxID that is passed to it.
Therefore, we can use currentTaxID to check if user can edit tax rate when editing tax code, and fall back to using taxID when currentTaxID is undefined.

App/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx

Line 38 in b2cd099

const currentTaxID = PolicyUtils.getCurrentTaxID(policy, taxID);

rushatgabhane

LGTM

thanks for the quick fix @etCoderDysto

fix: "Default" label changes to "Workspace currency default" after changing tax code (cherry picked from commit 920edc8) (CP triggered by puneetlath)

OSBotify · 2024-08-28T13:29:24Z

✋ 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-28T13:51:09Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.0.25-11 🚀

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.

Display default badge when edititng tax code offline

1cd29c5

etCoderDysto marked this pull request as ready for review August 27, 2024 17:21

etCoderDysto requested a review from a team as a code owner August 27, 2024 17:21

melvin-bot bot requested review from rushatgabhane and removed request for a team August 27, 2024 17:21

puneetlath self-requested a review August 27, 2024 18:12

rushatgabhane reviewed Aug 27, 2024

View reviewed changes

situchan mentioned this pull request Aug 27, 2024

[HOLD] Revert "RN 0.75 upgrade" #48024

Closed

Add defaultExternalID and foreignTaxDefault to success data

7077e17

This comment was marked as outdated.

Sign in to view

melvin-bot bot requested a review from MariaHCD August 27, 2024 20:04

rushatgabhane suggested changes Aug 27, 2024

View reviewed changes

fix delete button displayed for a moment

20b446e

rushatgabhane approved these changes Aug 28, 2024

View reviewed changes

puneetlath approved these changes Aug 28, 2024

View reviewed changes

puneetlath merged commit 920edc8 into Expensify:main Aug 28, 2024
17 checks passed

OSBotify pushed a commit that referenced this pull request Aug 28, 2024

Merge pull request #48105 from etCoderDysto/default-label

a1ccf61

fix: "Default" label changes to "Workspace currency default" after changing tax code (cherry picked from commit 920edc8) (CP triggered by puneetlath)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Aug 28, 2024

github-actions bot mentioned this pull request Aug 28, 2024

Deploy Checklist: New Expensify 2024-08-26 #48035

Closed

etCoderDysto mentioned this pull request Sep 10, 2024

[$250] Taxes - "Default" label changes to "Workspace currency default" after changing tax code #48088

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: "Default" label changes to "Workspace currency default" after changing tax code #48105

fix: "Default" label changes to "Workspace currency default" after changing tax code #48105

etCoderDysto commented Aug 27, 2024 •

edited

Loading

puneetlath commented Aug 27, 2024

melvin-bot bot commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 •

edited

Loading

puneetlath commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 •

edited

Loading

rushatgabhane commented Aug 27, 2024

rushatgabhane commented Aug 27, 2024 •

edited

Loading

rushatgabhane Aug 27, 2024

rushatgabhane Aug 27, 2024

etCoderDysto Aug 27, 2024

etCoderDysto Aug 27, 2024 •

edited

Loading

puneetlath Aug 27, 2024

etCoderDysto Aug 27, 2024 •

edited

Loading

puneetlath Aug 27, 2024

etCoderDysto Aug 27, 2024

puneetlath commented Aug 27, 2024

This comment was marked as outdated.

rushatgabhane left a comment

etCoderDysto commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

OSBotify commented Aug 28, 2024

OSBotify commented Aug 28, 2024

fix: "Default" label changes to "Workspace currency default" after changing tax code #48105

fix: "Default" label changes to "Workspace currency default" after changing tax code #48105

Conversation

etCoderDysto commented Aug 27, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

puneetlath commented Aug 27, 2024

melvin-bot bot commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 • edited Loading

puneetlath commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 • edited Loading

rushatgabhane commented Aug 27, 2024

rushatgabhane commented Aug 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane Aug 27, 2024

Choose a reason for hiding this comment

rushatgabhane Aug 27, 2024

Choose a reason for hiding this comment

etCoderDysto Aug 27, 2024

Choose a reason for hiding this comment

etCoderDysto Aug 27, 2024 • edited Loading

Choose a reason for hiding this comment

puneetlath Aug 27, 2024

Choose a reason for hiding this comment

etCoderDysto Aug 27, 2024 • edited Loading

Choose a reason for hiding this comment

puneetlath Aug 27, 2024

Choose a reason for hiding this comment

etCoderDysto Aug 27, 2024

Choose a reason for hiding this comment

puneetlath commented Aug 27, 2024

This comment was marked as outdated.

rushatgabhane left a comment

Choose a reason for hiding this comment

etCoderDysto commented Aug 27, 2024

etCoderDysto commented Aug 27, 2024 • edited Loading

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

OSBotify commented Aug 28, 2024

OSBotify commented Aug 28, 2024

etCoderDysto commented Aug 27, 2024 •

edited

Loading

etCoderDysto commented Aug 27, 2024 •

edited

Loading

etCoderDysto commented Aug 27, 2024 •

edited

Loading

rushatgabhane commented Aug 27, 2024 •

edited

Loading

etCoderDysto Aug 27, 2024 •

edited

Loading

etCoderDysto Aug 27, 2024 •

edited

Loading

etCoderDysto commented Aug 27, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading