From a5ad71217d9342b88ad0150515f3ab90ba652f4e Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Mon, 30 Mar 2026 16:12:53 +0200 Subject: [PATCH] Remove policyID param from goBackWhenEnableFeature and use Navigation.goBack() without args --- src/libs/PolicyUtils.ts | 4 ++-- src/libs/actions/Policy/Category.ts | 2 +- src/libs/actions/Policy/DistanceRate.ts | 2 +- src/libs/actions/Policy/PerDiem.ts | 2 +- src/libs/actions/Policy/Policy.ts | 18 +++++++++--------- src/libs/actions/Policy/Tag.ts | 2 +- src/libs/actions/Policy/Travel.ts | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index e2126652abf4..69e559f50364 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -1650,9 +1650,9 @@ function removePendingFieldsFromCustomUnit(customUnit: CustomUnit): CustomUnit { return cleanedCustomUnit; } -function goBackWhenEnableFeature(policyID: string) { +function goBackWhenEnableFeature() { setTimeout(() => { - Navigation.goBack(ROUTES.WORKSPACE_INITIAL.getRoute(policyID)); + Navigation.goBack(); }, CONST.WORKSPACE_ENABLE_FEATURE_REDIRECT_DELAY); } diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts index a0fe3aeda0dc..0af179cef5b9 100644 --- a/src/libs/actions/Policy/Category.ts +++ b/src/libs/actions/Policy/Category.ts @@ -1448,7 +1448,7 @@ function enablePolicyCategories(policyData: PolicyData, enabled: boolean, should API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData); if (enabled && getIsNarrowLayout() && shouldGoBack) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts index e3517a3fe3b6..762e0030cf7a 100644 --- a/src/libs/actions/Policy/DistanceRate.ts +++ b/src/libs/actions/Policy/DistanceRate.ts @@ -122,7 +122,7 @@ function enablePolicyDistanceRates(policyID: string, enabled: boolean, customUni API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } diff --git a/src/libs/actions/Policy/PerDiem.ts b/src/libs/actions/Policy/PerDiem.ts index db001948c27d..96bc3b4d7f1d 100644 --- a/src/libs/actions/Policy/PerDiem.ts +++ b/src/libs/actions/Policy/PerDiem.ts @@ -111,7 +111,7 @@ function enablePerDiem(policyID: string, enabled: boolean, customUnitID?: string API.write(WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM, parameters, onyxData); if (enabled && getIsNarrowLayout() && shouldGoBack) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 19cd0202bd29..750b8ec0fb3f 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -4422,7 +4422,7 @@ function enablePolicyConnections(policyID: string, enabled: boolean) { API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4472,7 +4472,7 @@ function enablePolicyReceiptPartners(policyID: string, enabled: boolean) { API.write(WRITE_COMMANDS.TOGGLE_RECEIPT_PARTNERS, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4530,7 +4530,7 @@ function enableExpensifyCard(policyID: string, enabled: boolean, shouldNavigateT } if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4578,7 +4578,7 @@ function enableCompanyCards(policyID: string, enabled: boolean, shouldGoBack = t API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData); if (enabled && getIsNarrowLayout() && shouldGoBack) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4743,7 +4743,7 @@ function enablePolicyTaxes(policyID: string, enabled: boolean, currentTaxRates?: API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4841,7 +4841,7 @@ function enablePolicyWorkflows( API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -4928,7 +4928,7 @@ function enablePolicyRules(policy: OnyxEntry, enabled: boolean, shouldGo API.write(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, parameters, onyxData); if (enabled && getIsNarrowLayout() && shouldGoBack) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -5038,7 +5038,7 @@ function enablePolicyInvoicing(policyID: string, enabled: boolean) { API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } @@ -5095,7 +5095,7 @@ function enablePolicyTimeTracking(policyID: string, enabled: boolean) { API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TIME_TRACKING, {policyID, enabled}, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index d7f4e8566f9c..fcf35b1c87c5 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -811,7 +811,7 @@ function enablePolicyTags(policyData: PolicyData, enabled: boolean) { API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } } diff --git a/src/libs/actions/Policy/Travel.ts b/src/libs/actions/Policy/Travel.ts index c698c39b6aed..ccc9e43e887b 100644 --- a/src/libs/actions/Policy/Travel.ts +++ b/src/libs/actions/Policy/Travel.ts @@ -58,7 +58,7 @@ function enablePolicyTravel(policyID: string, enabled: boolean) { API.writeWithNoDuplicatesEnableFeatureConflicts(WRITE_COMMANDS.ENABLE_POLICY_TRAVEL, parameters, onyxData); if (enabled && getIsNarrowLayout()) { - goBackWhenEnableFeature(policyID); + goBackWhenEnableFeature(); } }