From 5a1317a5eab9a1c523d5b300b7fa3c3e354b51fd Mon Sep 17 00:00:00 2001 From: Aldo Canepa Date: Fri, 18 Oct 2024 12:45:34 -0700 Subject: [PATCH 1/2] Add missing calls to App.confirmReadyToOpenApp --- src/pages/settings/InitialSettingsPage.tsx | 2 ++ src/pages/workspace/WorkspaceInitialPage.tsx | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx index 9ffac3e49e41..e380685bbd85 100755 --- a/src/pages/settings/InitialSettingsPage.tsx +++ b/src/pages/settings/InitialSettingsPage.tsx @@ -36,6 +36,7 @@ import * as UserUtils from '@libs/UserUtils'; import {hasGlobalWorkspaceSettingsRBR} from '@libs/WorkspacesSettingsUtils'; import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu'; import variables from '@styles/variables'; +import * as App from '@userActions/App'; import * as Link from '@userActions/Link'; import * as PaymentMethods from '@userActions/PaymentMethods'; import * as Session from '@userActions/Session'; @@ -102,6 +103,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr useEffect(() => { Wallet.openInitialSettingsPage(); + App.confirmReadyToOpenApp(); }, []); const toggleSignoutConfirmModal = (value: boolean) => { diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 6cfc66466da4..088da5544f9e 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -21,6 +21,7 @@ import useSingleExecution from '@hooks/useSingleExecution'; import useThemeStyles from '@hooks/useThemeStyles'; import useWaitForNavigation from '@hooks/useWaitForNavigation'; import {isConnectionInProgress} from '@libs/actions/connections'; +import * as App from '@userActions/App'; import * as CurrencyUtils from '@libs/CurrencyUtils'; import getTopmostRouteName from '@libs/Navigation/getTopmostRouteName'; import Navigation from '@libs/Navigation/Navigation'; @@ -178,6 +179,10 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac }); }, [policy, isOffline, policyFeatureStates, prevPendingFields]); + useEffect(() => { + App.confirmReadyToOpenApp(); + }, []); + if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED]) { const currencyCode = policy?.outputCurrency ?? CONST.CURRENCY.USD; From b6d61ede97e330f3a0854bd3e901a26aa59d0d7c Mon Sep 17 00:00:00 2001 From: Aldo Canepa Date: Fri, 18 Oct 2024 13:25:05 -0700 Subject: [PATCH 2/2] Fix import prettier error --- src/pages/workspace/WorkspaceInitialPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index 088da5544f9e..41ddfa7fff39 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -21,13 +21,13 @@ import useSingleExecution from '@hooks/useSingleExecution'; import useThemeStyles from '@hooks/useThemeStyles'; import useWaitForNavigation from '@hooks/useWaitForNavigation'; import {isConnectionInProgress} from '@libs/actions/connections'; -import * as App from '@userActions/App'; import * as CurrencyUtils from '@libs/CurrencyUtils'; import getTopmostRouteName from '@libs/Navigation/getTopmostRouteName'; 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';