From 99d3324e0b9d7ee0fbf052d94a8c70bedd0bdabc Mon Sep 17 00:00:00 2001
From: Joe McGrath <josephmcg01@gmail.com>
Date: Tue, 20 Sep 2022 09:58:10 +0900
Subject: [PATCH 1/2] fix(sidebar): user status reactivity bug

---
 libraries/Iridium/profile/ProfileManager.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libraries/Iridium/profile/ProfileManager.ts b/libraries/Iridium/profile/ProfileManager.ts
index a84d7a20f5..544acc483e 100644
--- a/libraries/Iridium/profile/ProfileManager.ts
+++ b/libraries/Iridium/profile/ProfileManager.ts
@@ -77,10 +77,9 @@ export default class IridiumProfile extends Emitter {
 
   async updateUser(details: Partial<User>) {
     logger.info('iridium/profile', 'updating user', { details })
-    this.state = {
-      ...this.state,
-      ...details,
-    } as User
+    for await (const [key, value] of Object.entries(details)) {
+      this.state[key] = value
+    }
     await this.set('/', this.state)
     if (!this.state || !iridium.id) return
     // tell our peers via user announce

From 8677dccd2ff580de3adbecdda3fc71465454af17 Mon Sep 17 00:00:00 2001
From: Joe McGrath <josephmcg01@gmail.com>
Date: Tue, 20 Sep 2022 13:50:41 +0900
Subject: [PATCH 2/2] fix(profile): maintain vue observer

---
 components/views/navigation/sidebar/status/Status.html | 2 +-
 components/views/navigation/sidebar/status/Status.vue  | 5 +++--
 components/views/settings/pages/profile/Profile.html   | 2 +-
 libraries/Iridium/profile/ProfileManager.ts            | 2 --
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/views/navigation/sidebar/status/Status.html b/components/views/navigation/sidebar/status/Status.html
index b660e6ec22..79a139be01 100644
--- a/components/views/navigation/sidebar/status/Status.html
+++ b/components/views/navigation/sidebar/status/Status.html
@@ -1,4 +1,4 @@
-<div id="status" v-show="!!profile">
+<div id="status">
   <UiUserState :user="profile" />
   <div class="user-info" v-tooltip.top="$t('controls.copy_id')" @click="copyId">
     <TypographyTitle data-cy="user-name" :text="profile.name" :size="6" />
diff --git a/components/views/navigation/sidebar/status/Status.vue b/components/views/navigation/sidebar/status/Status.vue
index 507cdb047e..ed88bee3cf 100644
--- a/components/views/navigation/sidebar/status/Status.vue
+++ b/components/views/navigation/sidebar/status/Status.vue
@@ -3,11 +3,12 @@
 <script lang="ts">
 import Vue from 'vue'
 import iridium from '~/libraries/Iridium/IridiumManager'
-import { User } from '~/libraries/Iridium/users/types'
 
 export default Vue.extend({
   data() {
-    return { status: 'online', profile: iridium.profile.state }
+    return {
+      profile: iridium.profile.state,
+    }
   },
   methods: {
     copyId() {
diff --git a/components/views/settings/pages/profile/Profile.html b/components/views/settings/pages/profile/Profile.html
index a3a67ed757..c429881d99 100644
--- a/components/views/settings/pages/profile/Profile.html
+++ b/components/views/settings/pages/profile/Profile.html
@@ -131,7 +131,7 @@
                     <edit-icon size="1x" />
                   </InteractablesInput>
                 </form>
-                <div v-if="profile && !!profile.status" class="status">
+                <div class="status">
                   <TypographyText as="h6">
                     {{ $t('pages.settings.profile.current_status') }}
                   </TypographyText>
diff --git a/libraries/Iridium/profile/ProfileManager.ts b/libraries/Iridium/profile/ProfileManager.ts
index 544acc483e..fdaa65dcf5 100644
--- a/libraries/Iridium/profile/ProfileManager.ts
+++ b/libraries/Iridium/profile/ProfileManager.ts
@@ -50,8 +50,6 @@ export default class IridiumProfile extends Emitter {
         return
       }
       logger.info('iridium/profile', 'profile state changed', state)
-      this.state = state.value?.profile
-      this.setUser()
       this.emit('changed', state)
     }
   }