From 315c148c5d3a09d695597f3080ddff18ea625627 Mon Sep 17 00:00:00 2001 From: daledah Date: Mon, 19 Aug 2024 15:15:46 +0700 Subject: [PATCH 1/2] fix: prevent creating workspace twice --- src/libs/actions/App.ts | 1 + src/pages/workspace/WorkspaceInitialPage.tsx | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 7be767d73f48..fae7acd31207 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -362,6 +362,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(policyOwnerEmail = '', po // We must call goBack() to remove the /transition route from history Navigation.goBack(); } + savePolicyDraftByNewWorkspace(policyID, policyName, policyOwnerEmail, makeMeAdmin); Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID, backTo)); }) .then(endSignOnTransition); diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 115a24691838..0ec0e995c886 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -134,18 +134,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc const policyID = policy?.id ?? '-1'; const policyName = policy?.name ?? ''; - useEffect(() => { - const policyDraftId = policyDraft?.id; - - if (!policyDraftId) { - return; - } - - App.savePolicyDraftByNewWorkspace(policyDraft.id, policyDraft.name, '', policyDraft.makeMeAdmin); - // We only care when the component renders the first time - // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps - }, []); - useEffect(() => { if (!isCurrencyModalOpen || policy?.outputCurrency !== CONST.CURRENCY.USD) { return; From 70a4aa8a94be7f0d675b35d0ae82a3338bd65d48 Mon Sep 17 00:00:00 2001 From: daledah Date: Mon, 19 Aug 2024 15:41:33 +0700 Subject: [PATCH 2/2] fix: remove unused --- src/pages/workspace/WorkspaceInitialPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 0ec0e995c886..627c47dc8705 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -25,7 +25,6 @@ import Navigation from '@libs/Navigation/Navigation'; import * as PolicyUtils from '@libs/PolicyUtils'; import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils'; import type {FullScreenNavigatorParamList} from '@navigation/types'; -import * as App from '@userActions/App'; import * as Policy from '@userActions/Policy/Policy'; import * as ReimbursementAccount from '@userActions/ReimbursementAccount'; import CONST from '@src/CONST';