From 892e29fa390ba8068c11940f42d0975459b20d66 Mon Sep 17 00:00:00 2001 From: walmat Date: Fri, 24 Jan 2025 20:13:30 -0500 Subject: [PATCH] fix bottom sheet stacking order --- src/handlers/walletReadyEvents.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/handlers/walletReadyEvents.ts b/src/handlers/walletReadyEvents.ts index ce9b662139f..d942160a593 100644 --- a/src/handlers/walletReadyEvents.ts +++ b/src/handlers/walletReadyEvents.ts @@ -15,6 +15,7 @@ import { logger } from '@/logger'; import { IS_TEST } from '@/env'; import { backupsStore, CloudBackupState, LoadingStates, oneWeekInMs } from '@/state/backups/backups'; import walletBackupTypes from '@/helpers/walletBackupTypes'; +import { useNavigationStore } from '@/state/navigation/navigationStore'; export const runKeychainIntegrityChecks = async () => { const keychainIntegrityState = await getKeychainIntegrityState(); @@ -112,16 +113,21 @@ export const runFeatureUnlockChecks = async (): Promise => { return false; }; +const notificationsCampaignCheckTimeout = 15_000; +const routesToExitEarlyOn: string[] = [Routes.BACKUP_SHEET, Routes.APP_ICON_UNLOCK_SHEET, Routes.REMOTE_PROMO_SHEET]; + +const handleLocalCampaignChecks = async () => { + setTimeout(() => { + const { activeRoute } = useNavigationStore.getState(); + if (routesToExitEarlyOn.includes(activeRoute)) return; + runLocalCampaignChecks(); + }, notificationsCampaignCheckTimeout); +}; + export const runFeaturesLocalCampaignAndBackupChecks = async () => { if (await runFeatureUnlockChecks()) { return true; } - if (await runLocalCampaignChecks()) { - return true; - } - if (await runWalletBackupStatusChecks()) { - return true; - } - - return false; + handleLocalCampaignChecks(); + return await runWalletBackupStatusChecks(); };