From 92881686dc500d26eac8792456a32a1dcaf4cb2b Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Fri, 6 Oct 2023 02:44:54 +0100
Subject: [PATCH 1/6] feat: preserve message text in the input field

---
 src/components/AChat/AChatForm.vue | 8 +++++++-
 src/components/Chat/Chat.vue       | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
index 90f165236..880b1f0a6 100644
--- a/src/components/AChat/AChatForm.vue
+++ b/src/components/AChat/AChatForm.vue
@@ -54,6 +54,10 @@ export default {
     showDivider: {
       type: Boolean,
       default: false
+    },
+    clearInputValueOnSend: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ['message', 'esc'],
@@ -119,7 +123,9 @@ export default {
   methods: {
     submitMessage() {
       this.$emit('message', this.message)
-      this.message = ''
+      if (this.clearInputValueOnSend === true) {
+        this.message = ''
+      }
       // Fix textarea height to 1 row after miltiline message send
       this.calculateInputHeight()
       this.focus()
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index 9d5c97bc3..f96d2654f 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -209,6 +209,7 @@
           :message-text="$route.query.messageText"
           @message="onMessage"
           @esc="replyMessageId = -1"
+          :clearInputValueOnSend="this.$store.state.balance < 0.001 === false"
         >
           <template #prepend>
             <chat-menu

From e3a6d659a1b77b7d661dc29520f4e3e2559513b2 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Fri, 6 Oct 2023 04:47:01 +0100
Subject: [PATCH 2/6] refactor: reviewer changes

---
 src/components/AChat/AChatForm.vue | 2 +-
 src/components/Chat/Chat.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
index 880b1f0a6..160e47d43 100644
--- a/src/components/AChat/AChatForm.vue
+++ b/src/components/AChat/AChatForm.vue
@@ -123,7 +123,7 @@ export default {
   methods: {
     submitMessage() {
       this.$emit('message', this.message)
-      if (this.clearInputValueOnSend === true) {
+      if (this.clearInputValueOnSend) {
         this.message = ''
       }
       // Fix textarea height to 1 row after miltiline message send
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index f96d2654f..fd7902385 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -209,7 +209,7 @@
           :message-text="$route.query.messageText"
           @message="onMessage"
           @esc="replyMessageId = -1"
-          :clearInputValueOnSend="this.$store.state.balance < 0.001 === false"
+          :clear-input-value-on-send="this.$store.state.balance >= 0.001"
         >
           <template #prepend>
             <chat-menu

From 89df240f55ce74ee0891af29e861bf2f86236afc Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Thu, 2 Nov 2023 01:27:58 +0000
Subject: [PATCH 3/6] refactor(AChatForm): use `validator` prop to validate
 message

---
 src/components/AChat/AChatForm.vue | 17 +++++++++--
 src/components/Chat/Chat.vue       | 47 ++++++++++++++++++++----------
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
index 160e47d43..2ad783c1a 100644
--- a/src/components/AChat/AChatForm.vue
+++ b/src/components/AChat/AChatForm.vue
@@ -58,9 +58,16 @@ export default {
     clearInputValueOnSend: {
       type: Boolean,
       default: true
+    },
+    /**
+     * Message validator.
+     */
+    validator: {
+      type: Function,
+      required: true
     }
   },
-  emits: ['message', 'esc'],
+  emits: ['message', 'esc', 'error'],
   data: () => ({
     message: ''
   }),
@@ -122,10 +129,14 @@ export default {
   },
   methods: {
     submitMessage() {
-      this.$emit('message', this.message)
-      if (this.clearInputValueOnSend) {
+      const error = this.validator(this.message)
+      if (error === false) {
+        this.$emit('message', this.message)
         this.message = ''
+      } else {
+        this.$emit('error', error)
       }
+
       // Fix textarea height to 1 row after miltiline message send
       this.calculateInputHeight()
       this.focus()
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index fd7902385..189dffa25 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -208,8 +208,9 @@
           :label="chatFormLabel"
           :message-text="$route.query.messageText"
           @message="onMessage"
+          @error="onMessageError"
           @esc="replyMessageId = -1"
-          :clear-input-value-on-send="this.$store.state.balance >= 0.001"
+          :validator="messageValidator.bind(this)"
         >
           <template #prepend>
             <chat-menu
@@ -306,31 +307,33 @@ function getUserMeta(userId) {
 /**
  * Validate message before sending.
  * @param {string} message
- * @returns {boolean}
+ * @returns {string | false} If `false` then validation passed without errors.
  */
+const validationErrors = {
+  emptyMessage: 'EMPTY_MESSAGE',
+  notEnoughFunds: 'NON_ENOUGH_FUNDS',
+  notEnoughFundsNewAccount: 'NON_ENOUGH_FUNDS_NEW_ACCOUNT',
+  messageTooLong: 'MESSAGE_LENGTH_EXCEED'
+}
 function validateMessage(message) {
   // Ensure that message contains at least one non-whitespace character
   if (!message.trim().length) {
-    return false
+    return validationErrors.emptyMessage
   }
 
   if (this.$store.state.balance < 0.001) {
     if (this.$store.getters.isAccountNew()) {
-      this.showFreeTokensDialog = true
+      return validationErrors.notEnoughFundsNewAccount
     } else {
-      this.$store.dispatch('snackbar/show', { message: this.$t('chats.no_money') })
+      return validationErrors.notEnoughFunds
     }
-    return false
   }
 
   if (message.length * 1.5 > 20000) {
-    this.$store.dispatch('snackbar/show', {
-      message: this.$t('chats.too_long')
-    })
-    return false
+    return validationErrors.messageTooLong
   }
 
-  return true
+  return false
 }
 
 export default {
@@ -477,11 +480,25 @@ export default {
     }
   },
   methods: {
+    messageValidator: validateMessage,
     onMessage(message) {
-      if (validateMessage.call(this, message)) {
-        this.sendMessage(message)
-        nextTick(() => this.$refs.chat.scrollToBottom())
-        this.replyMessageId = -1
+      this.sendMessage(message)
+      nextTick(() => this.$refs.chat.scrollToBottom())
+      this.replyMessageId = -1
+    },
+    onMessageError(error) {
+      switch (error) {
+        case validationErrors.notEnoughFundsNewAccount:
+          this.showFreeTokensDialog = true
+          return
+        case validationErrors.notEnoughFunds:
+          this.$store.dispatch('snackbar/show', { message: this.$t('chats.no_money') })
+          return
+        case validationErrors.messageTooLong:
+          this.$store.dispatch('snackbar/show', {
+            message: this.$t('chats.too_long')
+          })
+          return
       }
     },
     sendMessage(message) {

From 605d9970b4772b107b445d16a8b4b2933aa618b5 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Thu, 2 Nov 2023 01:30:58 +0000
Subject: [PATCH 4/6] refactor(Chat.vue): replace hardcoded fee with a constant

---
 src/components/Chat/Chat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index 189dffa25..98013c914 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -258,7 +258,7 @@ import { detect } from 'detect-browser'
 import Visibility from 'visibilityjs'
 import copyToClipboard from 'copy-to-clipboard'
 
-import { Cryptos } from '@/lib/constants'
+import { Cryptos, Fees } from '@/lib/constants'
 import EmojiPicker from '@/components/EmojiPicker.vue'
 
 import {
@@ -321,7 +321,7 @@ function validateMessage(message) {
     return validationErrors.emptyMessage
   }
 
-  if (this.$store.state.balance < 0.001) {
+  if (this.$store.state.balance < Fees.NOT_ADM_TRANSFER) {
     if (this.$store.getters.isAccountNew()) {
       return validationErrors.notEnoughFundsNewAccount
     } else {

From eb0464cd5defd56905d597fc59d3d88ab2543396 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Thu, 2 Nov 2023 14:31:00 +0000
Subject: [PATCH 5/6] refactor(Chat): position `validationErrors` before
 docblock

---
 src/components/Chat/Chat.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
index 98013c914..4bb122499 100644
--- a/src/components/Chat/Chat.vue
+++ b/src/components/Chat/Chat.vue
@@ -304,17 +304,17 @@ function getUserMeta(userId) {
   return user
 }
 
-/**
- * Validate message before sending.
- * @param {string} message
- * @returns {string | false} If `false` then validation passed without errors.
- */
 const validationErrors = {
   emptyMessage: 'EMPTY_MESSAGE',
   notEnoughFunds: 'NON_ENOUGH_FUNDS',
   notEnoughFundsNewAccount: 'NON_ENOUGH_FUNDS_NEW_ACCOUNT',
   messageTooLong: 'MESSAGE_LENGTH_EXCEED'
 }
+/**
+ * Validate message before sending.
+ * @param {string} message
+ * @returns {string | false} If `false` then validation passed without errors.
+ */
 function validateMessage(message) {
   // Ensure that message contains at least one non-whitespace character
   if (!message.trim().length) {

From b3b176854fbea6b23dfcc22f3315295cee9941da Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Thu, 2 Nov 2023 22:20:56 +0000
Subject: [PATCH 6/6] refactor(AChatForm): remove unused prop

---
 src/components/AChat/AChatForm.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
index 2ad783c1a..3d3baa78e 100644
--- a/src/components/AChat/AChatForm.vue
+++ b/src/components/AChat/AChatForm.vue
@@ -55,10 +55,6 @@ export default {
       type: Boolean,
       default: false
     },
-    clearInputValueOnSend: {
-      type: Boolean,
-      default: true
-    },
     /**
      * Message validator.
      */