Skip to content

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

Merged
hayata-suenaga merged 24 commits into
Expensify:mainfrom
teneeto:qbo-hoc-with-policy-connection-for-advanced-config
Apr 25, 2024
Merged

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718
hayata-suenaga merged 24 commits into
Expensify:mainfrom
teneeto:qbo-hoc-with-policy-connection-for-advanced-config

Conversation

@teneeto

@teneeto teneeto commented Apr 22, 2024

Copy link
Copy Markdown
Contributor

Details

Follow up integration withPolicyConnection for advanced config pages

Fixed Issues

$ 37777
PROPOSAL: issue Description

Tests / QA

  1. Log into the QA QBO account
  2. Menu -> Transactions -> Chart of Accounts
  3. Keep open the Chart of Accounts page for reference.
  4. Log into New Expensify with an account that is on the accounting beta
  5. Enable Accounting feature on the More Features page
  6. Go to the Accounting screen and connect to QBO
  7. After the connection is established, click Advanced
  8. Enable "Sync reimbursed reports"
  9. Click Quickbooks Online account
  10. Check that you see the list of accounts from QBO whose types are either "Bank" or "Credit card"
  11. Select one of the account from the list
  12. Go back and click "Invoice collection account"
  13. Check that you see the list of accounts from QBO whose types are either "Bank" or "Other Current Assets"
  14. Select one of the accounts from the list
  15. Log out from New Expensify
  16. Log into New Expensify again and double confirm that the selected accounts in the previous steps are still selected on the Advanced configuration screen

Offline tests

N/A

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

MacOS: Chrome / Safari
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Desktop

@teneeto teneeto requested a review from a team as a code owner April 22, 2024 17:46
@melvin-bot melvin-bot Bot requested review from MonilBhavsar and removed request for a team April 22, 2024 17:47
@melvin-bot

melvin-bot Bot commented Apr 22, 2024

Copy link
Copy Markdown

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

@hayata-suenaga

hayata-suenaga commented Apr 23, 2024

Copy link
Copy Markdown
Contributor

As I said in Slack, let's test if we're actually getting the real data on the staging. It's hard to test this locally right now

@teneeto teneeto marked this pull request as ready for review April 23, 2024 14:18
@hayata-suenaga

hayata-suenaga commented Apr 23, 2024

Copy link
Copy Markdown
Contributor

@teneeto,

you're still using DRAFT values. Please remove them (the kind of mistake I also make sometimes 😄 )

@hayata-suenaga

Copy link
Copy Markdown
Contributor

const DRAFT = [
{name: 'Croissant Co Payroll Account', id: 'Croissant Co Payroll Account'},
{name: 'Croissant Co Money in Clearing', id: 'Croissant Co Money in Clearing'},
{name: 'Croissant Co Debts and Loans', id: 'Croissant Co Debts and Loans'},
];

const selectedAccount = DRAFT[0].id; // selected

const DRAFT = [
{name: 'Croissant Co Payroll Account', id: 'Croissant Co Payroll Account'},
{name: 'Croissant Co Money in Clearing', id: 'Croissant Co Money in Clearing'},
{name: 'Croissant Co Debts and Loans', id: 'Croissant Co Debts and Loans'},
];

const accountOptions = useMemo(() => DRAFT || [...(bankAccounts ?? []), ...(otherCurrentAssetAccounts ?? [])], [bankAccounts, otherCurrentAssetAccounts]);

@teneeto

teneeto commented Apr 24, 2024

Copy link
Copy Markdown
Contributor Author

All done @hayata-suenaga, can you test?

@hayata-suenaga

Copy link
Copy Markdown
Contributor

sure testing now...

@hayata-suenaga

Copy link
Copy Markdown
Contributor

I'm facing a local environment issue and I cannot test this at the moment. While I trouble shoot, I'll write the QA test steps.

Comment thread src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx Outdated
Comment thread src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx Outdated
@trjExpensify

Copy link
Copy Markdown
Contributor

Are we down to final reviews needed from @s77rt & @hayata-suenaga here?

@teneeto

teneeto commented Apr 24, 2024

Copy link
Copy Markdown
Contributor Author

Yes @trjExpensify.

@hayata-suenaga @s77rt this is up for review

@s77rt

s77rt commented Apr 25, 2024

Copy link
Copy Markdown
Member

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

Build errors

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

Comment thread src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx Outdated
@melvin-bot

melvin-bot Bot commented Apr 25, 2024

Copy link
Copy Markdown

🎯 @s77rt, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #40955.

@pecanoro pecanoro self-requested a review April 25, 2024 12:04
@shawnborton

Copy link
Copy Markdown
Contributor

Looks good to me, good catch Tom!

@teneeto

teneeto commented Apr 25, 2024

Copy link
Copy Markdown
Contributor Author

Pushed new changes. let's check. @trjExpensify @pecanoro @hayata-suenaga @s77rt @shawnborton

Comment thread src/languages/es.ts Outdated
Comment thread src/languages/es.ts Outdated
Comment thread src/languages/es.ts Outdated
teneeto and others added 3 commits April 25, 2024 14:18
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

@hayata-suenaga hayata-suenaga left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm not 100% around the logic in the callback for onToggle but let's merge for test on staging

@hayata-suenaga hayata-suenaga merged commit 675161d into Expensify:main Apr 25, 2024
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.4.66-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.4.66-0 🚀

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

policyID,
CONST.POLICY.CONNECTIONS.NAME.QBO,
CONST.QUICK_BOOKS_CONFIG.COLLECTION_ACCOUNT_ID,
isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@teneeto Shouldn't this be based on the invoiceAccountCollectionOptions only? This switch will set a collect account and qboAccountOptions may not have valid options (e.g. credit cards)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@s77rt we can look into this further, we were looking at a situation where qboAccountOptions does not have options but invoiceAccountCollectionOptions does have - it means the switch won't toggle on simply because qbaAccountOptions is missing options.

I'm sure this isn't perfect - I can't test in real-time either. I have limitations in seeing exactly what happens.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.66-5 🚀

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