Revert "fix(sidebar): user status reactivity bug (#4939)" (#4944)

This reverts commit 26eb842.
Satellite-im · Sep 20, 2022 · 6ef5440 · 6ef5440
1 parent 26eb842
commit 6ef5440
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/components/views/navigation/sidebar/status/Status.html b/components/views/navigation/sidebar/status/Status.html
@@ -1,4 +1,4 @@
-<div id="status">
+<div id="status" v-show="!!profile">
   <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
@@ -3,12 +3,11 @@
 <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 {
-      profile: iridium.profile.state,
-    }
+    return { status: 'online', profile: iridium.profile.state }
   },
   methods: {
     copyId() {

diff --git 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 class="status">
+                <div v-if="profile && !!profile.status" 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
@@ -50,6 +50,8 @@ 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)
     }
   }
@@ -75,9 +77,10 @@ export default class IridiumProfile extends Emitter {
 
   async updateUser(details: Partial<User>) {
     logger.info('iridium/profile', 'updating user', { details })
-    for await (const [key, value] of Object.entries(details)) {
-      this.state[key] = value
-    }
+    this.state = {
+      ...this.state,
+      ...details,
+    } as User
     await this.set('/', this.state)
     if (!this.state || !iridium.id) return
     // tell our peers via user announce