diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue index ff2a4531b81..9562d0d04b0 100644 --- a/src/components/ChatView.vue +++ b/src/components/ChatView.vue @@ -156,6 +156,7 @@ export default { isDragAndDropBlocked() { return this.chatExtrasStore.getMessageIdToEdit(this.token) !== undefined || !this.canUploadFiles + || this.chatExtrasStore.scheduleMessageTime }, dropHintText() { diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue new file mode 100644 index 00000000000..89fa96a19fc --- /dev/null +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/ScheduledMessageActions.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageItem.vue b/src/components/MessagesList/MessagesGroup/Message/MessageItem.vue index 63b110d5004..b5fb26035b2 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageItem.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageItem.vue @@ -51,23 +51,32 @@ 'bottom-side': isSplitViewEnabled && !isShortSimpleMessage && (isSmallMobile || isSidebar), overlay: isSplitViewEnabled && !isShortSimpleMessage && isReactionsMenuOpen && !(isSmallMobile || isSidebar), }"> - +
false this.$nextTick(() => { @@ -330,7 +347,8 @@ export default { immediate: true, handler(newMessages, oldMessages) { const newGroups = this.prepareMessagesGroups(newMessages) - if (!oldMessages || (oldMessages?.length && newMessages.length && newMessages[0].token !== oldMessages?.at(0)?.token)) { + if (!oldMessages || (oldMessages?.length && newMessages.length && newMessages[0].token !== oldMessages?.at(0)?.token) + || this.showScheduledMessages) { // messages were just loaded or token has changed, reset the messages this.messagesGroupedByDateByAuthor = newGroups } else { diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue index 2563a27d7b2..d453a264149 100644 --- a/src/components/NewMessage/NewMessage.vue +++ b/src/components/NewMessage/NewMessage.vue @@ -79,9 +79,29 @@ :can-cancel="!!parentMessage" :edit-message="!!messageToEdit" />
+ + + +

{{ scheduleMessageHint }}

+ + + +
+ + :primary="silentChat" + @close="submenu = null"> - - {{ silentSendLabel }} - - + + + + + + +