From 015f89c1c7a9b6a1664caf6dbcd4f6d6ae4f1595 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Sun, 16 Mar 2025 21:11:54 +0100 Subject: [PATCH 1/4] remove nsqs code --- Mobile-Expensify | 2 +- .../netsuite-quickstart-icon-square.svg | 35 ---- src/CONST.ts | 49 ----- src/ONYXKEYS.ts | 3 - src/ROUTES.ts | 44 ----- src/SCREENS.ts | 11 -- src/components/ConnectToNSQSFlow/index.tsx | 15 -- src/components/ConnectToNSQSFlow/types.ts | 10 - src/components/Icon/Expensicons.ts | 2 - src/languages/en.ts | 79 -------- src/languages/es.ts | 79 -------- .../parameters/ConnectPolicyToNSQSParams.ts | 6 - .../API/parameters/SyncPolicyToNSQSParams.ts | 7 - .../parameters/UpdateNSQSAutoSyncParams.ts | 6 - .../UpdateNSQSCustomersMappingParams.ts | 9 - .../parameters/UpdateNSQSExportDateParams.ts | 9 - .../parameters/UpdateNSQSExporterParams.ts | 6 - .../UpdateNSQSPaymentAccountParams.ts | 6 - .../UpdateNSQSProjectsMappingParams.ts | 9 - src/libs/API/parameters/index.ts | 8 - src/libs/API/types.ts | 16 -- src/libs/AccountingUtils.ts | 2 - .../ModalStackNavigators/index.tsx | 14 -- .../RELATIONS/WORKSPACE_TO_RHP.ts | 11 -- src/libs/Navigation/linkingConfig/config.ts | 33 ---- src/libs/Navigation/types.ts | 33 ---- src/libs/Permissions.ts | 5 - src/libs/PolicyUtils.ts | 7 - src/libs/ReportUtils.ts | 5 +- src/libs/actions/Policy/Policy.ts | 5 - src/libs/actions/connections/NSQS.ts | 187 ------------------ src/libs/actions/connections/index.ts | 10 +- .../MultiConnectionSelectorPage.tsx | 127 ------------ .../accounting/PolicyAccountingPage.tsx | 54 +---- .../NetSuiteTokenInputPage.tsx | 14 -- .../accounting/nsqs/NSQSSetupPage.tsx | 111 ----------- .../nsqs/advanced/NSQSAdvancedPage.tsx | 59 ------ .../accounting/nsqs/export/NSQSDatePage.tsx | 77 -------- .../accounting/nsqs/export/NSQSExportPage.tsx | 101 ---------- .../nsqs/export/NSQSPaymentAccountPage.tsx | 87 -------- .../nsqs/export/NSQSPreferredExporterPage.tsx | 102 ---------- .../import/NSQSCustomersDisplayedAsPage.tsx | 73 ------- .../nsqs/import/NSQSCustomersPage.tsx | 81 -------- .../accounting/nsqs/import/NSQSImportPage.tsx | 76 ------- .../import/NSQSProjectsDisplayedAsPage.tsx | 73 ------- .../nsqs/import/NSQSProjectsPage.tsx | 81 -------- src/pages/workspace/accounting/utils.tsx | 21 -- src/types/form/NSQSOAuth2Form.ts | 18 -- src/types/form/index.ts | 1 - src/types/onyx/Policy.ts | 94 --------- 50 files changed, 10 insertions(+), 1963 deletions(-) delete mode 100644 assets/images/integrationicons/netsuite-quickstart-icon-square.svg delete mode 100644 src/components/ConnectToNSQSFlow/index.tsx delete mode 100644 src/components/ConnectToNSQSFlow/types.ts delete mode 100644 src/libs/API/parameters/ConnectPolicyToNSQSParams.ts delete mode 100644 src/libs/API/parameters/SyncPolicyToNSQSParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSAutoSyncParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSCustomersMappingParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSExportDateParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSExporterParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSPaymentAccountParams.ts delete mode 100644 src/libs/API/parameters/UpdateNSQSProjectsMappingParams.ts delete mode 100644 src/libs/actions/connections/NSQS.ts delete mode 100644 src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/NSQSSetupPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/export/NSQSDatePage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/export/NSQSExportPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/export/NSQSPaymentAccountPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/export/NSQSPreferredExporterPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/import/NSQSCustomersDisplayedAsPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/import/NSQSCustomersPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/import/NSQSImportPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/import/NSQSProjectsDisplayedAsPage.tsx delete mode 100644 src/pages/workspace/accounting/nsqs/import/NSQSProjectsPage.tsx delete mode 100644 src/types/form/NSQSOAuth2Form.ts diff --git a/Mobile-Expensify b/Mobile-Expensify index 7afb93138ae61..da6363868ad6e 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 7afb93138ae617149fc3de9ce5c0aab8bfc39e79 +Subproject commit da6363868ad6ee8950454d3b2d8ad9600dc71b5e diff --git a/assets/images/integrationicons/netsuite-quickstart-icon-square.svg b/assets/images/integrationicons/netsuite-quickstart-icon-square.svg deleted file mode 100644 index 5b8ddb542cf77..0000000000000 --- a/assets/images/integrationicons/netsuite-quickstart-icon-square.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/CONST.ts b/src/CONST.ts index cfccbfd12ff1d..c0e3a061746ab 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -69,7 +69,6 @@ const ONBOARDING_ACCOUNTING_MAPPING = { quickbooksOnline: 'QuickBooks Online', xero: 'Xero', netsuite: 'NetSuite', - netsuiteQuickStart: 'NSQS', intacct: 'Sage Intacct', quickbooksDesktop: 'QuickBooks Desktop', }; @@ -779,7 +778,6 @@ const CONST = { NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest', NEWDOT_PDF_EXPORT: 'newDotPDFExport', NEWDOT_INTERNATIONAL_DEPOSIT_BANK_ACCOUNT: 'newDotInternationalDepositBankAccount', - NSQS: 'nsqs', CUSTOM_RULES: 'customRules', TABLE_REPORT_VIEW: 'tableReportView', }, @@ -2307,31 +2305,6 @@ const CONST = { '_vietNam', ] as string[], - NSQS_EXPORT_DATE: { - LAST_EXPENSE: 'LAST_EXPENSE', - EXPORTED: 'EXPORTED', - SUBMITTED: 'SUBMITTED', - }, - - NSQS_INTEGRATION_ENTITY_MAP_TYPES: { - NETSUITE_DEFAULT: 'NETSUITE_DEFAULT', - REPORT_FIELD: 'REPORT_FIELD', - TAG: 'TAG', - }, - - NSQS_CONFIG: { - AUTO_SYNC: 'autoSync', - SYNC_OPTIONS: { - MAPPING: { - CUSTOMERS: 'syncOptions.mapping.customers', - PROJECTS: 'syncOptions.mapping.projects', - }, - }, - EXPORTER: 'exporter', - EXPORT_DATE: 'exportDate', - PAYMENT_ACCOUNT: 'paymentAccount', - }, - QUICKBOOKS_EXPORT_DATE: { LAST_EXPENSE: 'LAST_EXPENSE', REPORT_EXPORTED: 'REPORT_EXPORTED', @@ -2830,20 +2803,17 @@ const CONST = { QBD: 'quickbooksDesktop', XERO: 'xero', NETSUITE: 'netsuite', - NSQS: 'netsuiteQuickStart', SAGE_INTACCT: 'intacct', }, ROUTE: { QBO: 'quickbooks-online', XERO: 'xero', NETSUITE: 'netsuite', - NSQS: 'nsqs', SAGE_INTACCT: 'sage-intacct', QBD: 'quickbooks-desktop', }, NAME_USER_FRIENDLY: { netsuite: 'NetSuite', - netsuiteQuickStart: 'NSQS', quickbooksOnline: 'QuickBooks Online', quickbooksDesktop: 'QuickBooks Desktop', xero: 'Xero', @@ -2921,12 +2891,6 @@ const CONST = { NETSUITE_SYNC_EXPENSIFY_REIMBURSED_REPORTS: 'netSuiteSyncExpensifyReimbursedReports', NETSUITE_SYNC_IMPORT_VENDORS_TITLE: 'netSuiteImportVendorsTitle', NETSUITE_SYNC_IMPORT_CUSTOM_LISTS_TITLE: 'netSuiteImportCustomListsTitle', - NSQS_SYNC_CONNECTION: 'nsqsSyncConnection', - NSQS_SYNC_ACCOUNTS: 'nsqsSyncAccounts', - NSQS_SYNC_EMPLOYEES: 'nsqsSyncEmployees', - NSQS_SYNC_CUSTOMERS: 'nsqsSyncCustomers', - NSQS_SYNC_PROJECTS: 'nsqsSyncProjects', - NSQS_SYNC_CURRENCY: 'nsqsSyncCurrency', SAGE_INTACCT_SYNC_CHECK_CONNECTION: 'intacctCheckConnection', SAGE_INTACCT_SYNC_IMPORT_TITLE: 'intacctImportTitle', SAGE_INTACCT_SYNC_IMPORT_DATA: 'intacctImportData', @@ -2935,19 +2899,6 @@ const CONST = { SAGE_INTACCT_SYNC_IMPORT_SYNC_REIMBURSED_REPORTS: 'intacctImportSyncBillPayments', }, SYNC_STAGE_TIMEOUT_MINUTES: 20, - - // Map each connection to its designated display connection - get MULTI_CONNECTIONS_MAPPING() { - return { - [this.NAME.NETSUITE]: this.NAME.NETSUITE, - [this.NAME.NSQS]: this.NAME.NETSUITE, - } as Record, ValueOf | undefined>; - }, - - // Get linked connections by the designated display connection - get MULTI_CONNECTIONS_MAPPING_INVERTED() { - return invertBy(this.MULTI_CONNECTIONS_MAPPING) as Dictionary> | undefined>; - }, }, ACCESS_VARIANTS: { PAID: 'paid', diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index db7b18d865e0d..18cfc681cd024 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -733,8 +733,6 @@ const ONYXKEYS = { NETSUITE_TOKEN_INPUT_FORM_DRAFT: 'netsuiteTokenInputFormDraft', NETSUITE_CUSTOM_FORM_ID_FORM: 'netsuiteCustomFormIDForm', NETSUITE_CUSTOM_FORM_ID_FORM_DRAFT: 'netsuiteCustomFormIDFormDraft', - NSQS_OAUTH2_FORM: 'nsqsOAuth2Form', - NSQS_OAUTH2_FORM_DRAFT: 'nsqsOAuth2FormDraft', SAGE_INTACCT_DIMENSION_TYPE_FORM: 'sageIntacctDimensionTypeForm', SAGE_INTACCT_DIMENSION_TYPE_FORM_DRAFT: 'sageIntacctDimensionTypeFormDraft', SEARCH_ADVANCED_FILTERS_FORM: 'searchAdvancedFiltersForm', @@ -849,7 +847,6 @@ type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm; [ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM]: FormTypes.NetSuiteTokenInputForm; [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM]: FormTypes.NetSuiteCustomFormIDForm; - [ONYXKEYS.FORMS.NSQS_OAUTH2_FORM]: FormTypes.NSQSOAuth2Form; [ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM]: FormTypes.SageIntacctDimensionForm; [ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM]: FormTypes.SearchAdvancedFiltersForm; [ONYXKEYS.FORMS.TEXT_PICKER_MODAL_FORM]: FormTypes.TextPickerModalForm; diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 299903505320a..1a450f42f0e51 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -2102,50 +2102,6 @@ const ROUTES = { route: 'settings/workspaces/:policyID/connections/netsuite/advanced/autosync/accounting-method', getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/autosync/accounting-method` as const, }, - POLICY_ACCOUNTING_NSQS_SETUP: { - route: 'settings/workspaces/:policyID/accounting/nsqs/setup', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/setup` as const, - }, - POLICY_ACCOUNTING_NSQS_IMPORT: { - route: 'settings/workspaces/:policyID/accounting/nsqs/import', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/import` as const, - }, - POLICY_ACCOUNTING_NSQS_IMPORT_CUSTOMERS: { - route: 'settings/workspaces/:policyID/accounting/nsqs/import/customers', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/import/customers` as const, - }, - POLICY_ACCOUNTING_NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS: { - route: 'settings/workspaces/:policyID/accounting/nsqs/import/customers/displayed-as', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/import/customers/displayed-as` as const, - }, - POLICY_ACCOUNTING_NSQS_IMPORT_PROJECTS: { - route: 'settings/workspaces/:policyID/accounting/nsqs/import/projects', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/import/projects` as const, - }, - POLICY_ACCOUNTING_NSQS_IMPORT_PROJECTS_DISPLAYED_AS: { - route: 'settings/workspaces/:policyID/accounting/nsqs/import/projects/displayed-as', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/import/projects/displayed-as` as const, - }, - POLICY_ACCOUNTING_NSQS_EXPORT: { - route: 'settings/workspaces/:policyID/accounting/nsqs/export', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/export` as const, - }, - POLICY_ACCOUNTING_NSQS_EXPORT_PREFERRED_EXPORTER: { - route: 'settings/workspaces/:policyID/accounting/nsqs/export/preferred-exporter', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/export/preferred-exporter` as const, - }, - POLICY_ACCOUNTING_NSQS_EXPORT_DATE: { - route: 'settings/workspaces/:policyID/accounting/nsqs/export/date', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/export/date` as const, - }, - POLICY_ACCOUNTING_NSQS_EXPORT_PAYMENT_ACCOUNT: { - route: 'settings/workspaces/:policyID/accounting/nsqs/export/payment-account', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/export/payment-account` as const, - }, - POLICY_ACCOUNTING_NSQS_ADVANCED: { - route: 'settings/workspaces/:policyID/accounting/nsqs/advanced', - getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/nsqs/advanced` as const, - }, POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES: { route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites', getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 06051422bb135..f5331f27fff97 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -444,17 +444,6 @@ const SCREENS = { NETSUITE_CUSTOM_FORM_ID: 'Policy_Accounting_NetSuite_Custom_Form_ID', NETSUITE_AUTO_SYNC: 'Policy_Accounting_NetSuite_Auto_Sync', NETSUITE_ACCOUNTING_METHOD: 'Policy_Accounting_NetSuite_Accounting_Method', - NSQS_SETUP: 'Policy_Accounting_NSQS_Setup', - NSQS_IMPORT: 'Policy_Accounting_NSQS_Import', - NSQS_IMPORT_CUSTOMERS: 'Policy_Accounting_NSQS_Import_Customers', - NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS: 'Policy_Accounting_NSQS_Import_Customers_Displayed_As', - NSQS_IMPORT_PROJECTS: 'Policy_Accounting_NSQS_Import_Projects', - NSQS_IMPORT_PROJECTS_DISPLAYED_AS: 'Policy_Accounting_NSQS_Import_Projects_Displayed_As', - NSQS_EXPORT: 'Policy_Accounting_NSQS_Export', - NSQS_EXPORT_PREFERRED_EXPORTER: 'Policy_Accounting_NSQS_Export_Preferred_Exporter', - NSQS_EXPORT_DATE: 'Policy_Accounting_NSQS_Export_Date', - NSQS_EXPORT_PAYMENT_ACCOUNT: 'Policy_Accounting_NSQS_Export_Payment_Account', - NSQS_ADVANCED: 'Policy_Accounting_NSQS_Advanced', SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites', ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials', EXISTING_SAGE_INTACCT_CONNECTIONS: 'Policy_Existing_Sage_Intacct_Connections', diff --git a/src/components/ConnectToNSQSFlow/index.tsx b/src/components/ConnectToNSQSFlow/index.tsx deleted file mode 100644 index 87b32007f9f5e..0000000000000 --- a/src/components/ConnectToNSQSFlow/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import {useEffect} from 'react'; -import Navigation from '@libs/Navigation/Navigation'; -import ROUTES from '@src/ROUTES'; -import type {ConnectToNSQSFlowProps} from './types'; - -function ConnectToNSQSFlow({policyID}: ConnectToNSQSFlowProps) { - useEffect(() => { - Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NSQS_SETUP.getRoute(policyID)); - // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps - }, []); - - return null; -} - -export default ConnectToNSQSFlow; diff --git a/src/components/ConnectToNSQSFlow/types.ts b/src/components/ConnectToNSQSFlow/types.ts deleted file mode 100644 index 7a19bd321b994..0000000000000 --- a/src/components/ConnectToNSQSFlow/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type {PolicyConnectionName} from '@src/types/onyx/Policy'; - -type ConnectToNSQSFlowProps = { - policyID: string; - shouldDisconnectIntegrationBeforeConnecting?: boolean; - integrationToDisconnect?: PolicyConnectionName; -}; - -// eslint-disable-next-line import/prefer-default-export -export type {ConnectToNSQSFlowProps}; diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts index db5c81a0cfc34..e3b2a4e7ab90c 100644 --- a/src/components/Icon/Expensicons.ts +++ b/src/components/Icon/Expensicons.ts @@ -115,7 +115,6 @@ import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg'; import Inbox from '@assets/images/inbox.svg'; import Info from '@assets/images/info.svg'; import NetSuiteSquare from '@assets/images/integrationicons/netsuite-icon-square.svg'; -import NSQSSquare from '@assets/images/integrationicons/netsuite-quickstart-icon-square.svg'; import QBDSquare from '@assets/images/integrationicons/qbd-icon-square.svg'; import QBOCircle from '@assets/images/integrationicons/qbo-icon-circle.svg'; import QBOSquare from '@assets/images/integrationicons/qbo-icon-square.svg'; @@ -413,7 +412,6 @@ export { CheckCircle, CheckmarkCircle, NetSuiteSquare, - NSQSSquare, XeroCircle, QBOCircle, Filters, diff --git a/src/languages/en.ts b/src/languages/en.ts index 5f44cde8afb56..5ebf639a27afa 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3447,69 +3447,6 @@ const translations = { }, }, }, - nsqs: { - setup: { - title: 'NSQS setup', - description: 'Enter your NSQS account ID', - formInputs: { - netSuiteAccountID: 'NSQS Account ID', - }, - }, - import: { - expenseCategories: 'Expense categories', - expenseCategoriesDescription: 'NSQS expense categories import into Expensify as categories.', - importTypes: { - [CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.TAG]: { - label: 'Tags', - description: 'Line-item level', - }, - [CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: { - label: 'Report fields', - description: 'Report level', - }, - }, - importFields: { - customers: { - title: 'Customers', - subtitle: 'Choose how to handle NSQS *customers* in Expensify.', - }, - projects: { - title: 'Projects', - subtitle: 'Choose how to handle NSQS *projects* in Expensify.', - }, - }, - }, - export: { - description: 'Configure how Expensify data exports to NSQS.', - exportDate: { - label: 'Export date', - description: 'Use this date when exporting reports to NSQS.', - values: { - [CONST.NSQS_EXPORT_DATE.LAST_EXPENSE]: { - label: 'Date of last expense', - description: 'Date of the most recent expense on the report.', - }, - [CONST.NSQS_EXPORT_DATE.EXPORTED]: { - label: 'Export date', - description: 'Date the report was exported to NSQS.', - }, - [CONST.NSQS_EXPORT_DATE.SUBMITTED]: { - label: 'Submitted date', - description: 'Date the report was submitted for approval.', - }, - }, - }, - expense: 'Expense', - reimbursableExpenses: 'Export reimbursable expenses as', - nonReimbursableExpenses: 'Export non-reimbursable expenses as', - defaultPaymentAccount: 'NSQS default', - paymentAccount: 'Payment account', - paymentAccountDescription: 'Choose the account that will be used as the payment account for transactions NSQS.', - }, - advanced: { - autoSyncDescription: 'Sync NSQS and Expensify automatically, every day. Export finalized report in realtime', - }, - }, intacct: { sageIntacctSetup: 'Sage Intacct setup', prerequisitesTitle: 'Before you connect...', @@ -4139,7 +4076,6 @@ const translations = { qbd: 'QuickBooks Desktop', xero: 'Xero', netsuite: 'NetSuite', - nsqs: 'NSQS', intacct: 'Sage Intacct', talkYourOnboardingSpecialist: 'Chat with your setup specialist.', talkYourAccountManager: 'Chat with your account manager.', @@ -4153,8 +4089,6 @@ const translations = { return 'Xero'; case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: return 'NetSuite'; - case CONST.POLICY.CONNECTIONS.NAME.NSQS: - return 'NSQS'; case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT: return 'Sage Intacct'; default: { @@ -4189,8 +4123,6 @@ const translations = { return "Can't connect to Xero."; case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: return "Can't connect to NetSuite."; - case CONST.POLICY.CONNECTIONS.NAME.NSQS: - return "Can't connect to NSQS."; case CONST.POLICY.CONNECTIONS.NAME.QBD: return "Can't connect to QuickBooks Desktop."; default: { @@ -4318,7 +4250,6 @@ const translations = { case 'netSuiteSyncData': return 'Importing data into Expensify'; case 'netSuiteSyncAccounts': - case 'nsqsSyncAccounts': return 'Syncing accounts'; case 'netSuiteSyncCurrencies': return 'Syncing currencies'; @@ -4345,16 +4276,6 @@ const translations = { case 'netSuiteSyncImportVendors': case 'quickbooksDesktopImportVendors': return 'Importing vendors'; - case 'nsqsSyncConnection': - return 'Initializing connection to NSQS'; - case 'nsqsSyncEmployees': - return 'Syncing employees'; - case 'nsqsSyncCustomers': - return 'Syncing customers'; - case 'nsqsSyncProjects': - return 'Syncing projects'; - case 'nsqsSyncCurrency': - return 'Syncing currency'; case 'intacctCheckConnection': return 'Checking Sage Intacct connection'; case 'intacctImportDimensions': diff --git a/src/languages/es.ts b/src/languages/es.ts index 33b62a5eb8d46..8196bcf7733c4 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3486,69 +3486,6 @@ const translations = { }, }, }, - nsqs: { - setup: { - title: 'NSQS configuración', - description: 'Introduce tu ID de NSQS', - formInputs: { - netSuiteAccountID: 'ID de Cuenta NSQS', - }, - }, - import: { - expenseCategories: 'Categorías de gastos', - expenseCategoriesDescription: 'Las categorías de gastos de NSQS se importan a Expensify como categorías.', - importTypes: { - [CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.TAG]: { - label: 'Etiquetas', - description: 'Nivel de línea de pedido', - }, - [CONST.NSQS_INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: { - label: 'Campos de informe', - description: 'Nivel de informe', - }, - }, - importFields: { - customers: { - title: 'Clientes', - subtitle: 'Elige cómo gestionar los *clientes* de NSQS en Expensify.', - }, - projects: { - title: 'Proyectos', - subtitle: 'Elige cómo gestionar los *proyectos* de NSQS en Expensify.', - }, - }, - }, - export: { - description: 'Configura cómo se exportan los datos de Expensify a NSQS.', - exportDate: { - label: 'Fecha de exportación', - description: 'Usa esta fecha al exportar informe a NSQS.', - values: { - [CONST.NSQS_EXPORT_DATE.LAST_EXPENSE]: { - label: 'Fecha del último gasto', - description: 'Fecha del gasto mas reciente en el informe.', - }, - [CONST.NSQS_EXPORT_DATE.EXPORTED]: { - label: 'Fecha de exportación', - description: 'Fecha de exportación del informe a NSQS.', - }, - [CONST.NSQS_EXPORT_DATE.SUBMITTED]: { - label: 'Fecha de envío', - description: 'Fecha en la que el informe se envió para su aprobación.', - }, - }, - }, - expense: 'Gasto', - reimbursableExpenses: 'Exportar gastos reembolsables como', - nonReimbursableExpenses: 'Exportar gastos no reembolsables como', - defaultPaymentAccount: 'Preferencia predeterminada de NSQS', - paymentAccount: 'Cuenta de pago', - paymentAccountDescription: 'Elige la cuenta que se utilizará como cuenta de pago para las transacciones NSQS.', - }, - advanced: { - autoSyncDescription: 'Sincroniza NSQS y Expensify automáticamente, todos los días. Exporta el informe finalizado en tiempo real', - }, - }, intacct: { sageIntacctSetup: 'Sage Intacct configuración', prerequisitesTitle: 'Antes de conectar...', @@ -4148,7 +4085,6 @@ const translations = { qbd: 'QuickBooks Desktop', xero: 'Xero', netsuite: 'NetSuite', - nsqs: 'NSQS', intacct: 'Sage Intacct', talkYourOnboardingSpecialist: 'Chatea con tu especialista asignado.', talkYourAccountManager: 'Chatea con tu gestor de cuenta.', @@ -4162,8 +4098,6 @@ const translations = { return 'Xero'; case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: return 'NetSuite'; - case CONST.POLICY.CONNECTIONS.NAME.NSQS: - return 'NSQS'; case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT: return 'Sage Intacct'; default: { @@ -4197,8 +4131,6 @@ const translations = { return 'No se puede conectar a Xero.'; case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: return 'No se puede conectar a NetSuite.'; - case CONST.POLICY.CONNECTIONS.NAME.NSQS: - return 'No se puede conectar a NSQS.'; case CONST.POLICY.CONNECTIONS.NAME.QBD: return 'No se puede conectar a QuickBooks Desktop.'; default: { @@ -4326,7 +4258,6 @@ const translations = { case 'netSuiteSyncData': return 'Importando datos a Expensify'; case 'netSuiteSyncAccounts': - case 'nsqsSyncAccounts': return 'Sincronizando cuentas'; case 'netSuiteSyncCurrencies': return 'Sincronizando divisas'; @@ -4347,16 +4278,6 @@ const translations = { case 'netSuiteSyncImportVendors': case 'quickbooksDesktopImportVendors': return 'Importando proveedores'; - case 'nsqsSyncConnection': - return 'Iniciando conexión a NSQS'; - case 'nsqsSyncEmployees': - return 'Sincronizando empleados'; - case 'nsqsSyncCustomers': - return 'Sincronizando clientes'; - case 'nsqsSyncProjects': - return 'Sincronizando proyectos'; - case 'nsqsSyncCurrency': - return 'Sincronizando moneda'; case 'netSuiteSyncExpensifyReimbursedReports': return 'Marcando facturas y recibos de NetSuite como pagados'; case 'netSuiteImportVendorsTitle': diff --git a/src/libs/API/parameters/ConnectPolicyToNSQSParams.ts b/src/libs/API/parameters/ConnectPolicyToNSQSParams.ts deleted file mode 100644 index 16a7b93b116d6..0000000000000 --- a/src/libs/API/parameters/ConnectPolicyToNSQSParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -type ConnectPolicyToNSQSParams = { - policyID: string; - netSuiteAccountID: string; -}; - -export default ConnectPolicyToNSQSParams; diff --git a/src/libs/API/parameters/SyncPolicyToNSQSParams.ts b/src/libs/API/parameters/SyncPolicyToNSQSParams.ts deleted file mode 100644 index aa867403586dd..0000000000000 --- a/src/libs/API/parameters/SyncPolicyToNSQSParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -type SyncPolicyToNSQSParams = { - policyID: string; - netSuiteAccountID: string; - idempotencyKey: string; -}; - -export default SyncPolicyToNSQSParams; diff --git a/src/libs/API/parameters/UpdateNSQSAutoSyncParams.ts b/src/libs/API/parameters/UpdateNSQSAutoSyncParams.ts deleted file mode 100644 index eda70db5027b8..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSAutoSyncParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -type UpdateNSQSAutoSyncParams = { - policyID: string; - enabled: boolean; -}; - -export default UpdateNSQSAutoSyncParams; diff --git a/src/libs/API/parameters/UpdateNSQSCustomersMappingParams.ts b/src/libs/API/parameters/UpdateNSQSCustomersMappingParams.ts deleted file mode 100644 index 2d4dfaa288620..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSCustomersMappingParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type {ValueOf} from 'type-fest'; -import type CONST from '@src/CONST'; - -type UpdateNSQSCustomersMappingParams = { - policyID: string; - mapping: ValueOf; -}; - -export default UpdateNSQSCustomersMappingParams; diff --git a/src/libs/API/parameters/UpdateNSQSExportDateParams.ts b/src/libs/API/parameters/UpdateNSQSExportDateParams.ts deleted file mode 100644 index 56aaca69472b2..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSExportDateParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type {ValueOf} from 'type-fest'; -import type CONST from '@src/CONST'; - -type UpdateNSQSExportDateParams = { - policyID: string; - value: ValueOf; -}; - -export default UpdateNSQSExportDateParams; diff --git a/src/libs/API/parameters/UpdateNSQSExporterParams.ts b/src/libs/API/parameters/UpdateNSQSExporterParams.ts deleted file mode 100644 index 73ef027d180b6..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSExporterParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -type UpdateNSQSExporterParams = { - policyID: string; - email: string; -}; - -export default UpdateNSQSExporterParams; diff --git a/src/libs/API/parameters/UpdateNSQSPaymentAccountParams.ts b/src/libs/API/parameters/UpdateNSQSPaymentAccountParams.ts deleted file mode 100644 index 101b54cdb96f5..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSPaymentAccountParams.ts +++ /dev/null @@ -1,6 +0,0 @@ -type UpdateNSQSPaymentAccountParams = { - policyID: string; - value: string; -}; - -export default UpdateNSQSPaymentAccountParams; diff --git a/src/libs/API/parameters/UpdateNSQSProjectsMappingParams.ts b/src/libs/API/parameters/UpdateNSQSProjectsMappingParams.ts deleted file mode 100644 index ee1be53150abe..0000000000000 --- a/src/libs/API/parameters/UpdateNSQSProjectsMappingParams.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type {ValueOf} from 'type-fest'; -import type CONST from '@src/CONST'; - -type UpdateNSQSProjectsMappingParams = { - policyID: string; - mapping: ValueOf; -}; - -export default UpdateNSQSProjectsMappingParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 7ab1ab36f86ec..fe6ab289d32d2 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -277,14 +277,6 @@ export type {default as RequestExpensifyCardLimitIncreaseParams} from './Request export type {default as UpdateNetSuiteGenericTypeParams} from './UpdateNetSuiteGenericTypeParams'; export type {default as CancelBillingSubscriptionParams} from './CancelBillingSubscriptionParams'; export type {default as UpdateNetSuiteCustomFormIDParams} from './UpdateNetSuiteCustomFormIDParams'; -export type {default as ConnectPolicyToNSQSParams} from './ConnectPolicyToNSQSParams'; -export type {default as SyncPolicyToNSQSParams} from './SyncPolicyToNSQSParams'; -export type {default as UpdateNSQSCustomersMappingParams} from './UpdateNSQSCustomersMappingParams'; -export type {default as UpdateNSQSProjectsMappingParams} from './UpdateNSQSProjectsMappingParams'; -export type {default as UpdateNSQSExporterParams} from './UpdateNSQSExporterParams'; -export type {default as UpdateNSQSExportDateParams} from './UpdateNSQSExportDateParams'; -export type {default as UpdateNSQSAutoSyncParams} from './UpdateNSQSAutoSyncParams'; -export type {default as UpdateNSQSPaymentAccountParams} from './UpdateNSQSPaymentAccountParams'; export type {default as UpdateSageIntacctGenericTypeParams} from './UpdateSageIntacctGenericTypeParams'; export type {default as UpdateNetSuiteCustomersJobsParams} from './UpdateNetSuiteCustomersJobsParams'; export type {default as CopyExistingPolicyConnectionParams} from './CopyExistingPolicyConnectionParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index c6abb1b881af9..f1e07f5ede439 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -373,13 +373,6 @@ const WRITE_COMMANDS = { UPDATE_NETSUITE_APPROVAL_ACCOUNT: 'UpdateNetSuiteApprovalAccount', UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsReimbursable', UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsNonReimbursable', - CONNECT_POLICY_TO_NSQS: 'ConnectPolicyToNSQS', - UPDATE_NSQS_CUSTOMERS_MAPPING: 'UpdateNSQSCustomersMapping', - UPDATE_NSQS_PROJECTS_MAPPING: 'UpdateNSQSProjectsMapping', - UPDATE_NSQS_EXPORTER: 'UpdateNSQSExporter', - UPDATE_NSQS_EXPORT_DATE: 'UpdateNSQSExportDate', - UPDATE_NSQS_AUTO_SYNC: 'UpdateNSQSAutoSync', - UPDATE_NSQS_PAYMENT_ACCOUNT: 'UpdateNSQSPaymentAccount', REQUEST_EXPENSIFY_CARD_LIMIT_INCREASE: 'RequestExpensifyCardLimitIncrease', CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct', COPY_EXISTING_POLICY_CONNECTION: 'CopyExistingPolicyConnection', @@ -875,13 +868,6 @@ type WriteCommandParameters = { [WRITE_COMMANDS.UPDATE_NETSUITE_APPROVAL_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'value', string>; [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams; [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams; - [WRITE_COMMANDS.CONNECT_POLICY_TO_NSQS]: Parameters.ConnectPolicyToNSQSParams; - [WRITE_COMMANDS.UPDATE_NSQS_CUSTOMERS_MAPPING]: Parameters.UpdateNSQSCustomersMappingParams; - [WRITE_COMMANDS.UPDATE_NSQS_PROJECTS_MAPPING]: Parameters.UpdateNSQSProjectsMappingParams; - [WRITE_COMMANDS.UPDATE_NSQS_EXPORTER]: Parameters.UpdateNSQSExporterParams; - [WRITE_COMMANDS.UPDATE_NSQS_EXPORT_DATE]: Parameters.UpdateNSQSExportDateParams; - [WRITE_COMMANDS.UPDATE_NSQS_AUTO_SYNC]: Parameters.UpdateNSQSAutoSyncParams; - [WRITE_COMMANDS.UPDATE_NSQS_PAYMENT_ACCOUNT]: Parameters.UpdateNSQSPaymentAccountParams; [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_ENTITY]: Parameters.UpdateSageIntacctGenericTypeParams<'entity', string>; [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_BILLABLE]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>; [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>; @@ -948,7 +934,6 @@ const READ_COMMANDS = { SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline', SYNC_POLICY_TO_XERO: 'SyncPolicyToXero', SYNC_POLICY_TO_NETSUITE: 'SyncPolicyToNetSuite', - SYNC_POLICY_TO_NSQS: 'SyncPolicyToNSQS', SYNC_POLICY_TO_SAGE_INTACCT: 'SyncPolicyToSageIntacct', SYNC_POLICY_TO_QUICKBOOKS_DESKTOP: 'SyncPolicyToQuickbooksDesktop', OPEN_REIMBURSEMENT_ACCOUNT_PAGE: 'OpenReimbursementAccountPage', @@ -1017,7 +1002,6 @@ type ReadCommandParameters = { [READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE]: Parameters.SyncPolicyToQuickbooksOnlineParams; [READ_COMMANDS.SYNC_POLICY_TO_XERO]: Parameters.SyncPolicyToXeroParams; [READ_COMMANDS.SYNC_POLICY_TO_NETSUITE]: Parameters.SyncPolicyToNetSuiteParams; - [READ_COMMANDS.SYNC_POLICY_TO_NSQS]: Parameters.SyncPolicyToNSQSParams; [READ_COMMANDS.SYNC_POLICY_TO_SAGE_INTACCT]: Parameters.SyncPolicyToNetSuiteParams; [READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_DESKTOP]: Parameters.SyncPolicyToQuickbooksDesktopParams; [READ_COMMANDS.OPEN_REIMBURSEMENT_ACCOUNT_PAGE]: Parameters.OpenReimbursementAccountPageParams; diff --git a/src/libs/AccountingUtils.ts b/src/libs/AccountingUtils.ts index 6f1023a1c1363..7516048241d6a 100644 --- a/src/libs/AccountingUtils.ts +++ b/src/libs/AccountingUtils.ts @@ -7,7 +7,6 @@ const ROUTE_NAME_MAPPING = { [CONST.POLICY.CONNECTIONS.ROUTE.XERO]: CONST.POLICY.CONNECTIONS.NAME.XERO, [CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT, [CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE]: CONST.POLICY.CONNECTIONS.NAME.NETSUITE, - [CONST.POLICY.CONNECTIONS.ROUTE.NSQS]: CONST.POLICY.CONNECTIONS.NAME.NSQS, [CONST.POLICY.CONNECTIONS.ROUTE.QBD]: CONST.POLICY.CONNECTIONS.NAME.QBD, }; @@ -16,7 +15,6 @@ const NAME_ROUTE_MAPPING = { [CONST.POLICY.CONNECTIONS.NAME.XERO]: CONST.POLICY.CONNECTIONS.ROUTE.XERO, [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT, [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE, - [CONST.POLICY.CONNECTIONS.NAME.NSQS]: CONST.POLICY.CONNECTIONS.ROUTE.NSQS, [CONST.POLICY.CONNECTIONS.NAME.QBD]: CONST.POLICY.CONNECTIONS.ROUTE.QBD, }; diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 5bb4659b2d09d..7f623ce95119a 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -510,20 +510,6 @@ const SettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteAutoSyncPage').default, [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ACCOUNTING_METHOD]: () => require('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteAccountingMethodPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_SETUP]: () => require('../../../../pages/workspace/accounting/nsqs/NSQSSetupPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT]: () => require('../../../../pages/workspace/accounting/nsqs/import/NSQSImportPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS]: () => require('../../../../pages/workspace/accounting/nsqs/import/NSQSCustomersPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS]: () => - require('../../../../pages/workspace/accounting/nsqs/import/NSQSCustomersDisplayedAsPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS]: () => require('../../../../pages/workspace/accounting/nsqs/import/NSQSProjectsPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS_DISPLAYED_AS]: () => - require('../../../../pages/workspace/accounting/nsqs/import/NSQSProjectsDisplayedAsPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT]: () => require('../../../../pages/workspace/accounting/nsqs/export/NSQSExportPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PREFERRED_EXPORTER]: () => - require('../../../../pages/workspace/accounting/nsqs/export/NSQSPreferredExporterPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_DATE]: () => require('../../../../pages/workspace/accounting/nsqs/export/NSQSDatePage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PAYMENT_ACCOUNT]: () => require('../../../../pages/workspace/accounting/nsqs/export/NSQSPaymentAccountPage').default, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_ADVANCED]: () => require('../../../../pages/workspace/accounting/nsqs/advanced/NSQSAdvancedPage').default, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require('../../../../pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage').default, [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () => require('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default, diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts index 8786bd973ec54..364afbcdeca45 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts @@ -126,17 +126,6 @@ const WORKSPACE_TO_RHP: Partial['config'] = { [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ACCOUNTING_METHOD]: { path: ROUTES.POLICY_ACCOUNTING_NETSUITE_ACCOUNTING_METHOD.route, }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_SETUP]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_SETUP.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT_CUSTOMERS.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT_PROJECTS.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS_DISPLAYED_AS]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_IMPORT_PROJECTS_DISPLAYED_AS.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_EXPORT.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PREFERRED_EXPORTER]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_EXPORT_PREFERRED_EXPORTER.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_DATE]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_EXPORT_DATE.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PAYMENT_ACCOUNT]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_EXPORT_PAYMENT_ACCOUNT.route, - }, - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_ADVANCED]: { - path: ROUTES.POLICY_ACCOUNTING_NSQS_ADVANCED.route, - }, [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route}, [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.route}, [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.route}, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index a652eef69f019..54e40a49b9d18 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -684,39 +684,6 @@ type SettingsNavigatorParamList = { policyID: string; expenseType: ValueOf; }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_SETUP]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_CUSTOMERS_DISPLAYED_AS]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_IMPORT_PROJECTS_DISPLAYED_AS]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PREFERRED_EXPORTER]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_DATE]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_EXPORT_PAYMENT_ACCOUNT]: { - policyID: string; - }; - [SCREENS.WORKSPACE.ACCOUNTING.NSQS_ADVANCED]: { - policyID: string; - }; [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: { policyID: string; }; diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 635e996c322fc..b7b2b8e167d49 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -46,10 +46,6 @@ function canUseInternationalBankAccount(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.NEWDOT_INTERNATIONAL_DEPOSIT_BANK_ACCOUNT) || canUseAllBetas(betas); } -function canUseNSQS(betas: OnyxEntry): boolean { - return !!betas?.includes(CONST.BETAS.NSQS) || canUseAllBetas(betas); -} - function canUseCustomRules(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.CUSTOM_RULES) || canUseAllBetas(betas); } @@ -68,7 +64,6 @@ export default { canUseMergeAccounts, canUseManagerMcTest, canUseInternationalBankAccount, - canUseNSQS, canUseCustomRules, canUseTableReportView, }; diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index 54a43f360b77c..764d3b9a18eb8 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -1018,10 +1018,6 @@ function getIntegrationLastSuccessfulDate(connection?: Connections[keyof Connect return syncSuccessfulDate; } -function getNSQSCompanyID(policy: Policy) { - return policy.connections?.netsuiteQuickStart?.config?.credentials?.companyID; -} - function getCurrentSageIntacctEntityName(policy: Policy | undefined, defaultNameIfNoEntity: string): string | undefined { const currentEntityID = policy?.connections?.intacct?.config?.entity; if (!currentEntityID) { @@ -1370,7 +1366,6 @@ function isPrefferedExporter(policy: Policy) { const exporters = [ policy.connections?.intacct?.config?.export?.exporter, policy.connections?.netsuite?.options?.config?.exporter, - policy.connections?.netsuiteQuickStart?.config?.exporter, policy.connections?.quickbooksDesktop?.config?.export?.exporter, policy.connections?.quickbooksOnline?.config?.export?.exporter, policy.connections?.xero?.config?.export?.exporter, @@ -1383,7 +1378,6 @@ function isAutoSyncEnabled(policy: Policy) { const values = [ policy.connections?.intacct?.config?.autoSync?.enabled, policy.connections?.netsuite?.config?.autoSync?.enabled, - policy.connections?.netsuiteQuickStart?.config?.autoSync?.enabled, policy.connections?.quickbooksDesktop?.config?.autoSync?.enabled, policy.connections?.quickbooksOnline?.config?.autoSync?.enabled, policy.connections?.xero?.config?.autoSync?.enabled, @@ -1476,7 +1470,6 @@ export { getNetSuiteReceivableAccountOptions, getNetSuiteInvoiceItemOptions, getNetSuiteTaxAccountOptions, - getNSQSCompanyID, getSageIntacctVendors, getSageIntacctNonReimbursableActiveDefaultVendor, getSageIntacctCreditCards, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 5ae8821823305..c73afaed3d0dd 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -12,7 +12,7 @@ import type {SvgProps} from 'react-native-svg'; import type {OriginalMessageChangePolicy, OriginalMessageIOU, OriginalMessageModifiedExpense} from 'src/types/onyx/OriginalMessage'; import type {SetRequired, TupleToUnion, ValueOf} from 'type-fest'; import type {FileObject} from '@components/AttachmentModal'; -import {FallbackAvatar, IntacctSquare, NetSuiteSquare, NSQSSquare, QBOSquare, XeroSquare} from '@components/Icon/Expensicons'; +import {FallbackAvatar, IntacctSquare, NetSuiteSquare, QBOSquare, XeroSquare} from '@components/Icon/Expensicons'; import * as defaultGroupAvatars from '@components/Icon/GroupDefaultAvatars'; import * as defaultWorkspaceAvatars from '@components/Icon/WorkspaceDefaultAvatars'; import type {MoneyRequestAmountInputProps} from '@components/MoneyRequestAmountInput'; @@ -9198,9 +9198,6 @@ function getIntegrationIcon(connectionName?: ConnectionName) { if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) { return NetSuiteSquare; } - if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NSQS) { - return NSQSSquare; - } if (connectionName === CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT) { return IntacctSquare; } diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 14ed72f8ca6b9..8cfaea5d6aab6 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -727,10 +727,6 @@ function clearNetSuiteAutoSyncErrorField(policyID: string) { Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {netsuite: {config: {errorFields: {autoSync: null}}}}}); } -function clearNSQSErrorField(policyID: string, fieldName: string) { - Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {netsuiteQuickStart: {config: {errorFields: {[fieldName]: null}}}}}); -} - function setWorkspaceReimbursement(policyID: string, reimbursementChoice: ValueOf, reimburserEmail: string) { const policy = getPolicy(policyID); @@ -5012,7 +5008,6 @@ export { updateWorkspaceDescription, setWorkspacePayer, setWorkspaceReimbursement, - clearNSQSErrorField, openPolicyWorkflowsPage, enableCompanyCards, enablePolicyConnections, diff --git a/src/libs/actions/connections/NSQS.ts b/src/libs/actions/connections/NSQS.ts deleted file mode 100644 index 6a471cdb5c2ef..0000000000000 --- a/src/libs/actions/connections/NSQS.ts +++ /dev/null @@ -1,187 +0,0 @@ -import Onyx from 'react-native-onyx'; -import type {OnyxUpdate} from 'react-native-onyx'; -import type {PartialDeep, ValueOf} from 'type-fest'; -import * as API from '@libs/API'; -import type {ConnectPolicyToNSQSParams} from '@libs/API/parameters'; -import {WRITE_COMMANDS} from '@libs/API/types'; -import * as ErrorUtils from '@libs/ErrorUtils'; -import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; -import type {Connections} from '@src/types/onyx/Policy'; - -function connectPolicyToNSQS(policyID: string, nsqsAccountID: string) { - const optimisticData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`, - value: { - stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NSQS_SYNC_CONNECTION, - connectionName: CONST.POLICY.CONNECTIONS.NAME.NSQS, - timestamp: new Date().toISOString(), - }, - }, - ]; - - const params: ConnectPolicyToNSQSParams = { - policyID, - netSuiteAccountID: nsqsAccountID, - }; - - API.write(WRITE_COMMANDS.CONNECT_POLICY_TO_NSQS, params, {optimisticData}); -} - -function buildOnyxDataForNSQSConfiguration( - policyID: string, - settingName: TSettingName, - settingValue: PartialDeep, - oldSettingValue: PartialDeep, - fieldName: string, -) { - const optimisticData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - connections: { - [CONST.POLICY.CONNECTIONS.NAME.NSQS]: { - config: { - [settingName]: settingValue ?? null, - pendingFields: { - [fieldName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, - }, - errorFields: { - [fieldName]: null, - }, - }, - }, - }, - }, - }, - ]; - - const failureData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - connections: { - [CONST.POLICY.CONNECTIONS.NAME.NSQS]: { - config: { - [settingName]: oldSettingValue ?? null, - pendingFields: { - [fieldName]: null, - }, - errorFields: { - [fieldName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), - }, - }, - }, - }, - }, - }, - ]; - - const successData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - connections: { - [CONST.POLICY.CONNECTIONS.NAME.NSQS]: { - config: { - pendingFields: { - [fieldName]: null, - }, - }, - }, - }, - }, - }, - ]; - - return { - optimisticData, - failureData, - successData, - }; -} - -function updateNSQSCustomersMapping(policyID: string, mapping: ValueOf, oldMapping: ValueOf) { - const onyxData = buildOnyxDataForNSQSConfiguration( - policyID, - 'syncOptions', - {mapping: {customers: mapping}}, - {mapping: {customers: oldMapping}}, - CONST.NSQS_CONFIG.SYNC_OPTIONS.MAPPING.CUSTOMERS, - ); - - const params = { - policyID, - mapping, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_CUSTOMERS_MAPPING, params, onyxData); -} - -function updateNSQSProjectsMapping(policyID: string, mapping: ValueOf, oldMapping: ValueOf) { - const onyxData = buildOnyxDataForNSQSConfiguration( - policyID, - 'syncOptions', - {mapping: {projects: mapping}}, - {mapping: {projects: oldMapping}}, - CONST.NSQS_CONFIG.SYNC_OPTIONS.MAPPING.PROJECTS, - ); - - const params = { - policyID, - mapping, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_PROJECTS_MAPPING, params, onyxData); -} - -function updateNSQSExporter(policyID: string, email: string, oldEmail: string) { - const onyxData = buildOnyxDataForNSQSConfiguration(policyID, 'exporter', email, oldEmail, CONST.NSQS_CONFIG.EXPORTER); - - const params = { - policyID, - email, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_EXPORTER, params, onyxData); -} - -function updateNSQSExportDate(policyID: string, value: ValueOf, oldValue: ValueOf) { - const onyxData = buildOnyxDataForNSQSConfiguration(policyID, 'exportDate', value, oldValue, CONST.NSQS_CONFIG.EXPORT_DATE); - - const params = { - policyID, - value, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_EXPORT_DATE, params, onyxData); -} - -function updateNSQSAutoSync(policyID: string, enabled: boolean) { - const onyxData = buildOnyxDataForNSQSConfiguration(policyID, 'autoSync', {enabled}, {enabled: !enabled}, CONST.NSQS_CONFIG.AUTO_SYNC); - - const params = { - policyID, - enabled, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_AUTO_SYNC, params, onyxData); -} - -function updateNSQSPaymentAccount(policyID: string, value: string, oldValue: string) { - const onyxData = buildOnyxDataForNSQSConfiguration(policyID, 'paymentAccount', value, oldValue, CONST.NSQS_CONFIG.PAYMENT_ACCOUNT); - - const params = { - policyID, - value, - }; - - API.write(WRITE_COMMANDS.UPDATE_NSQS_PAYMENT_ACCOUNT, params, onyxData); -} - -export {connectPolicyToNSQS, updateNSQSCustomersMapping, updateNSQSProjectsMapping, updateNSQSExporter, updateNSQSExportDate, updateNSQSAutoSync, updateNSQSPaymentAccount}; diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts index f15f0d6996d05..c0215e91838a9 100644 --- a/src/libs/actions/connections/index.ts +++ b/src/libs/actions/connections/index.ts @@ -5,7 +5,6 @@ import Onyx from 'react-native-onyx'; import * as API from '@libs/API'; import type { RemovePolicyConnectionParams, - SyncPolicyToNSQSParams, SyncPolicyToQuickbooksDesktopParams, UpdateManyPolicyConnectionConfigurationsParams, UpdatePolicyConnectionConfigParams, @@ -13,7 +12,6 @@ import type { import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as ErrorUtils from '@libs/ErrorUtils'; import * as PolicyUtils from '@libs/PolicyUtils'; -import {getNSQSCompanyID} from '@libs/PolicyUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type * as OnyxCommon from '@src/types/onyx/OnyxCommon'; @@ -207,9 +205,6 @@ function getSyncConnectionParameters(connectionName: PolicyConnectionName) { case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: { return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_NETSUITE, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NETSUITE_SYNC_CONNECTION}; } - case CONST.POLICY.CONNECTIONS.NAME.NSQS: { - return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_NSQS, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NSQS_SYNC_CONNECTION}; - } case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT: { return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_SAGE_INTACCT, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.SAGE_INTACCT_SYNC_CHECK_CONNECTION}; } @@ -258,7 +253,7 @@ function syncConnection(policy: Policy | undefined, connectionName: PolicyConnec }, ]; - const parameters: SyncPolicyToQuickbooksDesktopParams | SyncPolicyToNSQSParams = { + const parameters: SyncPolicyToQuickbooksDesktopParams = { policyID, idempotencyKey: policyID, }; @@ -266,9 +261,6 @@ function syncConnection(policy: Policy | undefined, connectionName: PolicyConnec if (connectionName === CONST.POLICY.CONNECTIONS.NAME.QBD) { parameters.forceDataRefresh = forceDataRefresh; } - if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NSQS) { - (parameters as SyncPolicyToNSQSParams).netSuiteAccountID = getNSQSCompanyID(policy) ?? ''; - } API.read(syncConnectionData.readCommand, parameters, { optimisticData, diff --git a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx b/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx deleted file mode 100644 index adaaf0d475daa..0000000000000 --- a/src/pages/workspace/accounting/MultiConnectionSelectorPage.tsx +++ /dev/null @@ -1,127 +0,0 @@ -import React, {useMemo} from 'react'; -import {View} from 'react-native'; -import {useOnyx} from 'react-native-onyx'; -import type {ValueOf} from 'type-fest'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; -import MenuItemList from '@components/MenuItemList'; -import ScreenWrapper from '@components/ScreenWrapper'; -import Text from '@components/Text'; -import useLocalize from '@hooks/useLocalize'; -import usePermissions from '@hooks/usePermissions'; -import useThemeStyles from '@hooks/useThemeStyles'; -import {getConnectionNameFromRouteParam} from '@libs/AccountingUtils'; -import {getConnectedIntegration} from '@libs/PolicyUtils'; -import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; -import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; -import withPolicyConnections from '@pages/workspace/withPolicyConnections'; -import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; -import {AccountingContextProvider, useAccountingContext} from './AccountingContext'; -import type {MenuItemData} from './types'; -import {getAccountingIntegrationData} from './utils'; - -type MultiConnectionSelectorPageProps = WithPolicyConnectionsProps & { - route: { - params: { - connection: ValueOf; - }; - }; -}; - -function MultiConnectionSelectorPage({policy, route}: MultiConnectionSelectorPageProps) { - const policyID = policy?.id; - - const {canUseNSQS} = usePermissions(); - - const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policy?.id}`); - const connectedIntegration = getConnectedIntegration(policy) ?? connectionSyncProgress?.connectionName; - const multiConnectionName = getConnectionNameFromRouteParam(route.params.connection); - - const {translate} = useLocalize(); - const styles = useThemeStyles(); - - const {startIntegrationFlow, popoverAnchorRefs} = useAccountingContext(); - - const integrations = useMemo(() => CONST.POLICY.CONNECTIONS.MULTI_CONNECTIONS_MAPPING_INVERTED[multiConnectionName] ?? [], [multiConnectionName]); - - const connectionsMenuItems: MenuItemData[] = useMemo( - () => - policyID - ? (integrations - .map((integration) => { - const integrationData = getAccountingIntegrationData(integration, policyID, translate); - if (!integrationData) { - return undefined; - } - - const connectionsMenuItem: MenuItemData = { - title: integrationData.title, - icon: integrationData.icon, - iconType: CONST.ICON_TYPE_AVATAR, - shouldShowRightIcon: true, - onPress: () => { - startIntegrationFlow({ - name: integration, - integrationToDisconnect: connectedIntegration, - shouldDisconnectIntegrationBeforeConnecting: connectedIntegration ? true : undefined, - }); - }, - ref: (ref) => { - if (!popoverAnchorRefs?.current) { - return; - } - - // eslint-disable-next-line react-compiler/react-compiler - popoverAnchorRefs.current[integration].current = ref; - }, - }; - - return connectionsMenuItem; - }) - .filter(Boolean) as MenuItemData[]) - : [], - [integrations, connectedIntegration, policyID, startIntegrationFlow, popoverAnchorRefs, translate], - ); - - // The multi connector is currently only used for NSQS (which is behind beta) - const shouldBeBlocked = !canUseNSQS || !connectionsMenuItems.length; - - return ( - - - - - {translate(`workspace.multiConnectionSelector.description`, {connectionName: multiConnectionName})} - - - - - ); -} - -function MultiConnectionSelectorPageeWrapper(props: MultiConnectionSelectorPageProps) { - return ( - - - - ); -} - -MultiConnectionSelectorPage.displayName = 'MultiConnectionSelectorPage'; - -export default withPolicyConnections(MultiConnectionSelectorPageeWrapper); diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index a3384bd2bbd51..0fb542512dc2e 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -30,7 +30,6 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; -import {getRouteParamForConnection} from '@libs/AccountingUtils'; import {isAuthenticationError, isConnectionInProgress, isConnectionUnverified, removePolicyConnection, syncConnection} from '@libs/actions/connections'; import {getAssignedSupportData} from '@libs/actions/Policy/Policy'; import {isExpensifyCardFullySetUp} from '@libs/CardUtils'; @@ -75,7 +74,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const styles = useThemeStyles(); const {translate, datetimeToRelative: getDatetimeToRelative} = useLocalize(); const {isOffline} = useNetwork(); - const {canUseNetSuiteUSATax, canUseNSQS} = usePermissions(); + const {canUseNetSuiteUSATax} = usePermissions(); const {windowWidth} = useWindowDimensions(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState({horizontal: 0, vertical: 0}); @@ -94,12 +93,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const isSyncInProgress = isConnectionInProgress(connectionSyncProgress, policy); const connectionNames = CONST.POLICY.CONNECTIONS.NAME; - const accountingIntegrations = Object.values(connectionNames).filter((integration) => { - if (integration === CONST.POLICY.CONNECTIONS.NAME.NSQS && !canUseNSQS) { - return false; - } - return true; - }); + const accountingIntegrations = Object.values(connectionNames); const connectedIntegration = getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName; const synchronizationError = connectedIntegration && getSynchronizationErrorMessage(policy, connectedIntegration, isSyncInProgress, translate, styles); @@ -285,14 +279,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { return undefined; } - const designatedDisplayConnection = CONST.POLICY.CONNECTIONS.MULTI_CONNECTIONS_MAPPING[integration]; - - // The multi connector is currently only used for NSQS (which is behind beta) - const shouldUseMultiConnectionSelector = !!canUseNSQS && !!designatedDisplayConnection; - if (shouldUseMultiConnectionSelector && designatedDisplayConnection !== integration) { - return; - } - const iconProps = integrationData?.icon ? { icon: integrationData.icon, @@ -308,15 +294,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { title: integrationData?.title, rightComponent: (