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

[Simplified Collect][Taxes] Tax editing and bulk actions #38208

Merged

Conversation

kosmydel
Copy link
Contributor

@kosmydel kosmydel commented Mar 13, 2024

Details

Fixed Issues

$ #37794
$ #37795
$ #37796
$ #37797

It also fixes:
$ #38499
PROPOSAL: N/A

Tests

  1. Go to Collect Workspace -> Taxes.
  2. Click on tax rate to open the RHP modal.
  3. Try to toggle the tax rate (enable/disable).
  4. Try to change the tax name.
  5. Try to change the tax value.
  6. Validations:
    1. Edit to a duplicated name.
    2. Select an empty name.
    3. Select an empty value.
    4. Select a tax value of more than 100 percent.
    5. Try to change the value to "5.", save, verify the dot is removed.
    6. Try to change the value to "005", save, verify the leading zeros are removed.
  7. Bulk actions:
    1. Select a few taxes and try to delete them.
    2. Select a few taxes and try to enable them.
    3. Select a few taxes and try to disable them.
  8. Verify you cannot delete and disable the default tax.
  9. Failing requests:
    1. Turn on failing requests.
    2. Try to edit something.
    3. Verify the error appears (might take a while, as it retries a few times).
    4. Verify the red brick is shown.
    5. Dismiss the error.

Offline tests

  1. Turn on Offline mode.
  2. Open edit tax rate modal.
  3. Edit each field and verify that after editing, the field has half opacity.
  4. Turn off Offline mode.
  5. Verify the taxes are updated.

QA Steps

Tests from the above

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.mov
Android: mWeb Chrome
mwebandroid.mov
iOS: Native
ios.mp4
iOS: mWeb Safari
mwebios.mp4
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov
****

Copy link

melvin-bot bot commented Mar 13, 2024

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@kosmydel kosmydel changed the title [Simplified Collect][Taxes] Create WorkspaceTaxesPage [Simplified Collect][Taxes] Create WorkspaceEditTaxPage Mar 13, 2024
@mountiny mountiny self-requested a review March 14, 2024 14:40
@DylanDylann
Copy link
Contributor

@kosmydel It seems there are no blockers anymore. Please continue to process this PR

@luacmartins luacmartins self-requested a review March 18, 2024 18:08
@kosmydel
Copy link
Contributor Author

I should be able to prepare this PR for review tomorrow.

@kosmydel kosmydel changed the title [Simplified Collect][Taxes] Create WorkspaceEditTaxPage [Simplified Collect][Taxes] Tax editing and bulk actions Mar 19, 2024
src/ROUTES.ts Outdated Show resolved Hide resolved
@@ -1871,6 +1871,12 @@ export default {
valuePercentageRange: 'Please enter a valid percentage between 0 and 100.',
genericFailureMessage: 'An error occurred while updating the tax rate, please try again.',
},
deleteTaxConfirmation: 'Are you sure you want to delete this tax?',
Copy link
Contributor

Choose a reason for hiding this comment

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

missing es translations?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Asked for translations here.

@melvin-bot melvin-bot bot requested a review from luacmartins March 20, 2024 14:11
@DylanDylann
Copy link
Contributor

@luacmartins LGTM!

@kosmydel
Copy link
Contributor Author

Conflicts resolved, please test it one more time @DylanDylann, thanks!

@DylanDylann
Copy link
Contributor

Look good

@luacmartins luacmartins merged commit bf96b22 into Expensify:main Mar 20, 2024
15 checks passed
@melvin-bot melvin-bot bot added the Emergency label Mar 20, 2024
Copy link

melvin-bot bot commented Mar 20, 2024

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@luacmartins
Copy link
Contributor

Tests were passing
Screenshot 2024-03-20 at 9 17 15 AM

@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

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.56-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀

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

Comment on lines +619 to +622
WORKSPACE_TAX_EDIT: {
route: 'settings/workspaces/:policyID/tax/:taxID',
getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURI(taxID)}` as const,
},
Copy link
Contributor

Choose a reason for hiding this comment

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

We should have used encodeURIComponent instead of encodeURI since taxID is not a uri. Also we should have added a decode step (similar to other logic e.g. tag).

encodeURI does not encode all special chars e.g. / which caused this bug #39614

const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '', taxID)), [policyID, taxID]);

const submit = () => {
renamePolicyTax(policyID, taxID, name);
Copy link
Contributor

@rojiphil rojiphil Jun 13, 2024

Choose a reason for hiding this comment

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

Coming from #42556 , we should disallow renaming the tax name if there is no change. Otherwise, BE would consider that we are updating the tax name with an already existing name and generate an error response (duplicate error) which causes unnecessary confusion to the user.

* Whether the tax rate can be deleted and disabled
*/
function canEditTaxRate(policy: Policy, taxID: string): boolean {
return policy.taxRates?.defaultExternalID !== taxID;
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #46657, here we prevent deleting defaultExternalID but missed to also prevent foreignTaxDefault and it fixed here #46862

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.

9 participants