Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

teneeto · 2024-04-22T17:46:40Z

Details

Follow up integration withPolicyConnection for advanced config pages

Fixed Issues

$ 37777
PROPOSAL: issue Description

Tests / QA

Log into the QA QBO account
Menu -> Transactions -> Chart of Accounts
Keep open the Chart of Accounts page for reference.
Log into New Expensify with an account that is on the accounting beta
Enable Accounting feature on the More Features page
Go to the Accounting screen and connect to QBO
After the connection is established, click Advanced
Enable "Sync reimbursed reports"
Click Quickbooks Online account
Check that you see the list of accounts from QBO whose types are either "Bank" or "Credit card"
Select one of the account from the list
Go back and click "Invoice collection account"
Check that you see the list of accounts from QBO whose types are either "Bank" or "Other Current Assets"
Select one of the accounts from the list
Log out from New Expensify
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

Screenshots/Videos

MacOS: Chrome / Safari

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Desktop

melvin-bot · 2024-04-22T17:47:08Z

@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 · 2024-04-23T14:16:44Z

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

hayata-suenaga · 2024-04-23T21:19:43Z

@teneeto,

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

hayata-suenaga · 2024-04-23T21:22:51Z

App/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx

Lines 26 to 30 in 827b1f2

    
           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'}, 
        
           ];

App/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx

Line 36 in 827b1f2

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

App/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx

Lines 26 to 30 in 827b1f2

    
           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'}, 
        
           ];

App/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx

Line 41 in 827b1f2

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

…-policy-connection-for-advanced-config

teneeto · 2024-04-24T16:08:16Z

All done @hayata-suenaga, can you test?

hayata-suenaga · 2024-04-24T16:18:57Z

sure testing now...

hayata-suenaga · 2024-04-24T16:34:07Z

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.

src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx

trjExpensify · 2024-04-24T23:09:40Z

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

teneeto · 2024-04-24T23:50:16Z

Yes @trjExpensify.

@hayata-suenaga @s77rt this is up for review

…-policy-connection-for-advanced-config

s77rt · 2024-04-25T02:51:15Z

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx

melvin-bot · 2024-04-25T02:56:06Z

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

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

shawnborton · 2024-04-25T12:20:18Z

Looks good to me, good catch Tom!

teneeto · 2024-04-25T13:14:15Z

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

src/languages/es.ts

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

hayata-suenaga

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

OSBotify · 2024-04-25T14:08:41Z

🚀 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 · 2024-04-25T14:26:20Z

🚀 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 ✅

s77rt · 2024-04-25T19:41:44Z

src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx

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


@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)

@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 · 2024-04-26T22:57:22Z

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

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

swap withPolicy to withPolicyConnections for advanced page

827b1f2

teneeto requested a review from a team as a code owner April 22, 2024 17:46

melvin-bot bot requested review from MonilBhavsar and removed request for a team April 22, 2024 17:47

hayata-suenaga requested a review from s77rt April 22, 2024 17:54

teneeto marked this pull request as draft April 22, 2024 17:55

trjExpensify mentioned this pull request Apr 23, 2024

[$250] [Awaiting Payment May 2nd] [Wave Collect][QBO] Fetch connections data in import, export and advanced pages #40744

Closed

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

teneeto added 2 commits April 24, 2024 15:47

Merge branch 'main' of github.com:teneeto/Expensify into qbo-hoc-with…

c648855

…-policy-connection-for-advanced-config

remove drafts

9ae3099

hayata-suenaga reviewed Apr 24, 2024

View reviewed changes

src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx Outdated Show resolved Hide resolved

hayata-suenaga reviewed Apr 24, 2024

View reviewed changes

src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx Outdated Show resolved Hide resolved

update selected qbo and invoice collection name

213aef4

teneeto added 2 commits April 25, 2024 03:44

Merge branch 'main' of github.com:teneeto/Expensify into qbo-hoc-with…

fea4550

…-policy-connection-for-advanced-config

Merge branch 'main' of github.com:teneeto/Expensify into qbo-hoc-with…

1bf7048

…-policy-connection-for-advanced-config

s77rt reviewed Apr 25, 2024

View reviewed changes

src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx Outdated Show resolved Hide resolved

s77rt approved these changes Apr 25, 2024

View reviewed changes

melvin-bot bot mentioned this pull request Apr 25, 2024

Payment issue for E/App PR#40718 #40955

