From 983477c354fa7f885e0505e7fff089134e34b4b1 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Tue, 7 Dec 2021 11:20:40 -0800
Subject: [PATCH] Startup: If we don't have core data available, show 'link
 device' screen

---
 ts/background.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/background.ts b/ts/background.ts
index 34f1ddb267..8a099ccede 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -1776,7 +1776,12 @@ export async function startApp(): Promise<void> {
     window.Whisper.ExpiringMessagesListener.init(window.Whisper.events);
     window.Whisper.TapToViewMessagesListener.init(window.Whisper.events);
 
-    if (window.Signal.Util.Registration.everDone()) {
+    const isCoreDataValid = Boolean(
+      window.textsecure.storage.user.getUuid() &&
+        window.ConversationController.getOurConversation()
+    );
+
+    if (isCoreDataValid && window.Signal.Util.Registration.everDone()) {
       connect();
       window.reduxActions.app.openInbox();
     } else {