diff --git a/components/views/chat/UserList.vue b/components/views/chat/UserList.vue new file mode 100644 index 0000000000..3ad5e33e93 --- /dev/null +++ b/components/views/chat/UserList.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/components/views/navigation/toolbar/Toolbar.less b/components/views/navigation/toolbar/Toolbar.less index 6cc36a3d57..ccc0e38d78 100644 --- a/components/views/navigation/toolbar/Toolbar.less +++ b/components/views/navigation/toolbar/Toolbar.less @@ -34,6 +34,7 @@ rgba(58, 58, 80, 0.4); border-radius: @corner-rounding; position: relative; + margin-right: 16px; // temp for uicomingsoon > span { diff --git a/components/views/navigation/toolbar/Toolbar.vue b/components/views/navigation/toolbar/Toolbar.vue index 9ab06ed505..ac1d8eef19 100644 --- a/components/views/navigation/toolbar/Toolbar.vue +++ b/components/views/navigation/toolbar/Toolbar.vue @@ -50,13 +50,9 @@ export default Vue.extend({ userDetails, } = conversationHooks() - const subtitleText: ComputedRef = computed(() => { + const subtitleText: ComputedRef = computed(() => { if (isGroup.value) { - return ( - conversation?.value?.participants - ?.map((did) => iridium.users.getUser(did)?.name) - .join(', ') ?? '' - ) + return } // todo - replace with user status message set in profile settings return iridium.users.ephemeral.status[otherDids.value[0]] || 'offline' diff --git a/locales/en-US.js b/locales/en-US.js index b298fcf420..beb37ac4f1 100644 --- a/locales/en-US.js +++ b/locales/en-US.js @@ -643,6 +643,7 @@ export default { no_more: 'No more messages.', }, add_reaction: 'Add reaction', + members: 'Members - {count}', }, newMessage: { new_message: 'New Message', diff --git a/pages/chat/Chat.html b/pages/chat/Chat.html index ca4ce1f818..b2f1ca89f0 100644 --- a/pages/chat/Chat.html +++ b/pages/chat/Chat.html @@ -5,7 +5,11 @@ :max-viewable-users="10" :fullscreen-max-viewable-users="20" /> - - - +
+
+ + +
+ +
diff --git a/pages/chat/Chat.less b/pages/chat/Chat.less deleted file mode 100644 index f20a68494c..0000000000 --- a/pages/chat/Chat.less +++ /dev/null @@ -1,8 +0,0 @@ -.chat { - display: flex; - flex-direction: column; - flex-grow: 1; - justify-content: flex-end; - padding: @normal-spacing; - min-width: 0; -} diff --git a/pages/chat/_id.vue b/pages/chat/_id.vue index b78530eae6..2c645431bc 100644 --- a/pages/chat/_id.vue +++ b/pages/chat/_id.vue @@ -1,23 +1,49 @@ - +