[Fix] Issues on Create password screen

Signed-off-by: Mohamed Javid <[email protected]>
status-im · May 15, 2023 · 5a81592 · 5a81592
1 parent 510b625
commit 5a81592
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/status_im2/contexts/onboarding/create_password/style.cljs b/src/status_im2/contexts/onboarding/create_password/style.cljs
@@ -1,6 +1,8 @@
 (ns status-im2.contexts.onboarding.create-password.style
   (:require [quo2.foundations.colors :as colors]))
 
+(def flex-fill {:flex 1})
+
 (def heading {:margin-bottom 20})
 (def heading-subtitle {:color colors/white})
 (def heading-title (assoc heading-subtitle :margin-bottom 8))

diff --git a/src/status_im2/contexts/onboarding/create_password/view.cljs b/src/status_im2/contexts/onboarding/create_password/view.cljs
@@ -170,7 +170,7 @@
                :on-change #(swap! accepts-disclaimer? not)
                :checked?  @accepts-disclaimer?}
               (i18n/label :t/password-creation-disclaimer)]])
-          (when (= @focused-input :password)
+          (when (and (= @focused-input :password) (not same-passwords?))
             [help
              {:validations       validations
               :password-strength password-strength}])
@@ -215,22 +215,25 @@
              (ocall will-show-listener "remove")
              (ocall will-hide-listener "remove"))))
        [])
-      [:<>
-       [background/view true]
-       [rn/keyboard-avoiding-view
-        {:style {:flex 1}}
-        [navigation-bar/navigation-bar
-         {:top                   top
-          :right-section-buttons [{:type                :blur-bg
-                                   :icon                :i/info
-                                   :icon-override-theme :dark
-                                   :on-press            #(rf/dispatch
-                                                          [:show-bottom-sheet
-                                                           {:content create-password-doc
-                                                            :shell?  true}])}]}]
-        [password-form]
-        [rn/view {:style {:height (if-not @keyboard-shown? bottom 0)}}]]])))
+      [rn/touchable-without-feedback
+       {:on-press   rn/dismiss-keyboard!
+        :accessible false}
+       [rn/view {:style style/flex-fill}
+        [rn/keyboard-avoiding-view {:style style/flex-fill}
+         [navigation-bar/navigation-bar
+          {:top                   top
+           :right-section-buttons [{:type                :blur-bg
+                                    :icon                :i/info
+                                    :icon-override-theme :dark
+                                    :on-press            #(rf/dispatch
+                                                           [:show-bottom-sheet
+                                                            {:content create-password-doc
+                                                             :shell?  true}])}]}]
+         [password-form]
+         [rn/view {:style {:height (if-not @keyboard-shown? bottom 0)}}]]]])))
 
 (defn create-password
   []
-  [:f> f-create-password])
+  [:<>
+   [background/view true]
+   [:f> f-create-password]])