App icon indicating copy to clipboard operation
App copied to clipboard

Policy category - Add Payroll Code

Open rushatgabhane opened this issue 1 year ago • 26 comments

Details

Fixed Issues

$ https://github.com/Expensify/App/issues/44256 PROPOSAL: N.A.

Tests

  1. Go to a control policy
  2. Go to category page
  3. Select any category
  4. Verify that you see Payroll Code menu item
  5. Verify that you can set a Payroll Code in the text input.
  6. Verify that clicking save sets the Payroll Code and navigates you back
  • [x] Verify that no errors appear in the JS console

Offline tests

  1. Go offline and follow the same steps above

QA Steps

Same as tests

  • [x] Verify that no errors appear in the JS console

PR Author Checklist

  • [x] I linked the correct issue in the ### Fixed Issues section above
  • [x] I wrote clear testing steps that cover the changes made in this PR
    • [x] I added steps for local testing in the Tests section
    • [x] I added steps for the expected offline behavior in the Offline steps section
    • [x] I added steps for Staging and/or Production testing in the QA steps section
    • [x] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • [x] 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)
    • [x] 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).
  • [x] I included screenshots or videos for tests on all platforms
  • [x] I ran the tests on all platforms & verified they passed on:
    • [x] Android: Native
    • [x] Android: mWeb Chrome
    • [x] iOS: Native
    • [x] iOS: mWeb Safari
    • [x] MacOS: Chrome / Safari
    • [x] MacOS: Desktop
  • [x] 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)
  • [x] I followed proper code patterns (see Reviewing the code)
    • [x] 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)
    • [x] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • [x] I verified that comments were added to code that is not self explanatory
    • [x] 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.
    • [x] I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • [x] 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:
    • [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • [x] 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)
    • [x] 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.
    • [x] I verified the JSDocs style guidelines (in STYLE.md) were followed
  • [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • [x] I followed the guidelines as stated in the Review Guidelines
  • [x] 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)
  • [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • [x] 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
  • [x] I verified that if a function's arguments changed that all usages have also been updated correctly
  • [x] If any new file was added I verified that:
    • [x] 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
  • [x] If a new CSS style is added I verified that:
    • [x] A similar style doesn't already exist
    • [x] The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • [x] 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.
  • [x] 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)
  • [x] 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.
  • [x] 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.
  • [x] 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:
    • [x] I verified that all the inputs inside a form are aligned with each other.
    • [x] I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • [x] 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.
  • [x] 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 image
Android: mWeb Chrome

i tried. my android sim just doesn't work for mweb

iOS: Native image
iOS: mWeb Safari image image image
MacOS: Chrome / Safari

https://github.com/Expensify/App/assets/29673073/a1060178-5f16-4fc0-99ca-07fc07bfb47b

Offline

image
MacOS: Desktop image

rushatgabhane avatar Jun 06 '24 00:06 rushatgabhane

@hoangzinh 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[bot] avatar Jun 06 '24 00:06 melvin-bot[bot]

I pre-reviewed a related PR, you know we need to write a lot of this in the detailed doc & get it approved first, right @rushatgabhane ? 🙏

Beamanator avatar Jun 06 '24 11:06 Beamanator

yes got to know earlier this morning, let me convert this to a draft

rushatgabhane avatar Jun 06 '24 13:06 rushatgabhane

@hoangzinh please give it one pass while the backend gets deployed

rushatgabhane avatar Jun 26 '24 13:06 rushatgabhane

Backend is merged. @hoangzinh this is ready for a re-review. We're hoping to merge this on Mondayy : )

rushatgabhane avatar Jul 06 '24 17:07 rushatgabhane

cc @Beamanator

rushatgabhane avatar Jul 06 '24 17:07 rushatgabhane

Reviewer Checklist

  • [x] I have verified the author checklist is complete (all boxes are checked off).
  • [x] I verified the correct issue is linked in the ### Fixed Issues section above
  • [x] I verified testing steps are clear and they cover the changes made in this PR
    • [x] I verified the steps for local testing are in the Tests section
    • [x] I verified the steps for Staging and/or Production testing are in the QA steps section
    • [x] 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)
    • [x] 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)
  • [x] I checked that screenshots or videos are included for tests on all platforms
  • [x] I included screenshots or videos for tests on all platforms
  • [x] I verified tests pass on all platforms & I tested again on:
    • [x] Android: Native
    • [x] Android: mWeb Chrome
    • [x] iOS: Native
    • [x] iOS: mWeb Safari
    • [x] MacOS: Chrome / Safari
    • [x] MacOS: Desktop
  • [x] 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
  • [x] I verified proper code patterns were followed (see Reviewing the code)
    • [x] 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).
    • [x] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • [x] I verified that comments were added to code that is not self explanatory
    • [x] 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.
    • [x] I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • [x] 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)
    • [x] 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.
    • [x] I verified the JSDocs style guidelines (in STYLE.md) were followed
  • [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • [x] I verified that this PR follows the guidelines as stated in the Review Guidelines
  • [x] 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)
  • [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • [x] 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
  • [x] If a new component is created I verified that:
    • [x] A similar component doesn't exist in the codebase
    • [x] All props are defined accurately and each prop has a /** comment above it */
    • [x] The file is named correctly
    • [x] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • [x] The only data being stored in the state is data necessary for rendering and nothing else
    • [x] 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)
    • [x] 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)
    • [x] All JSX used for rendering exists in the render method
    • [x] 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
  • [x] If any new file was added I verified that:
    • [x] 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
  • [x] If a new CSS style is added I verified that:
    • [x] A similar style doesn't already exist
    • [x] The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • [x] 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.
  • [x] 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)
  • [x] 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.
  • [x] 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.
  • [x] 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:
    • [x] I verified that all the inputs inside a form are aligned with each other.
    • [x] I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • [x] 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.
  • [x] 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.
  • [x] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

