set custom message only on 'Enter' or 'Set status'

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

Author: Antreesy

apps/user_status/src/components/CustomMessageInput.vue

@@ -39,8 +39,9 @@
 				type="text"
 				:value="message"
 				@change="onChange"
-				@keyup="onKeyup"
-				@paste="onKeyup">
+				@keyup="onChange"
+			    @keyup.enter="onSubmit"
+				@paste="onChange">
 		</div>
 	</div>
 </template>
@@ -100,11 +101,11 @@ export default {
 		 *
 		 * @param {Event} event The Change Event
 		 */
-		onKeyup(event) {
+		onChange(event) {
 			this.$emit('change', event.target.value)
 		},
 
-		onChange(event) {
+		onSubmit(event) {
 			this.$emit('submit', event.target.value)
 		},
 

apps/user_status/src/components/SetStatusModal.vue

@@ -245,12 +245,7 @@ export default {
 			try {
 				this.isSavingStatus = true
 
-				if (this.messageId !== undefined && this.messageId !== null) {
-					await this.$store.dispatch('setPredefinedMessage', {
-						messageId: this.messageId,
-						clearAt: this.clearAt,
-					})
-				} else {
+				if (this.isCustomStatus) {
 					await this.$store.dispatch('setCustomMessage', {
 						message: this.editedMessage,
 						icon: this.icon,

apps/user_status/src/store/predefinedStatuses.js

@@ -35,7 +35,7 @@ const mutations = {
 	 * @param {object} status The status to add
 	 */
 	addPredefinedStatus(state, status) {
-		state.predefinedStatuses.push(status)
+		state.predefinedStatuses = [...state.predefinedStatuses, status]
 	},
 }