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

fix: Taxes - Edited tax is not grayed out in Tax list in submit manual flow. #42974

Merged
merged 4 commits into from
Jun 12, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Jun 2, 2024

Details

Fixed Issues

$ #42918
PROPOSAL:

Tests

  1. Go to workspace settings.
  2. Go to Taxes (Must have 4 taxes)
  3. Go Offline
  4. On taxes page edit enable > disable > enable tax 1
  5. Change the name of tax 2
  6. Change the value of tax 3
  7. Delete tax 4
  8. Add a tax
  9. Go to + > Submit expense > Manual.
  10. Select the workspace
  11. Open tax picker
  12. Verify edited tax are greyed out and deleted tax has strikethrough style and it can't be selected.
  • Verify that no errors appear in the JS console

Offline tests

  1. Go to workspace settings.
  2. Go to Taxes (Must have 4 taxes)
  3. Go Offline
  4. On taxes page edit enable > disable > enable tax 1
  5. Change the name of tax 2
  6. Change the value of tax 3
  7. Delete tax 4
  8. Add a tax
  9. Go to + > Submit expense > Manual.
  10. Select the workspace
  11. Open tax picker
  12. Verify edited tax are greyed out and deleted tax has strikethrough style and it can't be selected.

QA Steps

  1. Go to workspace settings.
  2. Go to Taxes (Must have 4 taxes)
  3. Go Offline
  4. On taxes page edit enable > disable > enable tax 1
  5. Change the name of tax 2
  6. Change the value of tax 3
  7. Delete tax 4
  8. Add a tax
  9. Go to + > Submit expense > Manual.
  10. Select the workspace
  11. Open tax picker
  12. Verify edited tax are greyed out and deleted tax has strikethrough style and it can't be selected.
  • 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_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

…l flow.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested a review from a team as a code owner June 2, 2024 21:54
@melvin-bot melvin-bot bot removed the request for review from a team June 2, 2024 21:54
Copy link

melvin-bot bot commented Jun 2, 2024

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

@melvin-bot melvin-bot bot requested a review from ishpaul777 June 2, 2024 21:54
@Krishna2323
Copy link
Contributor Author

cc: @sobitneupane

@MonilBhavsar MonilBhavsar requested review from sobitneupane and removed request for ishpaul777 June 3, 2024 06:07
@MonilBhavsar
Copy link
Contributor

Requesting review from @sobitneupane as it is a regression from #42620

@Krishna2323
Copy link
Contributor Author

I'm unable to record videos for Android Chrome/native and iOS native. I've been trying since last night, but the build crashes for iOS, and the same happens for Android native. Added the recordings for Desktop, Web Chrome and IOS safari. Pls let me know if you have any idea about the build failures 🙏🏻.

@Krishna2323
Copy link
Contributor Author

@sobitneupane, recordings for all platforms has been added.

@sobitneupane
Copy link
Contributor

sobitneupane commented Jun 6, 2024

Verify edited Category, Tag and Tax are not greyed out in the list.

I don't believe that it is the expected output?

According to issue description, expected result is

All the edited items in Category, Tag and Tax list will be grayed out.

@Krishna2323 Can you please updated accordingly?

@Krishna2323
Copy link
Contributor Author

@sobitneupane, we shouldn't apply disabled styles until an option is deleted, in the offending PR we wanted to disable the deleted option only. The offline updated option should remain as it is.

@MonilBhavsar, can you help clarifying this? Thanks.

@sobitneupane
Copy link
Contributor

sobitneupane commented Jun 6, 2024

@Krishna2323 We should not disable the option. The disabled option will have strikethrough. But any item with the pending action should be grayed out.

But it was not the case even for Category and Tags before your PR. So, let's wait for confirmation from @MonilBhavsar.

If we want the edited items to be grayed out, should we also have it grayed out after it is selected?
Screenshot 2024-06-06 at 14 20 15
Screenshot 2024-06-06 at 14 18 11

Should we also gray out the list item containing the edited item in confirmation page?
Screenshot 2024-06-06 at 14 18 56

@MonilBhavsar
Copy link
Contributor

The offline updated option should remain as it is.

Yes, but it should be greyed out like other lists - tags, categories, distance rates

@Krishna2323
Copy link
Contributor Author

@MonilBhavsar, this is the new behaviour we expect, right?

web_chrome.mp4

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

@MonilBhavsar Can you please verify the screen recordings.

Screenshots/Videos

Android: Native
Screen.Recording.2024-06-11.at.15.01.38.mov
iOS: Native
Screen.Recording.2024-06-11.at.14.56.11.mov
iOS: mWeb Safari
Screen.Recording.2024-06-11.at.14.49.44.mov
MacOS: Chrome / Safari
Untitled.mov

Copy link
Contributor

@sobitneupane sobitneupane left a comment

Choose a reason for hiding this comment

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

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.

@melvin-bot melvin-bot bot requested a review from iwiznia June 11, 2024 09:33
@MonilBhavsar MonilBhavsar self-requested a review June 11, 2024 09:47
@MonilBhavsar
Copy link
Contributor

The screenshot videos looks good to me. Though I would like to test it once. I am currently looking at the blockers, so requested a self review and will be back here soon

@MonilBhavsar
Copy link
Contributor

Looks fine, thanks!
Screenshot 2024-06-12 at 10 57 28 PM

@MonilBhavsar MonilBhavsar merged commit 9376991 into Expensify:main Jun 12, 2024
18 of 19 checks passed
@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.

@sobitneupane
Copy link
Contributor

@Krishna2323 Can you please retest the bug in Android and IOS. It was working fine when I tested it here in Android/IOS.

@Krishna2323
Copy link
Contributor Author

@sobitneupane, it works fine on native devices. @kavimuru can you pls check again?

tax_offline_issue.mp4

@kavimuru
Copy link

Checking with the QA team

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.83-3 🚀

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.

6 participants