Add steps to password reset

Author: shivekkhurana

src/status_im/multiaccounts/reset_password/core.cljs

@@ -4,6 +4,7 @@
             [status-im.utils.types :as types]
             [clojure.string :as string]
             [status-im.utils.security :as security]
+            [status-im.utils.keychain.core :as keychain]
             [status-im.popover.core :as popover]
             [status-im.native-module.core :as status]
             [status-im.ethereum.core :as ethereum]))
@@ -34,13 +35,19 @@
 (fx/defn password-reset-success
   {:events [::password-reset-success]}
   [{:keys [db] :as cofx}]
-  (fx/merge cofx
-            {:db (dissoc
-                  db
-                  :multiaccount/reset-password-form-vals
-                  :multiaccount/reset-password-errors
-                  :multiaccount/reset-password-next-enabled?
-                  :multiaccount/resetting-password?)}))
+  (let [{:keys [key-uid]} (:multiaccount db)
+        auth-method       (get db :auth-method keychain/auth-method-none)
+        new-password      (get-in db [:multiaccount/reset-password-form-vals :new-password])]
+    (fx/merge cofx
+              {:db (dissoc
+                    db
+                    :multiaccount/reset-password-form-vals
+                    :multiaccount/reset-password-errors
+                    :multiaccount/reset-password-next-enabled?
+                    :multiaccount/resetting-password?)}
+              ;; update password in keychain if biometrics are enabled
+              (when (= auth-method keychain/auth-method-biometric)
+                (keychain/save-user-password key-uid new-password)))))
 
 (defn change-db-password-cb [res]
   (let [{:keys [error]} (types/json->clj res)]
@@ -88,3 +95,9 @@
    (assoc form-vals
           :address
           (get-in db [:multiaccount :wallet-root-address]))})
+
+(comment
+  (-> re-frame.db/app-db
+      deref
+      :auth-method)
+  )

src/status_im/ui/screens/reset_password/views.cljs

@@ -11,12 +11,14 @@
   (:require-macros [status-im.utils.views :refer [defview letsubs]]))
 
 (defn input-field
-  ([id errors on-submit] (input-field id errors on-submit false))
-  ([id errors on-submit focus?]
+  [{:keys [id errors on-submit disabled? focus?]
+    :or   {disabled? false focus? false}}]
+  [react/view {:style {:opacity (if disabled? 0.33 1)}}
    [quo/text-input
     {:placeholder         (i18n/label id)
      :default-value       ""
      :auto-focus          focus?
+     :editable            (not disabled?)
      :accessibility-label id
      :show-cancel         false
      :style               {:margin-bottom 32}
@@ -28,20 +30,33 @@
      :error               (when-let [error (get errors id)]
                             (if (keyword? error)
                               (i18n/label error)
-                              error))}]))
+                              error))}]])
 
 (defview reset-password []
   (letsubs [{:keys [form-vals errors next-enabled?]}
             [:multiaccount/reset-password-form-vals-and-errors]]
-    (let [on-submit #(re-frame/dispatch [::reset-password/reset form-vals])]
+    (let [{:keys [current-password
+                  new-password]} form-vals
+          on-submit              #(re-frame/dispatch [::reset-password/reset form-vals])]
       [react/keyboard-avoiding-view {:flex 1}
        [react/view {:style {:flex            1
                             :justify-content :space-between}}
-        [react/view {:style {:padding-horizontal 16
+        [react/view {:style {:margin-top         32
+                             :padding-horizontal 16
                              :padding-vertical   16}}
-         [input-field :current-password errors on-submit true]
-         [input-field :new-password errors on-submit]
-         [input-field :confirm-new-password errors on-submit]]
+         [input-field {:id        :current-password
+                       :errors    errors
+                       :on-sumbit on-submit
+                       :disabled? false
+                       :focus?    true}]
+         [input-field {:id        :new-password
+                       :errors    errors
+                       :on-sumbit on-submit
+                       :disabled? (zero? (count current-password))}]
+         [input-field {:id        :confirm-new-password
+                       :errors    errors
+                       :on-sumbit on-submit
+                       :disabled? (zero? (count new-password))}]]
         [quo/text {:color :secondary :align :center :size :small
                    :style {:padding-horizontal 16}}
          (i18n/label :t/password-description)]
@@ -85,4 +100,4 @@
      [react/view {:align-items :center}
       [quo/button {:on-press #(re-frame/dispatch [:hide-popover])
                    :disabled resetting?}
-       (i18n/label :t/ok-got-it)]]]))
+       (i18n/label :t/okay)]]]))