From bfaeda5cdb673989318767b4e19bd0ce81afce9f Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 28 Mar 2022 16:22:20 +1100
Subject: [PATCH] make sure the conversation with ourself is marked approvedMe

---
 ts/components/leftpane/ActionsPanel.tsx | 4 ++++
 ts/util/accountManager.ts               | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx
index 189f86103..ff36e2456 100644
--- a/ts/components/leftpane/ActionsPanel.tsx
+++ b/ts/components/leftpane/ActionsPanel.tsx
@@ -53,6 +53,7 @@ import { SessionToastContainer } from '../SessionToastContainer';
 import { LeftPaneSectionContainer } from './LeftPaneSectionContainer';
 import { getLatestDesktopReleaseFileToFsV2 } from '../../session/apis/file_server_api/FileServerApiV2';
 import { ipcRenderer } from 'electron';
+import { UserUtils } from '../../session/utils';
 
 const Section = (props: { type: SectionType }) => {
   const ourNumber = useSelector(getOurNumber);
@@ -185,6 +186,9 @@ const setupTheme = () => {
 
 // Do this only if we created a new Session ID, or if we already received the initial configuration message
 const triggerSyncIfNeeded = async () => {
+  await getConversationController()
+    .get(UserUtils.getOurPubKeyStrFromCache())
+    .setDidApproveMe(true, true);
   const didWeHandleAConfigurationMessageAlready =
     (await getItemById(hasSyncedInitialConfigurationItem))?.value || false;
   if (didWeHandleAConfigurationMessageAlready) {
diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts
index e467ad46c..1fe59c38e 100644
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@@ -172,6 +172,9 @@ async function registrationDone(ourPubkey: string, displayName: string) {
   );
   await conversation.setLokiProfile({ displayName });
   await conversation.setIsApproved(true);
+  await conversation.setDidApproveMe(true);
+
+  await conversation.commit();
   const user = {
     ourNumber: getOurPubKeyStrFromCache(),
     ourPrimary: window.textsecure.storage.get('primaryDevicePubKey'),