[#7015] Fix amount validation in chat input

status-im · Jul 26, 2019 · 7381139 · 7381139
1 parent 808aa79
commit 7381139
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs
@@ -107,8 +107,9 @@
   "command is complete, proceed with command processing"
   [cofx input-text command custom-params]
   (fx/merge cofx
-            (commands.sending/validate-and-send input-text command custom-params)
-            (set-chat-input-text nil)
+            (if-let [results (commands.sending/validate-and-send input-text command custom-params)]
+              results
+              (set-chat-input-text nil))
             (process-cooldown)))
 
 (defn command-not-complete-fx

diff --git a/src/status_im/ui/screens/chat/input/send_button.cljs b/src/status_im/ui/screens/chat/input/send_button.cljs
@@ -15,14 +15,15 @@
 
 (defview send-button-view [{:keys [input-text]} on-send-press]
   (letsubs [{:keys [command-completion]} [:chats/selected-chat-command]
-            disconnected? [:disconnected?]
+            disconnected? [:disconnected?] validation-result [:chats/validation-messages]
             {:keys [processing]} [:multiaccounts/login]]
     (when (and (sendable? input-text disconnected? processing)
                (or (not command-completion)
                    (#{:complete :less-than-needed} command-completion)))
       [react/touchable-highlight
        {:on-press on-send-press}
        [vector-icons/icon :main-icons/arrow-up
-        {:container-style     style/send-message-container
-         :accessibility-label :send-message-button
-         :color               :white}]])))
+        (merge {:accessibility-label :send-message-button}
+               (if validation-result
+                 {:container-style style/send-message-container-error :color :red}
+                 {:container-style style/send-message-container       :color :white}))]])))
diff --git a/src/status_im/ui/screens/chat/input/validation_messages.cljs b/src/status_im/ui/screens/chat/input/validation_messages.cljs
@@ -2,6 +2,7 @@
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [re-frame.core :as re-frame]
             [status-im.ui.components.react :as react]
+            [status-im.ui.components.tooltip.views :as tooltip]
             [status-im.ui.screens.chat.styles.input.validation-message :as style]
             [status-im.i18n :as i18n]))
 
@@ -25,5 +26,7 @@
                       {:title       (i18n/label :t/error)
                        :description validation-result}
                       validation-result)]
-        [react/view (style/root (+ input-height chat-input-margin))
-         [messages-list [validation-message message]]]))))
+        [tooltip/tooltip (:description message)
+         {:box-shadow       "0px 4px 12px rgba(0, 34, 51, 0.08), 0px 2px 4px rgba(0, 34, 51, 0.16)"
+          :font-size        12
+          :bottom-value     -13}]))))
diff --git a/src/status_im/ui/screens/chat/styles/input/send_button.cljs b/src/status_im/ui/screens/chat/styles/input/send_button.cljs
@@ -10,3 +10,6 @@
    :margin           10
    :margin-left      8
    :margin-bottom    11})
+
+(def send-message-container-error
+  (merge send-message-container {:background-color colors/red-transparent-10}))