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 WorkspaceTaxesPage #37870

Merged

Conversation

filip-solecki
Copy link
Contributor

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

Details

Fixed Issues

$ #37787
PROPOSAL:

Tests

  • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
androd.mov
Android: mWeb Chrome
android_chrome.mov
iOS: Native UPDATE: Added header buttons Zrzut ekranu 2024-03-7 o 14 48 22
ios.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari UPDATE: Added header buttons Zrzut ekranu 2024-03-7 o 14 48 35
Nagranie.z.ekranu.2024-03-7.o.14.00.40.mov
MacOS: Desktop
desktop.mov

assets/images/tax.svg Outdated Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
src/languages/es.ts Show resolved Hide resolved
src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
@filip-solecki filip-solecki marked this pull request as ready for review March 8, 2024 09:59
@filip-solecki filip-solecki requested a review from a team as a code owner March 8, 2024 09:59
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team March 8, 2024 09:59
Copy link

melvin-bot bot commented Mar 8, 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]

@filip-solecki
Copy link
Contributor Author

@DylanDylann kind bump

@DylanDylann
Copy link
Contributor

Reviewing today. I am reading the document about this feature

@filip-solecki
Copy link
Contributor Author

Awesome, thanks!

@filip-solecki
Copy link
Contributor Author

@DylanDylann just FYI I think you have to wait until tomorrow. I need to work on enabling Taxes feature (while enabling for the first time default taxes are not creating)

@luacmartins luacmartins self-requested a review March 12, 2024 00:54
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.

Looking good, just a comment about reusing isDisabled and a few NAB

src/components/SelectionList/BaseListItem.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
@filip-solecki
Copy link
Contributor Author

filip-solecki commented Mar 13, 2024

@DylanDylann it this the first time of enabling Taxes? Because there is an issue for BE to create two default tax rates (previously it was done by FE but it is against 1:1:1 rule)

@DylanDylann
Copy link
Contributor

it this the first time of enabling Taxes?

@filip-solecki Yes, it only happens in the first time

@DylanDylann
Copy link
Contributor

@filip-solecki You mean that this bug is from BE side, right?

@filip-solecki
Copy link
Contributor Author

I think so - previously while enabling Taxes (in the Old Dot) we called two api (1 for enabling taxes and second one for creating default tax rates) currently we call only the first one as we follow 1:1:1 rule so there is no other way to create default tax rates than enabling Taxes feature on the Old Dot.

@melvin-bot melvin-bot bot requested a review from luacmartins March 13, 2024 10:53
@DylanDylann
Copy link
Contributor

@luacmartins Everything looks good to me. There is a problem on the native App but @filip-solecki's explanation make sense. Then we can move forward this PR and create another issue to fix it

luacmartins
luacmartins previously approved these changes Mar 13, 2024
@luacmartins
Copy link
Contributor

@filip-solecki looks like we have conflicts now

@kosmydel
Copy link
Contributor

I've resolved conflicts as Filip is AFK.

@luacmartins luacmartins merged commit bd02f3e into Expensify:main Mar 13, 2024
16 checks passed
Copy link

melvin-bot bot commented Mar 13, 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 13, 2024
@luacmartins
Copy link
Contributor

All tests were passing when I merged this PR.

@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.52-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.52-6 🚀

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

onPress={() => {}}
icon={Expensicons.Plus}
text={translate('workspace.taxes.addRate')}
style={[styles.mr3, isSmallScreenWidth && styles.w50]}
Copy link
Contributor

@suneox suneox Oct 27, 2024

Choose a reason for hiding this comment

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

In other places, we’re using mr2 or gap2 between buttons on headers, which is causing this issue.

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