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] Create WorkspaceTaxesSettingsPage and subpages #38373

Merged

Conversation

filip-solecki
Copy link
Contributor

@filip-solecki filip-solecki commented Mar 15, 2024

Details

This PR covers changes from 4 attached issues and moreover changes in TaxPicker component. While applying this changes I also replace deprecated OptionsSelector usage in this component with SelectionList.

Fixed Issues

$ #37788
$ #37789
$ #37790
$ #37791

PROPOSAL:

Tests

  1. Login to the app
  2. Make sure you have collect workspace added(possible only in Old Dot)
  3. Go to selected Collect Workspace
  4. Turn Taxes feature if it is not in More Features
  5. Go to Taxes page
  6. Click Settings in the top parto of the page
  7. Try to edit each field and test if all works properly
  • Verify that no errors appear in the JS console

Offline tests

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

src/CONST.ts Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx Outdated Show resolved Hide resolved
src/components/TaxPicker.tsx Outdated Show resolved Hide resolved
@filip-solecki filip-solecki marked this pull request as ready for review March 15, 2024 10:27
@filip-solecki filip-solecki requested a review from a team as a code owner March 15, 2024 10:27
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team March 15, 2024 10:27
Copy link

melvin-bot bot commented Mar 15, 2024

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

Copy link
Contributor

@kosmydel kosmydel left a comment

Choose a reason for hiding this comment

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

Some things left for follow-up, but LGTM

@DylanDylann
Copy link
Contributor

we handle 4 issues in this PR 😄

@kosmydel
Copy link
Contributor

we handle 4 issues in this PR 😄

The issues are closely related, we can call it one issue: add tax settings :D

@DylanDylann
Copy link
Contributor

@kosmydel nvm ::>> A busy weekend 😄

@DylanDylann
Copy link
Contributor

I will complete my review before Monday

src/CONST.ts Show resolved Hide resolved
src/components/TaxPicker.tsx Outdated Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks, looking good except the optimistic actions

@luacmartins luacmartins self-requested a review March 15, 2024 20:07
luacmartins
luacmartins previously approved these changes Mar 15, 2024
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

Just the comments about offline pattern B. Otherwise code looks good and tests well. We can also do those as a follow up if you'd prefer that.

src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
src/libs/actions/TaxRate.ts Outdated Show resolved Hide resolved
@DylanDylann
Copy link
Contributor

BUG: The search feature in Tax picker doesn't work

Screen.Recording.2024-03-18.at.01.13.08.mov

@DylanDylann
Copy link
Contributor

@filip-solecki I have reviewed the PR. Please help to resolve comments and merge the latest main. Then I can complete the PR checklist and make a final test on the platforms

Note that: I am available from 8 am to 11:59 pm (GMT +7). Let's collab to merge this PR asap

@filip-solecki
Copy link
Contributor Author

@DylanDylann all comments addressed and bug fixed!

luacmartins
luacmartins previously approved these changes Mar 18, 2024
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM and tests well

@mountiny
Copy link
Contributor

When there is no Tax rate, I dont see anything in the default selector. I think we should add some fun empty state

image

@luacmartins
Copy link
Contributor

luacmartins commented Mar 18, 2024

When there is no Tax rate, I dont see anything in the default selector. I think we should add some fun empty state

@mountiny We should always have 2 default tax states so there should be no empty state for taxes. We're working on that here

@mountiny
Copy link
Contributor

Should they be loaded when the taxes page is open then?

@DylanDylann
Copy link
Contributor

@filip-solecki please fix conflict

@luacmartins
Copy link
Contributor

Should they be loaded when the taxes page is open then?

Yea, that issue that I linked is working on optimistically creating the taxes and we'll also load it in OpenPolicyTaxesPage

@mountiny
Copy link
Contributor

Perfect, thanks for confirming!

@filip-solecki filip-solecki dismissed stale reviews from luacmartins and mountiny via adc0afd March 18, 2024 15:31
luacmartins
luacmartins previously approved these changes Mar 18, 2024
@filip-solecki
Copy link
Contributor Author

working on TS

@luacmartins luacmartins merged commit 7742bec into Expensify:main Mar 18, 2024
16 checks passed
Copy link

melvin-bot bot commented Mar 18, 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.

@melvin-bot melvin-bot bot added the Emergency label Mar 18, 2024
@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.

@luacmartins
Copy link
Contributor

Tests were passing
Screenshot 2024-03-18 at 9 53 11 AM

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.54-4 🚀

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

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.

7 participants