From 36d2a793043c3c1cfde477fb3a148338337cb2de Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 23 Jul 2024 10:12:04 -0700 Subject: [PATCH 1/3] Remove Sage Intacct Beta --- src/CONST.ts | 1 - src/libs/Permissions.ts | 5 ----- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 7 +------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 586984011769..eb84e2c8cf16 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -369,7 +369,6 @@ const CONST = { REPORT_FIELDS_FEATURE: 'reportFieldsFeature', WORKSPACE_FEEDS: 'workspaceFeeds', NETSUITE_USA_TAX: 'netsuiteUsaTax', - INTACCT_ON_NEW_EXPENSIFY: 'intacctOnNewExpensify', }, BUTTON_STATES: { DEFAULT: 'default', diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index cd8c9a391198..8afe55d0112a 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -36,10 +36,6 @@ function canUseSpotnanaTravel(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.SPOTNANA_TRAVEL) || canUseAllBetas(betas); } -function canUseSageIntacctIntegration(betas: OnyxEntry): boolean { - return !!betas?.includes(CONST.BETAS.INTACCT_ON_NEW_EXPENSIFY) || canUseAllBetas(betas); -} - function canUseReportFieldsFeature(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.REPORT_FIELDS_FEATURE) || canUseAllBetas(betas); } @@ -68,7 +64,6 @@ export default { canUseP2PDistanceRequests, canUseWorkflowsDelayedSubmission, canUseSpotnanaTravel, - canUseSageIntacctIntegration, canUseReportFieldsFeature, canUseWorkspaceFeeds, canUseNetSuiteUSATax, diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 1bb26edc1961..6cf6e09c05ef 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -149,7 +149,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const styles = useThemeStyles(); const {translate, datetimeToRelative: getDatetimeToRelative} = useLocalize(); const {isOffline} = useNetwork(); - const {canUseSageIntacctIntegration} = usePermissions(); const {isSmallScreenWidth, windowWidth} = useWindowDimensions(); const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState({horizontal: 0, vertical: 0}); const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false); @@ -163,11 +162,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { isValid(lastSyncProgressDate) && differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES; - const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter( - (name) => - !(name === CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT && !canUseSageIntacctIntegration), - ); - + const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME); const connectedIntegration = PolicyUtils.getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName; const policyID = policy?.id ?? '-1'; From b642b5b5fa7d77614c0cdaf87b3660385bb8cf9d Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 30 Jul 2024 16:16:24 -0400 Subject: [PATCH 2/3] Fix conflict fix --- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 8b3ef40e5159..55a9937322e9 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -178,7 +178,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) { const styles = useThemeStyles(); const {translate, datetimeToRelative: getDatetimeToRelative} = useLocalize(); const {isOffline} = useNetwork(); - const {isSmallScreenWidth, windowWidth} = useWindowDimensions(); + const {windowWidth} = useWindowDimensions(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState({horizontal: 0, vertical: 0}); const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false); From b232938939182c21f97d5f8d20a365aeaadc04ac Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Tue, 30 Jul 2024 16:40:37 -0400 Subject: [PATCH 3/3] Fix conflicts Fic again --- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 55a9937322e9..ceaa680c6d9f 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -25,7 +25,6 @@ import ThreeDotsMenu from '@components/ThreeDotsMenu'; import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; -import usePermissions from '@hooks/usePermissions'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useTheme from '@hooks/useTheme'; import useThemeStyles from '@hooks/useThemeStyles';