[#10434] Disable touch events during autologin

status-im · May 12, 2020 · 0cc8704 · 0cc8704
1 parent 461e67a
commit 0cc8704
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 34 deletions.
diff --git a/src/status_im/multiaccounts/biometric/core.cljs b/src/status_im/multiaccounts/biometric/core.cljs
@@ -163,12 +163,14 @@
 
 (fx/defn biometric-auth
   {:events [:biometric-authenticate]}
-  [cofx]
-  (authenticate
+  [{:keys [db] :as cofx}]
+  (fx/merge
    cofx
-   #(re-frame/dispatch [:biometric-auth-done %])
-   {:reason             (i18n/label :t/biometric-auth-reason-login)
-    :ios-fallback-label (i18n/label :t/biometric-auth-login-ios-fallback-label)}))
+   {:db (assoc db :disable-touch-events? false)}
+   (authenticate
+    #(re-frame/dispatch [:biometric-auth-done %])
+    {:reason             (i18n/label :t/biometric-auth-reason-login)
+     :ios-fallback-label (i18n/label :t/biometric-auth-login-ios-fallback-label)})))
 
 (fx/defn enable
   {:events [:biometric/enable]}

diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs
@@ -92,7 +92,8 @@
     {:db (-> db
              (assoc-in [:multiaccounts/login :processing] true)
              (dissoc :intro-wizard)
-             (update :hardwallet dissoc :flow))
+             (update :hardwallet dissoc :flow)
+             (assoc :disable-touch-events? true))
      ::login [(types/clj->json {:name       name
                                 :key-uid    key-uid
                                 :photo-path photo-path})
@@ -294,7 +295,8 @@
                                :card-read-in-progress?
                                :pin
                                :multiaccount)
-                       (assoc :logged-in-since now))
+                       (assoc :logged-in-since now
+                              :disable-touch-events? false))
                ::json-rpc/call
                [{:method     "web3_clientVersion"
                  :on-success #(re-frame/dispatch [::initialize-web3-client-version %])}]}
@@ -354,9 +356,12 @@
   (let [keycard-multiaccount? (boolean (get-in db [:multiaccounts/multiaccounts key-uid :keycard-pairing]))]
     (log/debug "[login] get-credentials"
                "keycard-multiacc?" keycard-multiaccount?)
-    (if keycard-multiaccount?
-      (keychain/get-hardwallet-keys cofx key-uid)
-      (keychain/get-user-password cofx key-uid))))
+    (fx/merge
+     cofx
+     {:db (assoc db :disable-touch-events? true)}
+     (if keycard-multiaccount?
+       (keychain/get-hardwallet-keys key-uid)
+       (keychain/get-user-password key-uid)))))
 
 (fx/defn get-auth-method-success
   "Auth method: nil - not supported, \"none\" - not selected, \"password\", \"biometric\", \"biometric-prepare\""

diff --git a/src/status_im/signals/core.cljs b/src/status_im/signals/core.cljs
@@ -15,6 +15,7 @@
              "error" error)
   (if error
     {:db (-> db
+             (assoc :disable-touch-events? false)
              (update :multiaccounts/login dissoc :processing)
              (assoc-in [:multiaccounts/login :error]
                        ;; NOTE: the only currently known error is

diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
@@ -89,7 +89,7 @@
 (reg-root-key-sub :app-active-since :app-active-since)
 (reg-root-key-sub :connectivity/ui-status-properties :connectivity/ui-status-properties)
 (reg-root-key-sub :logged-in-since :logged-in-since)
-
+(reg-root-key-sub :disable-touch-events? :disable-touch-events?)
 ;;NOTE this one is not related to ethereum network
 ;; it is about cellular network/ wifi network
 (reg-root-key-sub :network/type :network/type)

diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs
@@ -97,26 +97,29 @@
     :component-will-unmount utils.universal-links/finalize
     :reagent-render
     (fn []
-      [react/safe-area-provider
-       ^{:key (str @colors/theme @reloader/cnt)}
-       [react/view {:flex             1
-                    :background-color colors/black-persist}
-        [navigation/navigation-container
-         (merge {:ref               (fn [r]
-                                      (navigation/set-navigator-ref r))
-                 :onStateChange     on-state-change
-                 :enableURLHandling false}
-                (when debug?
-                  {:enableURLHandling true
-                   :initialState      @state}))
-         [main-app-navigator]]
-        [wallet/prepare-transaction]
-        [wallet/request-transaction]
-        [wallet/select-account]
-        [signing/signing]
-        [bottom-sheet]
-        [popover/popover]
-        (when debug?
-          [reloader/reload-view @reloader/cnt])
-        (when config/keycard-test-menu-enabled?
-          [hardwallet.test-menu/test-menu])]])}))
+      (let [disbale-touch-events?
+            @(re-frame/subscribe [:disable-touch-events?])]
+        [react/safe-area-provider
+         ^{:key (str @colors/theme @reloader/cnt)}
+         [react/view {:flex             1
+                      :background-color colors/black-persist
+                      :pointer-events disbale-touch-events?}
+          [navigation/navigation-container
+           (merge {:ref               (fn [r]
+                                        (navigation/set-navigator-ref r))
+                   :onStateChange     on-state-change
+                   :enableURLHandling false}
+                  (when debug?
+                    {:enableURLHandling true
+                     :initialState      @state}))
+           [main-app-navigator]]
+          [wallet/prepare-transaction]
+          [wallet/request-transaction]
+          [wallet/select-account]
+          [signing/signing]
+          [bottom-sheet]
+          [popover/popover]
+          (when debug?
+            [reloader/reload-view @reloader/cnt])
+          (when config/keycard-test-menu-enabled?
+            [hardwallet.test-menu/test-menu])]]))}))