fix(groups): members order sorted alpha (#3460)

Satellite-im · Jun 6, 2022 · 9a1c3cf · 9a1c3cf
1 parent 543f0eb
commit 9a1c3cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/components/views/navigation/toolbar/Toolbar.vue b/components/views/navigation/toolbar/Toolbar.vue
@@ -89,7 +89,7 @@ export default Vue.extend({
     },
     ModalWindows: () => ModalWindows,
     src(): string {
-      const hash = this.recipient?.profilePicture
+      const hash = (this.recipient as Friend).profilePicture
       return hash ? `${this.$Config.textile.browser}/ipfs/${hash}` : ''
     },
     isGroup(): boolean {

diff --git a/layouts/chat.vue b/layouts/chat.vue
@@ -225,10 +225,6 @@ export default Vue.extend({
     },
   },
   watch: {
-    recipient: {
-      handler() {},
-      immediate: true,
-    },
     showSidebar(newValue, oldValue) {
       if (newValue !== oldValue) {
         newValue

diff --git a/store/groups/mutations.ts b/store/groups/mutations.ts
@@ -25,9 +25,10 @@ const mutations = {
     state: GroupsState,
     { groupId, members }: { groupId: string; members: GroupMember[] },
   ) {
-    state.all = state.all.map((group) =>
-      group.id === groupId ? { ...group, members } : group,
-    )
+    const group = state.all.find((g) => g.id === groupId)
+    if (group) {
+      group.members = members.sort((a, b) => a.name.localeCompare(b.name))
+    }
   },
   setGroupsLastUpdate(state: GroupsState, payload: { [key: string]: number }) {
     state.all = state.all.map((group) => ({