fix getter and behavior for draft and empty messages

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 0b11e3e2f..47df6332f 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -380,6 +380,11 @@ export default {
 		},
 
 		text(newValue) {
+			// Do nothing if join a conversation with pre-filled input
+			if (this.text === this.$store.getters.currentMessageInput(this.token) || this.text === '') {
+				return
+			}
+
 			this.$store.dispatch('setCurrentMessageInput', { token: this.token, text: newValue })
 
 			// Enable signal sending, only if indicator for this input is on
@@ -401,7 +406,7 @@ export default {
 
 		token(token) {
 			if (token) {
-				this.text = this.$store.getters.currentMessageInput(token) || ''
+				this.text = this.$store.getters.currentMessageInput(token)
 			} else {
 				this.text = ''
 			}
@@ -413,7 +418,7 @@ export default {
 		EventBus.$on('focus-chat-input', this.focusInput)
 		EventBus.$on('upload-start', this.handleUploadStart)
 		EventBus.$on('retry-message', this.handleRetryMessage)
-		this.text = this.$store.getters.currentMessageInput(this.token) || ''
+		this.text = this.$store.getters.currentMessageInput(this.token)
 
 		if (!this.$store.getters.areFileTemplatesInitialised) {
 			this.$store.dispatch('getFileTemplates')
diff --git a/src/store/quoteReplyStore.js b/src/store/quoteReplyStore.js
index ba279b02a..8bc7a52b2 100644
--- a/src/store/quoteReplyStore.js
+++ b/src/store/quoteReplyStore.js
@@ -39,9 +39,7 @@ const getters = {
 	},
 
 	currentMessageInput: (state) => (token) => {
-		if (state.currentMessageInput[token]) {
-			return state.currentMessageInput[token]
-		}
+		return state.currentMessageInput[token] ?? ''
 	},
 }