chore: reverted modal opening on user state click, fixed quick profil…

…e not opening when another is
Satellite-im · Feb 4, 2022 · c69ad2b · c69ad2b
1 parent 384462b
commit c69ad2b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/components/views/chat/group/Group.vue b/components/views/chat/group/Group.vue
@@ -26,7 +26,7 @@ export default Vue.extend({
     }
   },
   computed: {
-    ...mapState(['friends', 'accounts']),
+    ...mapState(['ui', 'friends', 'accounts']),
     address() {
       return getAddressFromState(this.group.from, this.$store.state)
     },
@@ -78,8 +78,22 @@ export default Vue.extend({
         this.group.from,
         this.$store.state,
       )
-      this.$store.commit('ui/setQuickProfilePosition', e)
-      this.$store.commit('ui/quickProfile', selectedUser)
+
+      const openQuickProfile = () => {
+        this.$store.commit('ui/setQuickProfilePosition', e)
+        this.$store.commit('ui/quickProfile', selectedUser)
+      }
+
+      if (!this.ui.quickProfile) {
+        openQuickProfile()
+        return
+      }
+
+      setTimeout(() => {
+        if (!this.ui.quickProfile) {
+          openQuickProfile()
+        }
+      }, 100)
     },
   },
 })

diff --git a/components/views/navigation/sidebar/status/Status.html b/components/views/navigation/sidebar/status/Status.html
@@ -1,10 +1,8 @@
 <div id="status">
-  <div @click="openProfile">
-    <UiUserState
-      :user="{address: accounts.active, state: accounts.details.state}"
-      :src="src"
-    />
-  </div>
+  <UiUserState
+    :user="{address: accounts.active, state: accounts.details.state}"
+    :src="src"
+  />
   <div
     class="user-info has-tooltip has-tooltip-top has-tooltip-primary"
     v-on:click="$toast.show($t('ui.copied'))"

diff --git a/components/views/navigation/sidebar/status/Status.vue b/components/views/navigation/sidebar/status/Status.vue
@@ -12,14 +12,6 @@ export default Vue.extend({
       return hash ? `${this.$Config.textile.browser}/ipfs/${hash}` : ''
     },
   },
-  methods: {
-    openProfile() {
-      this.$store.commit('ui/toggleSettings', {
-        show: true,
-        defaultRoute: 'profile',
-      })
-    },
-  },
 })
 </script>