From 78257037bb722de9434cc3eddd9073c477cc83b7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 3 Mar 2021 12:00:41 +1100
Subject: [PATCH] restoreFromSeed restores groups from first configMessage got

---
 ts/components/session/registration/RegistrationTabs.tsx | 9 +++++----
 ts/receiver/configMessage.ts                            | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx
index 95013f6d3..0ede8350a 100644
--- a/ts/components/session/registration/RegistrationTabs.tsx
+++ b/ts/components/session/registration/RegistrationTabs.tsx
@@ -143,6 +143,10 @@ export async function signUp(signUpDetails: {
       'english',
       trimName
     );
+    await createOrUpdateItem({
+      id: 'hasSyncedInitialConfigurationItem',
+      value: true,
+    });
     trigger('openInbox');
   } catch (e) {
     await resetRegistration();
@@ -186,10 +190,7 @@ export async function signInWithRecovery(signInDetails: {
   try {
     await resetRegistration();
     await window.setPassword(password);
-    await createOrUpdateItem({
-      id: 'hasSyncedInitialConfigurationItem',
-      value: true,
-    });
+
     await AccountManager.registerSingleDevice(
       userRecoveryPhrase,
       'english',
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index e89c2712a..5ff087c5f 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -44,7 +44,12 @@ async function handleOurProfileUpdate(
     };
     await updateProfile(ourConversation, lokiProfile, profileKey);
     UserUtils.setLastProfileUpdateTimestamp(_.toNumber(sentAt));
-    trigger(configurationMessageReceived, displayName);
+    // do not trigger a signin by linking if the display name is empty
+    if (displayName) {
+      trigger(configurationMessageReceived, displayName);
+    } else {
+      window.log.warn('Got a configuration message but the display name is empty');
+    }
   }
 }