Fix navigation and account selection on the accounting company card export page #42102

hayata-suenaga · 2024-05-13T19:17:56Z

Details

This PR:

ensures that the user is navigated to the correct screen depending on the entity type selected
If the entity type is either Credit card or debit card, the user is navigated to the Account Selection page. If the entity type is Vendor, the user is navigated to the Default Vendor Select page.
ensures that, on the Company Card Expense Account Page, the correct value is displayed (either account selected or default vendor selected) depending on the entity type selected.

Fixed Issues

$ #41046
PROPOSAL: N/A

Tests / QA Steps

Create a workspace
Go to workspace editor page -> Enable tags and account on the More Features page
On the accounting page, connect to QBO
After the connection is established, click Export
Click export company card expenses as
Check that the Credit card is selected by default for Export company cards as
Check that one of the QBO credit card accounts is displayed for Account
Click Account and ensure that you're taken to the page where you can change the account
Go back and change the entity type to Vendor for Export company cards as
Ensure that the Account menu disappears and there is a Vendor menu
Check that you're taken to the page where you can change the default vendor if you click the Vendor menu

Offline tests

N/A

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-05-13T19:18:01Z

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

s77rt · 2024-05-13T21:11:40Z

Bug (unrelated to the PR): After changing the export destination, the account value is uncleared / outdated

Screen.Recording.2024-05-13.at.10.07.26.PM.mov

s77rt · 2024-05-13T21:13:38Z

src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx

                    <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableBillDefaultVendor}>
                        <MenuItemWithTopDescription
-                            title={nonReimbursableBillDefaultVendorObject?.name}
+                            title={isVendorSelected ? nonReimbursableBillDefaultVendorObject?.name : nonReimbursableExpensesAccount?.name}
                            description={isVendorSelected ? translate('workspace.qbo.vendor') : translate('workspace.qbo.account')}
-                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT.getRoute(policyID))}
+                            onPress={() =>
+                                Navigation.navigate(
+                                    isVendorSelected
+                                        ? ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT.getRoute(policyID)
+                                        : ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_SELECT.getRoute(policyID),
+                                )
+                            }
                            brickRoadIndicator={errorFields?.nonReimbursableBillDefaultVendor ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                            shouldShowRightIcon
                            error={errorFields?.nonReimbursableBillDefaultVendor ? translate('common.genericErrorMessage') : undefined}


Update pendingAction, brickRoadIndicator and error

Actually this is looking too different that we should render another menu item

@s77rt fixed here: 27b8e9c

s77rt · 2024-05-13T22:39:44Z

@hayata-suenaga We have conflicts

hayata-suenaga · 2024-05-14T20:07:53Z

@hayata-suenaga We have conflicts

Resolved it 😄

s77rt · 2024-05-15T01:45:22Z

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

Networking issue

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-05-15T01:46:21Z

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

OSBotify · 2024-05-15T16:41:56Z

✋ 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 · 2024-05-23T00:39:57Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 1.4.75-0 🚀

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

OSBotify · 2024-05-27T14:03:05Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.75-1 🚀

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

fix: navigation and selection display

86f75a5

hayata-suenaga self-assigned this May 13, 2024

hayata-suenaga requested a review from a team as a code owner May 13, 2024 19:17

melvin-bot bot requested review from s77rt and removed request for a team May 13, 2024 19:17

hayata-suenaga mentioned this pull request May 13, 2024

[HOLD for payment 2024-06-03] [QBO] Not all default settings & accounts are selected when establishing the connection to QBO #41046

Closed

6 tasks

s77rt suggested changes May 13, 2024

View reviewed changes

fix: separate components & error and RBR indicator fields

27b8e9c

Merge branch 'main' into hayata-select-defaul-non-reimbursable-account

3d279c8

s77rt approved these changes May 15, 2024

View reviewed changes

melvin-bot bot requested a review from AndrewGable May 15, 2024 01:46

AndrewGable approved these changes May 15, 2024

View reviewed changes

AndrewGable merged commit 543c9c1 into main May 15, 2024
16 checks passed

AndrewGable deleted the hayata-select-defaul-non-reimbursable-account branch May 15, 2024 16:34

aldo-expensify mentioned this pull request May 15, 2024

Use new multi config edit command #41627

Merged

50 tasks

github-actions bot mentioned this pull request May 22, 2024

Deploy Checklist: New Expensify 2024-05-22 #42496

Closed

45 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix navigation and account selection on the accounting company card export page #42102

Fix navigation and account selection on the accounting company card export page #42102

hayata-suenaga commented May 13, 2024

melvin-bot bot commented May 13, 2024

s77rt commented May 13, 2024

s77rt May 13, 2024

s77rt May 13, 2024

hayata-suenaga May 13, 2024

s77rt commented May 13, 2024

hayata-suenaga commented May 14, 2024

s77rt commented May 15, 2024

melvin-bot bot commented May 15, 2024

OSBotify commented May 15, 2024

OSBotify commented May 23, 2024

OSBotify commented May 27, 2024

Fix navigation and account selection on the accounting company card export page #42102

Fix navigation and account selection on the accounting company card export page #42102

Conversation

hayata-suenaga commented May 13, 2024

Details

Fixed Issues

Tests / QA Steps

Offline tests

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 13, 2024

s77rt commented May 13, 2024

s77rt May 13, 2024

Choose a reason for hiding this comment

s77rt May 13, 2024

Choose a reason for hiding this comment

hayata-suenaga May 13, 2024

Choose a reason for hiding this comment

s77rt commented May 13, 2024

hayata-suenaga commented May 14, 2024

s77rt commented May 15, 2024

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented May 15, 2024

OSBotify commented May 15, 2024

OSBotify commented May 23, 2024

OSBotify commented May 27, 2024