https://github.com/Expensify/App/assets/9639873/ddb3c9d6-bb3e-4652-b0d2-7963ad016f46

Android: mWeb Chrome

https://github.com/Expensify/App/assets/9639873/8a56e914-a574-4cff-98fd-740493539ac6

iOS: Native

https://github.com/Expensify/App/assets/9639873/8f5b38db-0389-4449-994b-25e6879549bf

iOS: mWeb Safari

https://github.com/Expensify/App/assets/9639873/7e88de87-31ce-491e-aecc-0286e64429aa

MacOS: Chrome / Safari

https://github.com/Expensify/App/assets/9639873/0361fac5-d7f9-46fe-8c25-8f4dabcf24ec

MacOS: Desktop

https://github.com/Expensify/App/assets/9639873/99e85829-8d6b-4132-9e58-94b89384732d

hoangzinh avatar Jul 08 '24 10:07 hoangzinh

hi @rushatgabhane, I'm going to test this PR but could you please solve the merge conflict in meantime?

hoangzinh avatar Jul 08 '24 16:07 hoangzinh

Please also add recordings/screenshots for mweb Android. Thank you.

hoangzinh avatar Jul 08 '24 16:07 hoangzinh

401 Policy is not a Control policy

I got this error when tried to update payroll code on a collect policy

https://github.com/Expensify/App/assets/9639873/26c26654-103a-4747-9692-822cb798eed6

hoangzinh avatar Jul 08 '24 17:07 hoangzinh

401 Policy is not a Control policy

I got this error when tried to update payroll code on a collect policy

Screen.Recording.2024-07-09.at.00.06.49.mov

Correct. These features are only for Control policies. We'll redirect them to the upgrade flow when it is done. Maybe we should disable them for now, though. @rushatgabhane, do you recall where we landed on that discussion?

Gonals avatar Jul 08 '24 21:07 Gonals

or hide it if WS not a control policy

hoangzinh avatar Jul 09 '24 02:07 hoangzinh

Correct. These features are only for Control policies. We'll redirect them to the upgrade flow when it is done. Maybe we should disable them for now, though. @rushatgabhane, do you recall where we landed on that discussion

@Gonals yes we had decided to disable it for now. And redirect to upgrade flow whenver it is completed

rushatgabhane avatar Jul 09 '24 12:07 rushatgabhane

@hoangzinh nice catch!

rushatgabhane avatar Jul 09 '24 12:07 rushatgabhane

@hoangzinh all yours! Heads up we have a deadline in next days and have to deploy too

rushatgabhane avatar Jul 09 '24 12:07 rushatgabhane

@rushatgabhane I thought we would disable updating payroll code, but I can click on it and then it shows "Hmm... it's not here" page

https://github.com/Expensify/App/assets/9639873/d07394ac-f3cd-4e93-b798-6fa1e83f7f0f

hoangzinh avatar Jul 09 '24 22:07 hoangzinh

@hoangzinh that is because im using AccessOrNotFound component. Do you have an alternative suggestion on what we should do?

rushatgabhane avatar Jul 09 '24 22:07 rushatgabhane

Bug 1: BE and FE have inconsistency about key "payrollCode"

FE: "payrollCode" BE: "Payroll Code"

Screenshot 2024-07-10 at 05 40 48

hoangzinh avatar Jul 09 '24 22:07 hoangzinh

Bug 2: The Payroll code is cleared when revisiting after updating

https://github.com/Expensify/App/assets/9639873/0c248f0e-e621-4331-aa58-b67ba3ffbd1a

hoangzinh avatar Jul 09 '24 22:07 hoangzinh

@hoangzinh that is because im using AccessOrNotFound component. Do you have an alternative suggestion on what we should do?

I think we can pass disabled prop if it's not a control policy here, what do you think? (or hide the menu item completely) https://github.com/Expensify/App/blob/e2ac2e0c1e52f5df7b16c77cf7c0f230b8c06889/src/pages/workspace/categories/CategorySettingsPage.tsx#L138-L143

hoangzinh avatar Jul 09 '24 22:07 hoangzinh

@hoangzinh all resolved

rushatgabhane avatar Jul 10 '24 11:07 rushatgabhane

@rushatgabhane 🔔 the lint is failed

hoangzinh avatar Jul 10 '24 15:07 hoangzinh

@rushatgabhane please also update the testing steps. It should be control policy

hoangzinh avatar Jul 10 '24 15:07 hoangzinh

Lots of conflicts! 😬

Gonals avatar Jul 11 '24 19:07 Gonals

@Gonals fixed the merge conflicts 😓 We should be good now

rushatgabhane avatar Jul 11 '24 20:07 rushatgabhane

@hoangzinh all yours!

rushatgabhane avatar Jul 11 '24 20:07 rushatgabhane

@hoangzinh Can you complete the checklist?

Gonals avatar Jul 12 '24 14:07 Gonals

:hand: 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 avatar Jul 12 '24 14:07 OSBotify

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.7-3 🚀

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

OSBotify avatar Jul 15 '24 21:07 OSBotify

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify avatar Jul 15 '24 22:07 OSBotify