Check for empty object for the onboarding flow too

src/libs/ReportUtils.ts

@@ -8244,8 +8244,8 @@ function shouldShowMerchantColumn(transactions: Transaction[]) {
  * only use the Concierge chat.
  */
 function isChatUsedForOnboarding(optionOrReport: OnyxEntry<Report> | OptionData): boolean {
-    // onboarding can be an array for old accounts and accounts created from olddot
-    if (onboarding && !Array.isArray(onboarding) && onboarding.chatReportID) {
+    // onboarding can be an array or an empty object for old accounts and accounts created from olddot
+    if (onboarding && !Array.isArray(onboarding) && !isEmptyObject(onboarding) && onboarding.chatReportID) {
         return onboarding.chatReportID === optionOrReport?.reportID;
     }
 

src/libs/actions/Welcome/index.ts

@@ -8,6 +8,7 @@ import type {OnboardingCompanySizeType, OnboardingPurposeType} from '@src/CONST'
 import ONYXKEYS from '@src/ONYXKEYS';
 import type Onboarding from '@src/types/onyx/Onboarding';
 import type TryNewDot from '@src/types/onyx/TryNewDot';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as OnboardingFlow from './OnboardingFlow';
 
 type OnboardingData = Onboarding | [] | undefined;
@@ -41,7 +42,7 @@ function onServerDataReady(): Promise<void> {
 let isOnboardingInProgress = false;
 function isOnboardingFlowCompleted({onCompleted, onNotCompleted, onCanceled}: HasCompletedOnboardingFlowProps) {
     isOnboardingFlowStatusKnownPromise.then(() => {
-        if (Array.isArray(onboarding) || onboarding?.hasCompletedGuidedSetupFlow === undefined) {
+        if (Array.isArray(onboarding) || isEmptyObject(onboarding) || onboarding?.hasCompletedGuidedSetupFlow === undefined) {
             onCanceled?.();
             return;
         }

src/libs/onboardingSelectors.ts

@@ -1,5 +1,6 @@
 import type {OnyxValue} from 'react-native-onyx';
 import type ONYXKEYS from '@src/ONYXKEYS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 /**
  * Selector to get the value of hasCompletedGuidedSetupFlow from the Onyx store
@@ -9,8 +10,8 @@ import type ONYXKEYS from '@src/ONYXKEYS';
  * `false` means the user has not completed the NewDot onboarding flow
  */
 function hasCompletedGuidedSetupFlowSelector(onboarding: OnyxValue<typeof ONYXKEYS.NVP_ONBOARDING>): boolean | undefined {
-    // Onboarding is an array for old accounts and accounts created from OldDot
-    if (Array.isArray(onboarding)) {
+    // Onboarding is an array or an empty object for old accounts and accounts created from OldDot
+    if (Array.isArray(onboarding) || isEmptyObject(onboarding)) {
         return true;
     }
 
@@ -43,11 +44,11 @@ function hasCompletedHybridAppOnboardingFlowSelector(tryNewDotData: OnyxValue<ty
  * `false` means the user has not completed the NewDot onboarding flow
  */
 function hasSeenTourSelector(onboarding: OnyxValue<typeof ONYXKEYS.NVP_ONBOARDING>): boolean | undefined {
-    if (Array.isArray(onboarding)) {
+    if (Array.isArray(onboarding) || isEmptyObject(onboarding)) {
         return false;
     }
 
-    return onboarding?.selfTourViewed;
+    return !!onboarding?.selfTourViewed;
 }
 
 export {hasCompletedGuidedSetupFlowSelector, hasCompletedHybridAppOnboardingFlowSelector, hasSeenTourSelector};