Swap from withPolicy to withPolicyConnections for Export Quickbooks pages

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

@@ -13,8 +13,8 @@ import * as Connections from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -27,8 +27,6 @@ type Card = {name: string};
 function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {creditCards} = policy?.connections?.quickbooksOnline?.data ?? {};
-
     const {exportCompanyCard, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
     const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
 
@@ -46,12 +44,7 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyProps
         ],
         [translate],
     );
-    const cards = useMemo<Card[]>(() => {
-        if (creditCards?.length) {
-            return creditCards;
-        }
-        return isLocationEnabled ? defaultCards.slice(0, -1) : defaultCards;
-    }, [creditCards, isLocationEnabled, defaultCards]);
+    const cards = useMemo<Card[]>(() => (isLocationEnabled ? defaultCards.slice(0, -1) : defaultCards), [isLocationEnabled, defaultCards]);
 
     const data = useMemo<CardListItem[]>(
         () =>
@@ -106,4 +99,4 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyProps
 
 QuickbooksCompanyCardExpenseAccountSelectPage.displayName = 'QuickbooksCompanyCardExpenseAccountSelectPage';
 
-export default withPolicy(QuickbooksCompanyCardExpenseAccountSelectPage);
+export default withPolicyConnections(QuickbooksCompanyCardExpenseAccountSelectPage);

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

@@ -13,8 +13,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -125,4 +125,4 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyProps) {
 
 QuickbooksExportConfigurationPage.displayName = 'QuickbooksExportConfigurationPage';
 
-export default withPolicy(QuickbooksExportConfigurationPage);
+export default withPolicyConnections(QuickbooksExportConfigurationPage);

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

@@ -12,8 +12,8 @@ import * as Connections from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -69,4 +69,4 @@ function QuickbooksExportDateSelectPage({policy}: WithPolicyProps) {
 
 QuickbooksExportDateSelectPage.displayName = 'QuickbooksExportDateSelectPage';
 
-export default withPolicy(QuickbooksExportDateSelectPage);
+export default withPolicyConnections(QuickbooksExportDateSelectPage);

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

@@ -11,8 +11,8 @@ import * as Connections from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -25,27 +25,17 @@ function QuickbooksExportInvoiceAccountSelectPage({policy}: WithPolicyProps) {
     const styles = useThemeStyles();
     const {accountsReceivable} = policy?.connections?.quickbooksOnline?.data ?? {};
     const {exportInvoice} = policy?.connections?.quickbooksOnline?.config ?? {};
-    // TODO - should be removed after API fully working
-    const draft = [
-        {
-            name: translate(`workspace.qbo.receivable`),
-        },
-        {
-            name: translate(`workspace.qbo.archive`),
-        },
-    ];
-    const result = accountsReceivable?.length ? accountsReceivable : draft;
 
     const policyID = policy?.id ?? '';
     const data: CardListItem[] = useMemo(
         () =>
-            result?.map((account) => ({
+            accountsReceivable?.map((account) => ({
                 value: account.name,
                 text: account.name,
                 keyForList: account.name,
                 isSelected: account.name === exportInvoice,
-            })),
-        [exportInvoice, result],
+            })) ?? [],
+        [exportInvoice, accountsReceivable],
     );
 
     const onSelectRow = useCallback(
@@ -81,4 +71,4 @@ function QuickbooksExportInvoiceAccountSelectPage({policy}: WithPolicyProps) {
 
 QuickbooksExportInvoiceAccountSelectPage.displayName = 'QuickbooksExportInvoiceAccountSelectPage';
 
-export default withPolicy(QuickbooksExportInvoiceAccountSelectPage);
+export default withPolicyConnections(QuickbooksExportInvoiceAccountSelectPage);

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

@@ -11,20 +11,11 @@ import * as Connections from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-
-// TODO - should be removed after API fully working
-const draft = [
-    {
-        name: 'Accounts Payable (A/P)',
-    },
-    {
-        name: 'Payroll Accounts',
-    },
-];
+import type {Account} from '@src/types/onyx/Policy';
 
 type CardListItem = ListItem & {
     value: string;
@@ -38,22 +29,22 @@ function QuickbooksOutOfPocketExpenseAccountSelectPage({policy}: WithPolicyProps
     const {exportEntity, exportAccount} = policy?.connections?.quickbooksOnline?.config ?? {};
 
     const data: CardListItem[] = useMemo(() => {
-        let result;
+        let accounts: Account[];
         switch (exportEntity) {
             case CONST.QUICKBOOKS_EXPORT_ENTITY.CHECK:
-                result = bankAccounts ?? [];
+                accounts = bankAccounts ?? [];
                 break;
             case CONST.QUICKBOOKS_EXPORT_ENTITY.VENDOR_BILL:
-                result = accountsPayable ?? [];
+                accounts = accountsPayable ?? [];
                 break;
             case CONST.QUICKBOOKS_EXPORT_ENTITY.JOURNAL_ENTRY:
-                result = journalEntryAccounts ?? [];
+                accounts = journalEntryAccounts ?? [];
                 break;
             default:
-                result = draft;
+                accounts = [];
         }
 
-        return (draft ?? result)?.map((card) => ({
+        return accounts.map((card) => ({
             value: card.name,
             text: card.name,
             keyForList: card.name,
@@ -96,4 +87,4 @@ function QuickbooksOutOfPocketExpenseAccountSelectPage({policy}: WithPolicyProps
 
 QuickbooksOutOfPocketExpenseAccountSelectPage.displayName = 'QuickbooksOutOfPocketExpenseAccountSelectPage';
 
-export default withPolicy(QuickbooksOutOfPocketExpenseAccountSelectPage);
+export default withPolicyConnections(QuickbooksOutOfPocketExpenseAccountSelectPage);

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

@@ -10,8 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -76,4 +76,4 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyProps
 
 QuickbooksOutOfPocketExpenseConfigurationPage.displayName = 'QuickbooksExportOutOfPocketExpensesPage';
 
-export default withPolicy(QuickbooksOutOfPocketExpenseConfigurationPage);
+export default withPolicyConnections(QuickbooksOutOfPocketExpenseConfigurationPage);

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

@@ -14,8 +14,8 @@ import * as Connections from '@libs/actions/connections';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -111,4 +111,4 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyProps)
 
 QuickbooksOutOfPocketExpenseEntitySelectPage.displayName = 'QuickbooksOutOfPocketExpenseEntitySelectPage';
 
-export default withPolicy(QuickbooksOutOfPocketExpenseEntitySelectPage);
+export default withPolicyConnections(QuickbooksOutOfPocketExpenseEntitySelectPage);

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

@@ -12,20 +12,11 @@ import {getAdminEmployees} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
 import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
-// TODO - should be removed after API fully working
-const draft = [
-    {name: '+14153166423@expensify.sms', currency: 'USD', id: '94', email: '+14153166423@expensify.sms'},
-    {name: 'Account Maintenance Fee', currency: 'USD', id: '141', email: 'alberto@expensify213.com'},
-    {name: 'Admin Test', currency: 'USD', id: '119', email: 'admin@qbocard.com'},
-    {name: 'Alberto Gonzalez-Cela', currency: 'USD', id: '104', email: 'alberto@expensify.com'},
-    {name: 'Aldo test QBO2 QBO2 Last name', currency: 'USD', id: '140', email: 'admin@qbo.com'},
-];
-
 type CardListItem = ListItem & {
     value: string;
 };
@@ -35,12 +26,11 @@ function QuickBooksExportPreferredExporterPage({policy}: WithPolicyProps) {
     const styles = useThemeStyles();
     const {exporter} = policy?.connections?.quickbooksOnline?.config ?? {};
     const exporters = getAdminEmployees(policy);
-    const result = exporters?.length ? exporters : draft;
 
     const policyID = policy?.id ?? '';
     const data: CardListItem[] = useMemo(
         () =>
-            result.reduce<CardListItem[]>((vendors, vendor) => {
+            exporters?.reduce<CardListItem[]>((vendors, vendor) => {
                 if (vendor.email) {
                     vendors.push({
                         value: vendor.email,
@@ -51,7 +41,7 @@ function QuickBooksExportPreferredExporterPage({policy}: WithPolicyProps) {
                 }
                 return vendors;
             }, []),
-        [result, exporter],
+        [exporter, exporters],
     );
 
     const onSelectRow = useCallback(
@@ -92,4 +82,4 @@ function QuickBooksExportPreferredExporterPage({policy}: WithPolicyProps) {
 
 QuickBooksExportPreferredExporterPage.displayName = 'QuickBooksExportPreferredExporterPage';
 
-export default withPolicy(QuickBooksExportPreferredExporterPage);
+export default withPolicyConnections(QuickBooksExportPreferredExporterPage);

src/types/onyx/Policy.ts

@@ -475,4 +475,5 @@ export type {
     PolicyConnectionSyncProgress,
     Connections,
     ConnectionName,
+    Account,
 };