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

#45949 & #45950 Divide workflows page into three sections & Update payment section with bank icon #46020

Merged

Conversation

Guccio163
Copy link
Contributor

@Guccio163 Guccio163 commented Jul 23, 2024

Details

Fixed Issues

$ #45949
$ #45950
PROPOSAL:

Tests

Open workflows page (turn it on in 'more features' page).

Sections should look like this now:
Screenshot 2024-07-26 at 13 24 15

Verify that each section and its children are clickable

Verify that each section looks correct (with or without a connected bank account):
Delay submissions:
Screenshot 2024-07-26 at 13 20 30
Add approvals:
Screenshot 2024-07-26 at 13 22 45
Payments (with added account):
Screenshot 2024-07-26 at 13 22 58
Payments (without added account):
Screenshot 2024-07-26 at 13 23 30

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

N/A

  • 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
Screen.Recording.2024-07-26.at.18.02.54.mov
Android: mWeb Chrome
Screen.Recording.2024-07-26.at.16.35.14.mov
iOS: Native
Screen.Recording.2024-07-26.at.15.21.59.mov
iOS: mWeb Safari
Screen.Recording.2024-07-26.at.18.08.01.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-26.at.14.01.02.mov
Screen.Recording.2024-07-26.at.14.01.24.mov
MacOS: Desktop
Screen.Recording.2024-07-26.at.18.09.49.mov

->

Copy link
Contributor

@blazejkustra blazejkustra left a comment

Choose a reason for hiding this comment

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

Code looks clean, no remarks from my side 😄 Great work!

  • Let's resolve the conflicts first before recording videos
  • Could you update the title to the same title as in the issue?
  • Add some test steps so that C+ and QA team can test the changes (it should be rather straight forward)

This issue is clearly UI-based, after visiting https://dev.new.expensify.com:8082/settings/workspaces/:policyID/workflows it should look like in the docs.

It's better not to link the page (dev version is linked and QA can't access it). Also QAs don't have access to the doc I suppose. Usually I treat this section as a step guide how to test your changes:

  • Open workflows page (turn it on in 'more features' page).

  • Sections should look like this now:
    image

  • Verify that each section is clickable

  • Verify that each section looks correct (with or without a connected bank account):
    image
    image
    image

@Guccio163 Guccio163 changed the title #45949 Divide workflows #45949 & #45950 Divide workflows page into three sections & Update payment section with bank icon Jul 26, 2024
@Guccio163
Copy link
Contributor Author

Guccio163 commented Jul 26, 2024

This PR is ready for review, I am aware that there is still need to:

  • change some texts that are currently confirmed by Spanish contributors
    - resolve esLint error with using empty Fragment in code
    I will address these issues in the next commit. Also, please take a quick look @shawnborton if the UI is OK 👍

@Guccio163 Guccio163 marked this pull request as ready for review July 26, 2024 16:19
@Guccio163 Guccio163 requested a review from a team as a code owner July 26, 2024 16:19
@melvin-bot melvin-bot bot requested review from jayeshmangwani and removed request for a team July 26, 2024 16:19
Copy link

melvin-bot bot commented Jul 26, 2024

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

@blazejkustra
Copy link
Contributor

@jayeshmangwani Don't worry about pod diff, Wiktor is going to remove it on Monday, cheers!

@jayeshmangwani
Copy link
Contributor

Wiktor is going to remove it on Monday, cheers!

Thanks for the heads up! Enjoy the weekend 😃 !

@Guccio163
Copy link
Contributor Author

I had a moment to take a look at it, just fixed lint check and pods, enjoy your weekend too ✌️

@shawnborton
Copy link
Contributor

Can you make sure the top part matches other cards in the workspace editor from a font size perspective?
CleanShot 2024-07-29 at 08 54 52@2x

It looks like the text below the title is too small. Let's also make sure we're using the same gap between, etc.

Copy link
Contributor

@Guccio163
Copy link
Contributor Author

I adjusted fonts and gaps to better map those in doc, descriptions in Payments vary a little in font's size, but I consulted with @shawnborton to leave them at 13px to match the same component in app. Current view should look like this:
Screenshot 2024-07-29 at 17 30 59

I'm still waiting for Spanish translations, but everything else is ready for review @jayeshmangwani ;)

@shawnborton
Copy link
Contributor

Looking good to me!

@jayeshmangwani
Copy link
Contributor

There's an issue with the toggle functionality, it's flickering. Initially, the delay submission is enabled.

Sequence of actions:

  1. Toggle disabled
  2. Toggle enabled

The output shows the toggle switch flickering between states:

  1. Disabled
  2. Enabled
  3. Disabled
  4. Enabled
toggle-delay.mov

@jayeshmangwani
Copy link
Contributor

There's an issue with the toggle functionality, it's flickering.

I've checked with staging, and it seems this issue is occurring there as well.
It's not coming from this PR, but I will report it, and we will need to handle it in a separate issue.

@Guccio163
Copy link
Contributor Author

That's true, it occurred like that to me too, I think I even caught it in one of my recordings; I guess it is due to work over this section on backend, because there is also a problem with displaying card after switching off one time in Payments:

Screenshot 2024-07-30 at 09 57 49
Screen.Recording.2024-07-30.at.10.01.56.mov

If it suits you, you can report it with the flickering too :)

@jayeshmangwani
Copy link
Contributor

If it suits you, you can report it with the flickering too :)

Yes sure 👍

@jayeshmangwani
Copy link
Contributor

@Guccio163 @blazejkustra In this PR, there is no "Add Approval Workflow" button in the Add Approvals section, and the UI for the Expense form and Approvals is different. Before approving the PR, I just wanted to make sure whether we are going to handle this in another PR or if we need to handle it in this PR.

UI in the Design Doc Screenshot 2024-07-30 at 2 47 52 PM
UI in this PR Screenshot 2024-07-30 at 2 48 51 PM

@Guccio163
Copy link
Contributor Author

Guccio163 commented Jul 30, 2024

@jayeshmangwani We are going to handle it in this issue (I'm working over it right now), this PR is just for splitting the sections, without Approvals or connected sidebars/forms

@jayeshmangwani
Copy link
Contributor

jayeshmangwani commented Jul 30, 2024

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.

Screenshots/Videos

Android: Native
Android.mov
Android: mWeb Chrome
mWeb-chrome.mov
iOS: Native
iOS.mov
iOS: mWeb Safari
mweb-safari.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@jayeshmangwani
Copy link
Contributor

The changes look good, and I assume that we are going to change the makeOrTrackPaymentsTitle in another PR.

makeOrTrackPaymentsTitle: 'Payments',

@Guccio163
Copy link
Contributor Author

I'm currently waiting for this and 4 other translations, I'd like to change it in this PR :)

@jayeshmangwani
Copy link
Contributor

Great, let's wait for the translations; otherwise, it looks good.

@Guccio163
Copy link
Contributor Author

Super, I'll let you know when the translations will be ready 👍

@Guccio163
Copy link
Contributor Author

@jayeshmangwani I added translations, they are all approved so it's ready for merge 👌

Copy link
Contributor

@jayeshmangwani jayeshmangwani left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

@melvin-bot melvin-bot bot requested a review from tgolen July 30, 2024 14:07
@tgolen tgolen merged commit a2091d7 into Expensify:main Jul 30, 2024
15 of 16 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/tgolen in version: 9.0.15-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Aug 2, 2024

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants