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

Business Info Page #30924

Merged

Conversation

Swor71
Copy link
Contributor

@Swor71 Swor71 commented Nov 6, 2023

This PR adds Business Info Page sub step

Details

Fixed Issues

$ #30418
PROPOSAL:

Tests

  1. log in to the app, press on the avatar, go to workspaces and open one
  2. press on bank account and select connect manually
  3. type in your details and press confirm
  4. go through the flow and confirm the data is visible on the confirmation page
  5. to save all of it press confirm

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 && .
    • 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(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 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.2023-11-08.at.15.56.06.mp4
Android: mWeb Chrome
andr.web.mp4
iOS: Native
ios.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop

Copy link

melvin-bot bot commented Nov 6, 2023

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

src/components/Form/FormWrapper.js Outdated Show resolved Hide resolved
const [selectedDate, setSelectedDate] = useState(value || defaultValue || undefined);

useEffect(() => {
// Value is provided to input via props and onChange never fires. We have to save draft manually.
if (shouldSaveDraft && formID !== '') {
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need a shouldSaveDraft prop? Looks like for this action we need only formID. When we pass shouldSaveDraft but without formID this action still doesn't work. So looks like shouldSaveDraft is not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't remember exactly as @MrMuzyk made this change in his PR, however I believe this is to keep the inputs and shouldSaveDraft the same.

Copy link
Contributor

Choose a reason for hiding this comment

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

Its true that shouldSaveDraft is not needed. I think it would make sense to cut it and rename formID to formIDToSaveDraft so it is clear what will happen once we pass it

@shubham1206agra
Copy link
Contributor

Can you fix accessibility props too? Otherwise, it will also throw a warning in the console.

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

Can you fix accessibility props too? Otherwise, it will also throw a warning in the console.

applying your suggestions makes the eslint scream as you can see in the sceenshot not to mention that eslint automatically adds that accessibilityLabel prop

Also, the GH Lint workflow passes without those label changes so it should be good. Console warnings are not really a blocker.

image

@shubham1206agra
Copy link
Contributor

shubham1206agra commented Nov 14, 2023

Have you done npm i here?
Since there is a patch which should have fixed this.

@shubham1206agra shubham1206agra mentioned this pull request Nov 14, 2023
47 tasks
@shubham1206agra
Copy link
Contributor

shubham1206agra commented Nov 14, 2023

Screenshot 2023-11-14 at 4 52 01 PM

Future dates should be blocked from being selected here. I think you need to set a date in the date picker

@shubham1206agra
Copy link
Contributor

Screenshot 2023-11-14 at 5 01 55 PM

After clicking next on the confirmation page, it goes straight to this. Can you tell me whether this will be fixed by you or another PR will take care of this?

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

Screenshot 2023-11-14 at 5 01 55 PM After clicking next on the confirmation page, it goes straight to this. Can you tell me whether this will be fixed by you or another PR will take care of this?

as mentioned in another comment, for now as we don't have the parent component to manage all of those steps, we plug those in place of the current flow but this will change once we get around to that. For now it was blocked by migration of ReimbursementAccountPage to fn component

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

@shubham1206agra fixed padding issues on state selector and full name on confirmation page as well as the a11y props you asked for, is there anything else you found?

image

@shawnborton
Copy link
Contributor

On this screen here:
image

Why is the Legal name value in such a smaller font compared to the others?

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

On this screen here: image

Why is the Legal name value in such a smaller font compared to the others?

that is from the Personal Info flow, not Business Info which is this PR's focus. I will check the label issue tho

@shubham1206agra
Copy link
Contributor

On this screen here: image

Why is the Legal name value in such a smaller font compared to the others?

Since the legal name is '', it looks like the font is smaller here.
I don't think so we will get this in final flow anyway.

@shawnborton
Copy link
Contributor

Ah okay. Can we confirm by testing with an actual name and without any name at all?

@shubham1206agra
Copy link
Contributor

Screenshot 2023-11-14 at 7 00 48 PM

@shawnborton It should look like this since component is reused

@shawnborton
Copy link
Contributor

Cool, thanks for confirming!

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

Ah okay. Can we confirm by testing with an actual name and without any name at all?

in the actual flow the user won't be able to leave this field empty, so this situation is not going to happen

@shubham1206agra
Copy link
Contributor

shubham1206agra commented Nov 14, 2023

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 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 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(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 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.2023-11-14.at.8.10.38.PM.mov
Android: mWeb Chrome
Screen.Recording.2023-11-14.at.7.15.13.PM.mov
iOS: Native
Screen.Recording.2023-11-14.at.7.31.27.PM.mov
iOS: mWeb Safari
Screen.Recording.2023-11-14.at.4.59.13.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2023-11-13.at.9.41.37.PM.mov
MacOS: Desktop
Screen.Recording.2023-11-14.at.7.21.44.PM.mov

@shubham1206agra
Copy link
Contributor

@Swor71 Can you quickly put test steps in the correct format?

@melvin-bot melvin-bot bot requested a review from mountiny November 14, 2023 14:47
@shubham1206agra
Copy link
Contributor

@mountiny Can you just confirm this placeholder #30924 (comment)?

@Swor71
Copy link
Contributor Author

Swor71 commented Nov 14, 2023

@Swor71 Can you quickly put test steps in the correct format?

not sure if I understand, what is the problem with the format of test steps?

@shubham1206agra
Copy link
Contributor

shubham1206agra commented Nov 14, 2023

@Swor71 Can you quickly put test steps in the correct format?

not sure if I understand, what is the problem with the format of test steps?

I think not as a checklist I mean
Ordered list

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

One comment

INPUT_KEY: {
COMPANY_NAME: 'companyName',
COMPANY_TAX_ID: 'companyTaxID',
COMPANY_WEBSITE: 'website',
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this not companyWebsite?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see that has been used before, can we fix it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mountiny hm where did you find companyWebsite as the key? I've moved what was there in the CompanyStep component to the new components and their respective keys:

https://github.com/Expensify/App/pull/30924/files#diff-40ada854d0b6039d4db7da6cede12f7be0cf7d113cc16c8cbc638af4bd0121d4L81

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Discussed we can do that later

@mountiny mountiny merged commit 0bb725a into Expensify:vit-tieredBankAccountFlow Nov 14, 2023
22 checks passed
Comment on lines +89 to +94
const payload = {
bankAccountID: getDefaultStateForField({reimbursementAccount, fieldName: 'bankAccountID', defaultValue: 0}),
...values,
...getBankAccountFields(['routingNumber', 'accountNumber', 'bankName', 'plaidAccountID', 'plaidAccessToken', 'isSavings']),
companyTaxID: values.companyTaxID.replace(CONST.REGEX.NON_NUMERIC, ''),
companyPhone: parsePhoneNumber(values.companyPhone, {regionCode: CONST.COUNTRY.US}).number.significant,
Copy link
Contributor

Choose a reason for hiding this comment

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

{BZ Checklist} this might have caused #50103,

RC:

  • When navigating back to the company tax page, clicking the "Next" button again triggers UpdateCompanyInformationForBankAccount with the website data as "https://", which is an invalid value. As a result, the backend returns an Onyx error:

This was fixed in #50715

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.

8 participants