From eab52fb963c0206946954754cde863d34397aeb5 Mon Sep 17 00:00:00 2001 From: Mykhailo Kravchenko Date: Wed, 19 Jun 2024 14:12:55 +0200 Subject: [PATCH] integrate reportFieldsFeature beta --- src/CONST.ts | 1 + src/libs/Permissions.ts | 5 +++++ src/pages/workspace/WorkspaceMoreFeaturesPage.tsx | 11 +++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 3d67a951111e..b56d086ecd57 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -363,6 +363,7 @@ const CONST = { SPOTNANA_TRAVEL: 'spotnanaTravel', ACCOUNTING_ON_NEW_EXPENSIFY: 'accountingOnNewExpensify', XERO_ON_NEW_EXPENSIFY: 'xeroOnNewExpensify', + REPORT_FIELDS_FEATURE: 'reportFieldsFeature', }, BUTTON_STATES: { DEFAULT: 'default', diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 7ef4c9325a14..56d366ef330d 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -48,6 +48,10 @@ function canUseXeroIntegration(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas); } +function canUseReportFieldsFeature(betas: OnyxEntry): boolean { + return !!betas?.includes(CONST.BETAS.REPORT_FIELDS_FEATURE) || canUseAllBetas(betas); +} + /** * Link previews are temporarily disabled. */ @@ -67,4 +71,5 @@ export default { canUseSpotnanaTravel, canUseAccountingIntegrations, canUseXeroIntegration, + canUseReportFieldsFeature, }; diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx index 91202ddcb6bb..1ea2872c9513 100644 --- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx +++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx @@ -56,7 +56,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro const styles = useThemeStyles(); const {isSmallScreenWidth} = useWindowDimensions(); const {translate} = useLocalize(); - const {canUseAccountingIntegrations} = usePermissions(); + const {canUseAccountingIntegrations, canUseReportFieldsFeature} = usePermissions(); const hasAccountingConnection = !!policy?.areConnectionsEnabled && !isEmptyObject(policy?.connections); const isSyncTaxEnabled = !!policy?.connections?.quickbooksOnline?.config?.syncTax || !!policy?.connections?.xero?.config?.importTaxRates; const policyID = policy?.id ?? ''; @@ -134,7 +134,10 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro Policy.enablePolicyTaxes(policy?.id ?? '-1', isEnabled); }, }, - { + ]; + + if (canUseReportFieldsFeature) { + organizeItems.push({ icon: Illustrations.Pencil, titleTranslationKey: 'workspace.moreFeatures.reportFields.title', subtitleTranslationKey: 'workspace.moreFeatures.reportFields.subtitle', @@ -152,8 +155,8 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro } setIsReportFieldsWarningModalOpen(true); }, - }, - ]; + }); + } const integrateItems: Item[] = [ {