From bc73fbd83ecd76d2910e425ec8506eba2077e3bc Mon Sep 17 00:00:00 2001
From: Julien Eluard <julien.eluard@gmail.com>
Date: Sat, 2 Sep 2017 17:49:57 +0200
Subject: [PATCH] [FIX #1721] Disable sign-in button when no password has been
 entered

---
 .../ui/screens/accounts/login/styles.cljs     | 10 +++++---
 .../ui/screens/accounts/login/views.cljs      | 25 +++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/status_im/ui/screens/accounts/login/styles.cljs b/src/status_im/ui/screens/accounts/login/styles.cljs
index 5163a569b0..e8dfb336d8 100644
--- a/src/status_im/ui/screens/accounts/login/styles.cljs
+++ b/src/status_im/ui/screens/accounts/login/styles.cljs
@@ -1,6 +1,6 @@
 (ns status-im.ui.screens.accounts.login.styles
   (:require-macros [status-im.utils.styles :refer [defnstyle defstyle]])
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.components.styles :as st]))
 
 (defstyle login-view
   {:flex              1
@@ -25,8 +25,12 @@
              :letter-spacing -0.2}
    :android {:font-size 16}})
 
+(def sign-it-disabled-text
+  (merge sign-it-text
+         {:color st/color-gray2}))
+
 (defstyle sign-in-button
-  {:background-color common/color-blue3
+  {:background-color st/color-blue3
    :align-items      :center
    :justify-content  :center
    :height           52
@@ -41,4 +45,4 @@
    :left             0
    :align-items      :center
    :justify-content  :center
-   :background-color (str common/color-black "1A")})
+   :background-color (str st/color-black "1A")})
diff --git a/src/status_im/ui/screens/accounts/login/views.cljs b/src/status_im/ui/screens/accounts/login/views.cljs
index 66f3172552..61d235306e 100644
--- a/src/status_im/ui/screens/accounts/login/views.cljs
+++ b/src/status_im/ui/screens/accounts/login/views.cljs
@@ -9,9 +9,7 @@
             [status-im.components.toolbar-new.view :refer [toolbar]]
             [status-im.components.toolbar-new.actions :as act]
             [status-im.ui.screens.accounts.login.styles :as st]
-            [status-im.components.react :refer [view
-                                                text
-                                                touchable-highlight]]
+            [status-im.components.react :as react]
             [status-im.i18n :as i18n]
             [status-im.components.react :as components]))
 
@@ -29,7 +27,7 @@
   (dispatch [:login-account address password]))
 
 (defn- error-key [error]
-  ;; TODO Improved selection logic when status-go provide an error code
+  ;; TODO Improve selection logic when status-go provide an error code
   ;; see https://github.com/status-im/status-go/issues/278
   (cond
     (string/starts-with? error "there is no running node")
@@ -43,13 +41,13 @@
 
 (defview login []
   (letsubs [{:keys [address photo-path name password error processing]} [:get :accounts/login]]
-    [view ast/accounts-container
+    [react/view ast/accounts-container
      [status-bar {:type :transparent}]
      [login-toolbar]
-     [view st/login-view
-      [view st/login-badge-container
+     [react/view st/login-view
+      [react/view st/login-badge-container
        [account-badge address photo-path name]
-       [view {:height 8}]
+       [react/view {:height 8}]
        [text-input-with-label {:ref               #(reset! password-text-input %)
                                :label             (i18n/label :t/password)
                                :auto-capitalize   :none
@@ -61,10 +59,11 @@
                                :auto-focus        true
                                :secure-text-entry true
                                :error             (when (pos? (count error)) (i18n/label (error-key error)))}]]
-      [view {:margin-top 16}
-       [touchable-highlight {:on-press #(login-account password-text-input address password)}
-        [view st/sign-in-button
-         [text {:style st/sign-it-text} (i18n/label :t/sign-in)]]]]]
+      (let [enabled? (pos? (count password))]
+        [react/view {:margin-top 16}
+         [react/touchable-highlight (if enabled? {:on-press #(login-account password-text-input address password)})
+          [react/view st/sign-in-button
+           [react/text {:style (if enabled? st/sign-it-text st/sign-it-disabled-text)} (i18n/label :t/sign-in)]]]])]
      (when processing
-       [view st/processing-view
+       [react/view st/processing-view
         [components/activity-indicator {:animating true}]])]))