From cabc7cf1bec0e52ac6e07ddc85515672bcd9b4f5 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Tue, 14 Oct 2025 13:35:20 +0300 Subject: [PATCH 1/3] Disable Categorize it and Share with my accountant options when tracking expenses --- src/libs/Permissions.ts | 8 ++++++++ src/pages/ReportDetailsPage.tsx | 3 ++- src/pages/home/report/PureReportActionItem.tsx | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 434b8647e973..7d0e831f3100 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -28,7 +28,15 @@ function isBetaEnabled(beta: Beta, betas: OnyxEntry, betaConfiguration?: return isFeatureEnabled || hasAllBetasEnabled; } +/** + * Track flows are temporarily disabled. + */ +function canUseTrackFlows(): boolean { + return false; +} + export default { canUseLinkPreviews, + canUseTrackFlows, isBetaEnabled, }; diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index c7829a699dfa..62cada0dbcf2 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -40,6 +40,7 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types'; import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils'; import Parser from '@libs/Parser'; +import Permissions from '@libs/Permissions'; import {isPolicyAdmin as isPolicyAdminUtil, isPolicyEmployee as isPolicyEmployeeUtil, shouldShowPolicy} from '@libs/PolicyUtils'; import {getOneTransactionThreadReportID, getOriginalMessage, getTrackExpenseActionableWhisper, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils'; import { @@ -425,7 +426,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail ); }, }); - if (isBetaEnabled(CONST.BETAS.TRACK_FLOWS)) { + if (Permissions.canUseTrackFlows()) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.CATEGORIZE, translationKey: 'actionableMentionTrackExpense.categorize', diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx index fbc0c14f4f00..90237ba36279 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -787,7 +787,7 @@ function PureReportActionItem({ }, ]; - if (isBetaEnabled(CONST.BETAS.TRACK_FLOWS)) { + if (Permissions.canUseTrackFlows()) { options.push( { text: 'actionableMentionTrackExpense.categorize', From 66eed22014461cd5f346102e7327efc35be22159 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Tue, 14 Oct 2025 14:32:38 +0300 Subject: [PATCH 2/3] Fix test --- src/CONST/index.ts | 1 - tests/ui/ReportDetailsPageTest.tsx | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index fd7654b5dfb2..3bac7f6c058e 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -702,7 +702,6 @@ const CONST = { GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND', IS_TRAVEL_VERIFIED: 'isTravelVerified', PLAID_COMPANY_CARDS: 'plaidCompanyCards', - TRACK_FLOWS: 'trackFlows', NEWDOT_REVERT_SPLITS: 'newDotRevertSplits', NEWDOT_UPDATE_SPLITS: 'newDotUpdateSplits', EXPENSIFY_CARD_EU_UK: 'expensifyCardEuUk', diff --git a/tests/ui/ReportDetailsPageTest.tsx b/tests/ui/ReportDetailsPageTest.tsx index 5bd07ad99fc6..c7cf43a2f945 100644 --- a/tests/ui/ReportDetailsPageTest.tsx +++ b/tests/ui/ReportDetailsPageTest.tsx @@ -44,10 +44,6 @@ describe('ReportDetailsPage', () => { }); it('self DM track options should disappear when report moved to workspace', async () => { - await act(async () => { - await Onyx.merge(ONYXKEYS.BETAS, [CONST.BETAS.TRACK_FLOWS]); - }); - const selfDMReportID = '1'; const trackExpenseReportID = '2'; const trackExpenseActionID = '123'; @@ -95,12 +91,8 @@ describe('ReportDetailsPage', () => { await waitForBatchedUpdatesWithAct(); const submitText = translateLocal('actionableMentionTrackExpense.submit'); - const categorizeText = translateLocal('actionableMentionTrackExpense.categorize'); - const shareText = translateLocal('actionableMentionTrackExpense.share'); await screen.findByText(submitText); - await screen.findByText(categorizeText); - await screen.findByText(shareText); const movedTrackExpenseReport = { ...trackExpenseReport, @@ -128,7 +120,5 @@ describe('ReportDetailsPage', () => { ); expect(screen.queryByText(submitText)).not.toBeVisible(); - expect(screen.queryByText(categorizeText)).not.toBeVisible(); - expect(screen.queryByText(shareText)).not.toBeVisible(); }); }); From fac4963b365f2759363c3b91c96fefc96914b4b4 Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Tue, 14 Oct 2025 14:48:50 +0300 Subject: [PATCH 3/3] Update test --- tests/ui/ReportDetailsPageTest.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/ui/ReportDetailsPageTest.tsx b/tests/ui/ReportDetailsPageTest.tsx index c7cf43a2f945..9ae149594a2c 100644 --- a/tests/ui/ReportDetailsPageTest.tsx +++ b/tests/ui/ReportDetailsPageTest.tsx @@ -91,9 +91,14 @@ describe('ReportDetailsPage', () => { await waitForBatchedUpdatesWithAct(); const submitText = translateLocal('actionableMentionTrackExpense.submit'); - await screen.findByText(submitText); + // Categorize and share are temporarily disabled + // const categorizeText = translateLocal('actionableMentionTrackExpense.categorize'); + // const shareText = translateLocal('actionableMentionTrackExpense.share'); + // await screen.findByText(categorizeText); + // await screen.findByText(shareText); + const movedTrackExpenseReport = { ...trackExpenseReport, parentReportID: '3', @@ -120,5 +125,9 @@ describe('ReportDetailsPage', () => { ); expect(screen.queryByText(submitText)).not.toBeVisible(); + + // Categorize and share are temporarily disabled + // expect(screen.queryByText(categorizeText)).not.toBeVisible(); + // expect(screen.queryByText(shareText)).not.toBeVisible(); }); });