chore: qa fixes

status-im · Sep 14, 2023 · 4918165 · 4918165
1 parent 744e937
commit 4918165
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 23 deletions.
diff --git a/src/quo2/components/buttons/slide_button/view.cljs b/src/quo2/components/buttons/slide_button/view.cljs
@@ -1,17 +1,17 @@
 (ns quo2.components.buttons.slide-button.view
   (:require
-   [quo2.components.icon :as icon]
-   [quo2.foundations.colors :as colors]
-   [quo2.components.buttons.slide-button.style :as style]
-   [quo2.components.buttons.slide-button.utils :as utils]
-   [quo2.components.buttons.slide-button.animations :as animations]
-   [react-native.gesture :as gesture]
-   [react-native.core :as rn]
-   [reagent.core :as reagent]
-   [oops.core :as oops]
-   [react-native.reanimated :as reanimated]
-   [quo2.components.buttons.slide-button.constants :as constants]
-   [quo2.theme :as quo.theme]))
+    [quo2.components.icon :as icon]
+    [quo2.foundations.colors :as colors]
+    [quo2.components.buttons.slide-button.style :as style]
+    [quo2.components.buttons.slide-button.utils :as utils]
+    [quo2.components.buttons.slide-button.animations :as animations]
+    [react-native.gesture :as gesture]
+    [react-native.core :as rn]
+    [reagent.core :as reagent]
+    [oops.core :as oops]
+    [react-native.reanimated :as reanimated]
+    [quo2.components.buttons.slide-button.constants :as constants]
+    [quo2.theme :as quo.theme]))
 
 (defn- f-slider
   [{:keys [disabled?]}]
@@ -62,7 +62,8 @@
            :style     (merge (style/track {:disabled?           disabled?
                                            :customization-color customization-color
                                            :height              (dimensions :track-height)
-                                           :theme               theme}) container-style)
+                                           :theme               theme})
+                             container-style)
            :on-layout (when-not (some? @track-width)
                         on-track-layout)}
           [reanimated/view {:style (style/track-cover interpolate-track)}

diff --git a/src/status_im2/common/bottom_sheet/view.cljs b/src/status_im2/common/bottom_sheet/view.cljs
@@ -17,6 +17,7 @@
 
 (defn hide
   [translate-y bg-opacity window-height on-close]
+  (rf/dispatch [:dismiss-keyboard])
   (when (fn? on-close)
     (on-close))
   ;; it will be better to use animation callback, but it doesn't work

diff --git a/src/status_im2/common/standard_authentication/enter_password/view.cljs b/src/status_im2/common/standard_authentication/enter_password/view.cljs
@@ -4,15 +4,17 @@
             [react-native.core :as rn]
             [utils.re-frame :as rf]
             [status-im2.common.standard-authentication.enter-password.style :as style]
-            [status-im2.common.standard-authentication.password-input.view :as password-input]))
+            [status-im2.common.standard-authentication.password-input.view :as password-input]
+            [status-im.multiaccounts.core :as multiaccounts]))
 
 (defn view
   [{:keys [on-enter-password button-label]}]
   (let [{:keys [key-uid display-name
-                customization-color]}       (rf/sub [:profile/multiaccount])
+                customization-color]
+         :as   account}                     (rf/sub [:profile/multiaccount])
         {:keys [error processing password]} (rf/sub [:profile/login])
         sign-in-enabled?                    (rf/sub [:sign-in-enabled?])
-        profile-picture                     (rf/sub [:profile/login-profiles-picture key-uid])]
+        profile-picture                     (multiaccounts/displayed-photo account)]
     [:<>
      [rn/view {:style style/enter-password-container}
       [rn/view
@@ -25,7 +27,9 @@
        [rn/view
         {:style style/context-tag}
         [quo/context-tag
-         {:profile-picture     profile-picture
+         {:type                :default
+          :blur?               true
+          :profile-picture     profile-picture
           :full-name           display-name
           :customization-color customization-color
           :size                24}]]

diff --git a/src/status_im2/common/standard_authentication/standard_auth/view.cljs b/src/status_im2/common/standard_authentication/standard_auth/view.cljs
@@ -16,8 +16,8 @@
   (rf/dispatch [:set-in [:profile/login :error] ""]))
 
 (defn authorize
-  [{:keys [on-enter-password biometric-auth? on-auth-success on-auth-fail
-           fallback-button-label theme on-close]}]
+  [{:keys [on-enter-password biometric-auth? on-auth-success on-auth-fail on-close
+           fallback-button-label theme blur?]}]
   (biometric/get-supported-type
    (fn [biometric-type]
      (if (and biometric-auth? biometric-type)
@@ -31,7 +31,7 @@
                        (when on-auth-fail (on-auth-fail error))
                        (rf/dispatch [:show-bottom-sheet
                                      {:theme   theme
-                                      :shell?  true
+                                      :shell?  blur?
                                       :content (fn []
                                                  [enter-password/view
                                                   {:on-enter-password on-enter-password}])}]))})
@@ -40,6 +40,7 @@
          (rf/dispatch [:show-bottom-sheet
                        {:on-close on-close
                         :theme    theme
+                        :shell?   blur?
                         :content  (fn []
                                     [enter-password/view
                                      {:on-enter-password on-enter-password
@@ -57,14 +58,16 @@
                  on-auth-success
                  on-auth-fail
                  size
-                 theme]}]
+                 theme
+                 blur?]}]
       [rn/view {:style {:flex 1}}
        [quo/slide-button
         {:size                size
          :customization-color customization-color
          :on-reset            (when @reset-slider? #(reset! reset-slider? false))
          :on-complete         #(authorize {:on-close              on-close
                                            :theme                 theme
+                                           :blur?                 blur?
                                            :on-enter-password     on-enter-password
                                            :biometric-auth?       biometric-auth?
                                            :on-auth-success       on-auth-success

diff --git a/src/status_im2/contexts/syncing/setup_syncing/view.cljs b/src/status_im2/contexts/syncing/setup_syncing/view.cljs
@@ -27,7 +27,7 @@
   (let [{:keys [customization-color]} (rf/sub [:profile/multiaccount])
         valid-for-ms                  (reagent/atom code-valid-for-ms)
         code                          (reagent/atom nil)
-        delay-ms                         (reagent/atom nil)
+        delay-ms                      (reagent/atom nil)
         timestamp                     (reagent/atom nil)
         set-code                      (fn [connection-string]
                                         (when (sync-utils/valid-connection-string? connection-string)
@@ -117,7 +117,8 @@
           (when-not (sync-utils/valid-connection-string? @code)
             [rn/view {:style style/standard-auth}
              [standard-auth/view
-              {:size                  :size/s-40
+              {:blur?                 true
+               :size                  :size/s-40
                :track-text            (i18n/label :t/slide-to-reveal-code)
                :customization-color   customization-color
                :on-enter-password     on-enter-password