From b5e1390c0809c90ab05d0dab7c93d69e5b1ba83d Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Fri, 18 Apr 2025 12:00:39 -0700 Subject: [PATCH 1/4] removing SwitchToOldDotOnNonMicroCompanySize folder --- .../index.desktop.ts | 6 ---- .../index.ts | 29 ------------------- .../types.ts | 5 ---- 3 files changed, 40 deletions(-) delete mode 100644 src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.desktop.ts delete mode 100644 src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.ts delete mode 100644 src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/types.ts diff --git a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.desktop.ts b/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.desktop.ts deleted file mode 100644 index a2bdc5b00c38..000000000000 --- a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.desktop.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type SwitchToOldDotOnNonMicroCompanySize from './types'; - -// We don't want to use this API on desktop, so we just noop here -const switchToOldDotOnNonMicroCompanySize: SwitchToOldDotOnNonMicroCompanySize = () => {}; - -export default switchToOldDotOnNonMicroCompanySize; diff --git a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.ts b/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.ts deleted file mode 100644 index 3c6a943b502b..000000000000 --- a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type {OnyxUpdate} from 'react-native-onyx'; -import Onyx from 'react-native-onyx'; -import * as API from '@libs/API'; -import {WRITE_COMMANDS} from '@libs/API/types'; -import CONST from '@src/CONST'; -import ONYXKEYS from '@src/ONYXKEYS'; -import type SwitchToOldDotOnNonMicroCompanySize from './types'; - -const switchToOldDotOnNonMicroCompanySize: SwitchToOldDotOnNonMicroCompanySize = (onboardingCompanySize) => { - if (onboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO) { - return; - } - - const optimisticData: OnyxUpdate[] = [ - { - onyxMethod: Onyx.METHOD.MERGE, - key: ONYXKEYS.NVP_TRYNEWDOT, - value: { - classicRedirect: { - dismissed: true, - }, - }, - }, - ]; - - API.write(WRITE_COMMANDS.SWITCH_TO_OLD_DOT_ON_COMPANY_SIZE, {onboardingCompanySize}, {optimisticData}); -}; - -export default switchToOldDotOnNonMicroCompanySize; diff --git a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/types.ts b/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/types.ts deleted file mode 100644 index aa888445eaaf..000000000000 --- a/src/libs/actions/Welcome/switchToOldDotOnNonMicroCompanySize/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type {OnboardingCompanySize} from '@src/CONST'; - -type SwitchToOldDotOnNonMicroCompanySize = (onboardingCompanySize: OnboardingCompanySize) => void; - -export default SwitchToOldDotOnNonMicroCompanySize; From 1e9fc25b85f111c61b476f36ff379d5cafa07e5a Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Fri, 18 Apr 2025 12:00:46 -0700 Subject: [PATCH 2/4] removing SwitchToOldDotOnNonMicroCompanySize references --- src/libs/actions/Welcome/index.ts | 2 -- src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts index 4ba55759840f..23a0f7ee6c9e 100644 --- a/src/libs/actions/Welcome/index.ts +++ b/src/libs/actions/Welcome/index.ts @@ -15,7 +15,6 @@ import type Onboarding from '@src/types/onyx/Onboarding'; import type TryNewDot from '@src/types/onyx/TryNewDot'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import {clearInitialPath} from './OnboardingFlow'; -import switchToOldDotOnNonMicroCompanySize from './switchToOldDotOnNonMicroCompanySize'; type OnboardingData = Onboarding | undefined; @@ -246,7 +245,6 @@ export { setOnboardingAdminsChatReportID, setOnboardingPolicyID, completeHybridAppOnboarding, - switchToOldDotOnNonMicroCompanySize, setOnboardingErrorMessage, setOnboardingCompanySize, setSelfTourViewed, diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index 256ed85d7b4f..06a32d6bddea 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -25,7 +25,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {openOldDotLink} from '@libs/actions/Link'; import {createWorkspace, generatePolicyID} from '@libs/actions/Policy/Policy'; import {completeOnboarding} from '@libs/actions/Report'; -import {setOnboardingAdminsChatReportID, setOnboardingPolicyID, switchToOldDotOnNonMicroCompanySize} from '@libs/actions/Welcome'; +import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@libs/actions/Welcome'; import getPlatform from '@libs/getPlatform'; import navigateAfterOnboarding from '@libs/navigateAfterOnboarding'; import Navigation from '@libs/Navigation/Navigation'; @@ -178,8 +178,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount return; } - switchToOldDotOnNonMicroCompanySize(onboardingCompanySize); - const shouldCreateWorkspace = !onboardingPolicyID && !paidGroupPolicy; // We need `adminsChatReportID` for `completeOnboarding`, but at the same time, we don't want to call `createWorkspace` more than once. From 55af5f1d06cf3d48a67d217d20da1783481258f0 Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Mon, 21 Apr 2025 10:46:16 -0700 Subject: [PATCH 3/4] removing SwitchToOldDotOnCompanySize --- src/libs/API/types.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 53677637fbaa..0ab27d1462f2 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -218,7 +218,6 @@ const WRITE_COMMANDS = { CANCEL_PAYMENT: 'CancelPayment', ACCEPT_ACH_CONTRACT_FOR_BANK_ACCOUNT: 'AcceptACHContractForBankAccount', SWITCH_TO_OLD_DOT: 'SwitchToOldDot', - SWITCH_TO_OLD_DOT_ON_COMPANY_SIZE: 'SwitchToOldDotOnCompanySize', TRACK_EXPENSE: 'TrackExpense', ENABLE_POLICY_CATEGORIES: 'EnablePolicyCategories', ENABLE_POLICY_CONNECTIONS: 'EnablePolicyConnections', @@ -689,7 +688,6 @@ type WriteCommandParameters = { [WRITE_COMMANDS.ENABLE_POLICY_DEFAULT_REPORT_TITLE]: Parameters.EnablePolicyDefaultReportTitleParams; [WRITE_COMMANDS.SET_WORKSPACE_DEFAULT_SPEND_CATEGORY]: Parameters.SetWorkspaceDefaultSpendCategoryParams; [WRITE_COMMANDS.SWITCH_TO_OLD_DOT]: Parameters.SwitchToOldDotParams; - [WRITE_COMMANDS.SWITCH_TO_OLD_DOT_ON_COMPANY_SIZE]: Parameters.SwitchToOldDotOnCompanySizeParams; [WRITE_COMMANDS.TRACK_EXPENSE]: Parameters.TrackExpenseParams; [WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES]: Parameters.EnablePolicyCategoriesParams; [WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS]: Parameters.EnablePolicyConnectionsParams; From a68dd7bd3fc430eec5bbd1f5b0b0ec954a67c24b Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Mon, 21 Apr 2025 10:47:00 -0700 Subject: [PATCH 4/4] removing SwitchToOldDotOnCompanySizeParams ts file --- .../API/parameters/SwitchToOldDotOnCompanySizeParams.ts | 7 ------- src/libs/API/parameters/index.ts | 1 - 2 files changed, 8 deletions(-) delete mode 100644 src/libs/API/parameters/SwitchToOldDotOnCompanySizeParams.ts diff --git a/src/libs/API/parameters/SwitchToOldDotOnCompanySizeParams.ts b/src/libs/API/parameters/SwitchToOldDotOnCompanySizeParams.ts deleted file mode 100644 index 540dbb5f4ead..000000000000 --- a/src/libs/API/parameters/SwitchToOldDotOnCompanySizeParams.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type {OnboardingCompanySize} from '@src/CONST'; - -type SwitchToOldDotOnCompanySizeParams = { - onboardingCompanySize: OnboardingCompanySize; -}; - -export default SwitchToOldDotOnCompanySizeParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 2823589b47b4..00c4d84a18b8 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -187,7 +187,6 @@ export type {default as SetPolicyRequiresTag} from './SetPolicyRequiresTag'; export type {default as SetPolicyTagsRequired} from './SetPolicyTagsRequired'; export type {default as RenamePolicyTaglistParams} from './RenamePolicyTaglistParams'; export type {default as SwitchToOldDotParams} from './SwitchToOldDotParams'; -export type {default as SwitchToOldDotOnCompanySizeParams} from './SwitchToOldDotOnCompanySizeParams'; export type {default as TrackExpenseParams} from './TrackExpenseParams'; export type {default as EnablePolicyCategoriesParams} from './EnablePolicyCategoriesParams'; export type {default as EnablePolicyConnectionsParams} from './EnablePolicyConnectionsParams';