Closed

use WithPolicyConnectionsProps

a310abb

teneeto added 3 commits April 25, 2024 12:50

add sync reimbursed to qboToggleSettingItems

83561ec

remove all horizontal line spacer view

d0ff87e

move sync reimbursed items to syncReimbursedSubMenuItems

3301d0a

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

teneeto added 4 commits April 25, 2024 13:08

update translations

21d3840

use new translations

b9decde

remove collectionAccountDescription

730ec7b

remove menuItem

2cab80f

teneeto added 5 commits April 25, 2024 13:55

add vertical margins

b50e330

enable sync reimbursed accounts for any available account

786321f

set isActive to isSyncReimbursedSwitchOn

99bf390

use updated translation string

20f439a

use updated translation string

d0b770c

pecanoro requested changes Apr 25, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

src/languages/es.ts Outdated Show resolved Hide resolved

src/languages/es.ts Outdated Show resolved Hide resolved

teneeto and others added 3 commits April 25, 2024 14:18

Update src/languages/es.ts

6749014

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

Update src/languages/es.ts

7339458

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

Update src/languages/es.ts

9235dec

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

pecanoro approved these changes Apr 25, 2024

View reviewed changes

hayata-suenaga approved these changes Apr 25, 2024

View reviewed changes

hayata-suenaga merged commit 675161d into Expensify:main Apr 25, 2024
16 checks passed

github-actions bot mentioned this pull request Apr 25, 2024

Deploy Checklist: New Expensify 2024-04-25 #40981

Closed

53 tasks

s77rt reviewed Apr 25, 2024

View reviewed changes

izarutskaya mentioned this pull request Apr 26, 2024

[Awaiting Payment May 15th] [QBO] advanced configuration: selected accounts are not selected after Relogin #41095

Closed

6 tasks

kbecciv mentioned this pull request May 9, 2024

[QBO] App crashes when toggling on "Sync reimbursed reports" #41894

Closed

6 tasks

shawnborton mentioned this pull request May 13, 2024

Fix the toggle button text style #40950

Merged

48 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

teneeto commented Apr 22, 2024 •

edited by hayata-suenaga

Loading

melvin-bot bot commented Apr 22, 2024

hayata-suenaga commented Apr 23, 2024 •

edited

Loading

hayata-suenaga commented Apr 23, 2024 •

edited

Loading

hayata-suenaga commented Apr 23, 2024

teneeto commented Apr 24, 2024

hayata-suenaga commented Apr 24, 2024

hayata-suenaga commented Apr 24, 2024

trjExpensify commented Apr 24, 2024

teneeto commented Apr 24, 2024

s77rt commented Apr 25, 2024

melvin-bot bot commented Apr 25, 2024

shawnborton commented Apr 25, 2024

teneeto commented Apr 25, 2024

hayata-suenaga left a comment

OSBotify commented Apr 25, 2024

OSBotify commented Apr 25, 2024

s77rt Apr 25, 2024

teneeto Apr 26, 2024

OSBotify commented Apr 26, 2024

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

Swap from withPolicy to withPolicyConnections for advanced Quickbooks pages #40718

Conversation

teneeto commented Apr 22, 2024 • edited by hayata-suenaga Loading

Details

Fixed Issues

Tests / QA

Offline tests

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 22, 2024

hayata-suenaga commented Apr 23, 2024 • edited Loading

hayata-suenaga commented Apr 23, 2024 • edited Loading

hayata-suenaga commented Apr 23, 2024

teneeto commented Apr 24, 2024

hayata-suenaga commented Apr 24, 2024

hayata-suenaga commented Apr 24, 2024

trjExpensify commented Apr 24, 2024

teneeto commented Apr 24, 2024

s77rt commented Apr 25, 2024

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Apr 25, 2024

shawnborton commented Apr 25, 2024

teneeto commented Apr 25, 2024

hayata-suenaga left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 25, 2024

OSBotify commented Apr 25, 2024

s77rt Apr 25, 2024

Choose a reason for hiding this comment

teneeto Apr 26, 2024

Choose a reason for hiding this comment

OSBotify commented Apr 26, 2024

teneeto commented Apr 22, 2024 •

edited by hayata-suenaga

Loading

hayata-suenaga commented Apr 23, 2024 •

edited

Loading

hayata-suenaga commented Apr 23, 2024 •

edited

Loading