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

[No QA] Card Assignment Flow #48278

Merged
merged 30 commits into from
Sep 4, 2024

Conversation

koko57
Copy link
Contributor

@koko57 koko57 commented Aug 29, 2024

Details

Fixed Issues

$ #47377
PROPOSAL: -

Tests

PREREQUISITES: Workspace Feed / all betas enabled

  1. Go to Workspaces -> More Features, enable Company Cards
  2. Go to Company cards page
  3. In browser bar type //assign-card, where feed is one of the following: 'cdf' (MasterCard), 'vcf' (Visa), ''gl1025' (American Express)
    to test on desktop: open devtools and type window.location = "https://dev.new.expensify.com:8083/settings/workspaces/[workspaceID]/company-cards/[feed]/assign-card"
    on mobile: (with simulator opened) type in terminal
    npx uri-scheme open new-expensify://settings/workspaces/[workspaceID]/company-cards/[feed]/assign-card --ios or npx uri-scheme open new-expensify://settings/workspaces/[workspaceID]/company-cards/[feed]/assign-card --android
  4. Go through the flow
  5. For Assignee and Card step verify that the error is displayed when you don't select any card
  6. Verify that on Transaction Start Date when selecting Custom start date a menu item is shown and it opens a Date Picker
  7. Verify that all the data is displayed correctly in the Confirmation step
  8. For now after submitting the form you'll be redirected back to company card page and the data for assign flow in Onyx will be cleared
  9. To check Empty state for Card step just type any other string into the URL (from step 3).
  • Verify that no errors appear in the JS console

Offline tests

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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
      • 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(themeColors.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.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
Screen.Recording.2024-09-02.at.18.20.36.mp4
iOS: Native

Simulator Screenshot - iPhone 15 Pro - 2024-09-02 at 18 05 52

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-09-02.at.18.05.26.mp4
iOS: mWeb Safari

https://github.com/user-attachments/assets/de28f015-aa57-45d0-9732-717f6dd3238b
Simulator Screenshot - iPhone 15 Pro - 2024-09-02 at 18 09 36

MacOS: Chrome / Safari
Screen.Recording.2024-08-29.at.17.17.10.mp4
Screenshot 2024-08-29 at 17 18 18
MacOS: Desktop

https://github.com/user-attachments/assets/3383419e-1e4a-4937-8ca9-02b54fdc4826
Screenshot 2024-09-02 at 17 59 26

@koko57 koko57 requested review from a team as code owners August 29, 2024 15:31
@melvin-bot melvin-bot bot requested review from allroundexperts and removed request for a team August 29, 2024 15:31
Copy link

melvin-bot bot commented Aug 29, 2024

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

@shawnborton
Copy link
Contributor

Looking good so far!

It looks like the first step is missing the progress/stepper bar across the top?
CleanShot 2024-08-29 at 12 11 05@2x

@koko57
Copy link
Contributor Author

koko57 commented Aug 30, 2024

@shawnborton good catch! thanks! Fixed now 🙂
Screenshot 2024-08-30 at 09 27 14

@allroundexperts
Copy link
Contributor

Lint failing @koko57

@dylanexpensify
Copy link
Contributor

@allgandalf will review now

Comment on lines +31 to +32
Navigation.goBack();
CompanyCards.clearAssignCardStepAndData();
Copy link
Contributor

Choose a reason for hiding this comment

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

When we click on submit for a second we are navigated back to the member section page

Screen.Recording.2024-09-03.at.7.21.16.PM.mov

@koko57 , IK this is not a block TBH because much of the functionality is yet to be implemented, so when we have the API ready make sure to address this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok then, It'll be better to address it when connecting to the BE. The Onyx data will be cleared after the request is sent and the promise resolved. Thanks for pointing this out

@@ -82,7 +82,7 @@ function ConfirmationStep({policyID, backTo}: ConfirmationStepProps) {
style={styles.pt0}
contentContainerStyle={styles.flexGrow1}
>
<Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.letsDoubleCheck')}</Text>
<Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mt3]}>{translate('workspace.card.issueNewCard.letsDoubleCheck')}</Text>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are we editing ExpensifyCard page here? was there a discussion about it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@allgandalf When I was working on this feature I realised that the spacing is not correct - I checked it also in Expensify Card and it also was wrong, so I decided to fix it here as well. I wonder why we missed this while working on Expensify Card 😅

src/languages/es.ts Outdated Show resolved Hide resolved
src/languages/es.ts Outdated Show resolved Hide resolved
@allgandalf
Copy link
Contributor

allgandalf commented Sep 3, 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
Screen.Recording.2024-09-03.at.7.59.51.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-09-03.at.8.07.22.PM.mov
iOS: Native
Screen.Recording.2024-09-03.at.7.53.31.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-09-03.at.7.58.02.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-09-03.at.7.31.05.PM.mov
MacOS: Desktop
Screen.Recording.2024-09-03.at.7.44.16.PM.mov

@allgandalf
Copy link
Contributor

Bug:

Too much bottom padding for the button in date selector:

Screenshot 2024-09-03 at 7 48 00 PM

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

Functionality wise, this LGTM, Tests well on all platforms, left some comments above, I will approve the PR after those are addressed @koko57

@allgandalf
Copy link
Contributor

@koko57 , this has conflicts :)

@koko57
Copy link
Contributor Author

koko57 commented Sep 4, 2024

@allgandalf thanks! I'll be starting my workday shortly, I'm taking care of this PR first

@koko57
Copy link
Contributor Author

koko57 commented Sep 4, 2024

@allgandalf sorry it's taking so long but the DatePicker is styled strangely and with FormWrapper styles gives a mix that is kinda hard to solve. I will look into the other places that DatePicker is used if the submit button is also displayed this way. The rest of the comments are resolved/answered.

@allgandalf
Copy link
Contributor

Thanks for informing @koko57 , please let me know, if it is so difficult, we can remove the button and go to next page when an user will click on the date? is that possible?

(Also, typecheck if failing, please have a look)

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

This should pass the typecheck

@@ -2792,6 +2793,24 @@ export default {
assignCard: 'Assign card',
cardNumber: 'Card number',
customFeed: 'Custom feed',
assignCard: 'Assign card',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
assignCard: 'Assign card',

@@ -2839,6 +2840,24 @@ export default {
assignCard: 'Asignar tarjeta',
cardNumber: 'Número de la tarjeta',
customFeed: 'Fuente personalizada',
assignCard: 'Asignar tarjeta',
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
assignCard: 'Asignar tarjeta',

@koko57
Copy link
Contributor Author

koko57 commented Sep 4, 2024

@allgandalf I've just pushed a typecheck fix the very moment you commented 😃 For the style problem I've also just found the culprit should be not so complicated to fix this

@koko57
Copy link
Contributor Author

koko57 commented Sep 4, 2024

@allgandalf - requesting rereview

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

Lets get this shipped 🚀

@melvin-bot melvin-bot bot requested a review from yuwenmemon September 4, 2024 14:20
Copy link
Contributor

@yuwenmemon yuwenmemon left a comment

Choose a reason for hiding this comment

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

Nice!

@yuwenmemon yuwenmemon merged commit c885f96 into Expensify:main Sep 4, 2024
16 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Sep 4, 2024

✋ 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

OSBotify commented Sep 5, 2024

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.0.30-0 🚀

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