fix: use "Biometric" instead of Touch ID when no Biometric found (#20555)

Signed-off-by: yqrashawn <namy.19@gmail.com>

src/legacy/status_im/events.cljs

@@ -135,7 +135,8 @@
                                  (>= (- now app-in-background-since)
                                      constants/ms-in-bg-for-require-bioauth))]
     (rf/merge cofx
-              {:db (dissoc db :app-in-background-since)}
+              {:db                                   (dissoc db :app-in-background-since)
+               :effects.biometric/get-supported-type nil}
               (mailserver/process-next-messages-request)
               (when-not new-account?
                 (universal-links/process-stored-event))

src/quo/components/wallet/token_input/view.cljs

@@ -81,8 +81,9 @@
                                         (js->clj :keywordize-keys true)
                                         (on-selection-change))))]
     (fn [{:keys [token customization-color show-keyboard? crypto? currency value error? selection
-                 handle-on-swap]
-          :or   {show-keyboard? true}}]
+                 handle-on-swap allow-selection?]
+          :or   {show-keyboard?   true
+                 allow-selection? true}}]
       (let [theme        (quo.theme/use-theme)
             window-width (:width (rn/get-window))]
         [rn/pressable
@@ -107,7 +108,8 @@
                      :selection-color          customization-color
                      :show-soft-input-on-focus show-keyboard?
                      :on-selection-change      handle-selection-change
-                     :selection                (clj->js selection)}
+                     :selection                (clj->js selection)
+                     :editable                 allow-selection?}
               controlled-input?       (assoc :value value)
               (not controlled-input?) (assoc :default-value value-internal))]
            [token-name-text theme (if crypto? token currency)]]]

src/status_im/common/biometric/utils.cljs

@@ -11,9 +11,10 @@
 (defn get-label-by-type
   [biometric-type]
   (condp = biometric-type
-    constants/biometrics-type-android (i18n/label :t/biometric-fingerprint)
-    constants/biometrics-type-face-id (i18n/label :t/biometric-faceid)
-    (i18n/label :t/biometric-touchid)))
+    constants/biometrics-type-android  (i18n/label :t/biometric-fingerprint)
+    constants/biometrics-type-face-id  (i18n/label :t/biometric-faceid)
+    constants/biometrics-type-touch-id (i18n/label :t/biometric-touchid)
+    (i18n/label :t/biometric)))
 
 (defn get-icon-by-type
   [biometric-type]

src/status_im/contexts/communities/events.cljs

@@ -230,7 +230,7 @@
   (when community
     {:db (update db :communities/fetching-communities dissoc community-id)
      :fx [[:dispatch [:communities/handle-community community]]
-          [:dispatch [:communities/update-last-opened-at community-id]]
+          [:dispatch [:chat.ui/spectate-community community-id]]
           [:dispatch
            [:chat.ui/cache-link-preview-data (link-preview.events/community-link community-id)
             community]]]}))
@@ -251,7 +251,7 @@
               :error err}))
 
 (defn fetch-community
-  [{:keys [db]} [{:keys [community-id update-last-opened-at?]}]]
+  [{:keys [db]} [{:keys [community-id]}]]
   (when (and community-id
              (not (get-in db [:communities community-id]))
              (not (get-in db [:communities/fetching-communities community-id])))
@@ -262,11 +262,8 @@
                                     :WaitForResponse true}]
                       :on-success (fn [community]
                                     (if community
-                                      (do (when update-last-opened-at?
-                                            (rf/dispatch [:communities/update-last-opened-at
-                                                          community-id]))
-                                          (rf/dispatch [:chat.ui/community-fetched community-id
-                                                        community]))
+                                      (rf/dispatch [:chat.ui/community-fetched community-id
+                                                    community])
                                       (failed-to-fetch-community
                                        community-id
                                        "community wasn't found at the store node")))
@@ -280,8 +277,7 @@
      [:schema
       [:vector
        [:map {:closed true}
-        [:community-id {:optional true} :string]
-        [:update-last-opened-at? {:optional true} [:maybe :boolean]]]]]]]
+        [:community-id {:optional true} :string]]]]]]
    [:maybe
     [:map
      [:db map?]
@@ -340,10 +336,9 @@
       (rf/merge
        cofx
        {:fx [[:dispatch [:chat.ui/spectate-community community-id]]
+             [:dispatch [:communities/update-last-opened-at community-id]]
              [:dispatch
-              [:communities/fetch-community
-               {:community-id           community-id
-                :update-last-opened-at? true}]]
+              [:communities/fetch-community {:community-id community-id}]]
              [:dispatch [:navigate-to :community-overview community-id]]
              (when (get-in db [:communities community-id :joined])
                [:dispatch
@@ -358,10 +353,7 @@
   (let [community-id (or community-id (get-in db [:chats chat-id :community-id]))]
     (merge
      {:fx [(when community-id
-             [:dispatch
-              [:communities/fetch-community
-               {:community-id           community-id
-                :update-last-opened-at? true}]])
+             [:dispatch [:communities/fetch-community {:community-id community-id}]])
            (if pop-to-root?
              [:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]]
              [:dispatch

src/status_im/contexts/communities/events_test.cljs

@@ -49,7 +49,7 @@
         (testing "dispatch fxs"
           (is (match?
                {:fx [[:dispatch [:communities/handle-community {:id community-id}]]
-                     [:dispatch [:communities/update-last-opened-at community-id]]
+                     [:dispatch [:chat.ui/spectate-community community-id]]
                      [:dispatch
                       [:chat.ui/cache-link-preview-data "community-link+community-id"
                        {:id community-id}]]]}
@@ -60,7 +60,7 @@
         (testing "dispatch fxs, do not spectate community"
           (is (match?
                {:fx [[:dispatch [:communities/handle-community {:id community-id}]]
-                     [:dispatch [:communities/update-last-opened-at community-id]]
+                     [:dispatch [:chat.ui/spectate-community community-id]]
                      [:dispatch
                       [:chat.ui/cache-link-preview-data "community-link+community-id"
                        {:id community-id}]]]}
@@ -71,7 +71,7 @@
         (testing "dispatch fxs, do not spectate community"
           (is (match?
                {:fx [[:dispatch [:communities/handle-community {:id community-id}]]
-                     [:dispatch [:communities/update-last-opened-at community-id]]
+                     [:dispatch [:chat.ui/spectate-community community-id]]
                      [:dispatch
                       [:chat.ui/cache-link-preview-data "community-link+community-id"
                        {:id community-id}]]]}

src/status_im/contexts/preview/quo/wallet/token_input.cljs

@@ -23,6 +23,8 @@
     :options [{:key :usd}
               {:key :eur}]}
    {:key  :error?
+    :type :boolean}
+   {:key  :allow-selection?
     :type :boolean}])
 
 (defn view
@@ -33,7 +35,8 @@
                                  :networks            networks
                                  :title               title
                                  :customization-color :blue
-                                 :show-keyboard?      false})
+                                 :show-keyboard?      false
+                                 :allow-selection?    true})
         value     (reagent/atom "")
         set-value (fn [v]
                     (swap! value str v))

src/status_im/contexts/wallet/send/input_amount/view.cljs

@@ -349,23 +349,24 @@
        :on-press      on-navigate-back
        :switcher-type :select-account}]
      [quo/token-input
-      {:container-style style/input-container
-       :token           token-symbol
-       :currency        fiat-currency
-       :currency-symbol currency-symbol
-       :crypto-decimals (min token-decimals 6)
-       :error?          (controlled-input/input-error input-state)
-       :networks        (seq send-enabled-networks)
-       :title           (i18n/label
-                         :t/send-limit
-                         {:limit (if crypto-currency?
-                                   (utils/make-limit-label-crypto current-limit token-symbol)
-                                   (utils/make-limit-label-fiat current-limit currency-symbol))})
-       :conversion      conversion-rate
-       :show-keyboard?  false
-       :value           input-amount
-       :on-swap         swap-between-fiat-and-crypto
-       :on-token-press  show-select-asset-sheet}]
+      {:container-style  style/input-container
+       :token            token-symbol
+       :currency         fiat-currency
+       :currency-symbol  currency-symbol
+       :crypto-decimals  (min token-decimals 6)
+       :error?           (controlled-input/input-error input-state)
+       :networks         (seq send-enabled-networks)
+       :title            (i18n/label
+                          :t/send-limit
+                          {:limit (if crypto-currency?
+                                    (utils/make-limit-label-crypto current-limit token-symbol)
+                                    (utils/make-limit-label-fiat current-limit currency-symbol))})
+       :conversion       conversion-rate
+       :show-keyboard?   false
+       :value            input-amount
+       :on-swap          swap-between-fiat-and-crypto
+       :on-token-press   show-select-asset-sheet
+       :allow-selection? false}]
      [routes/view
       {:token                                     token-by-symbol
        :input-value                               input-amount

src/status_im/contexts/wallet/send/routes/view.cljs

@@ -170,22 +170,23 @@
            {:title       (i18n/label :t/send-from-network {:network network-name-str})
             :description (i18n/label :t/define-amount-sent-from-network {:network network-name-str})}]
           [quo/token-input
-           {:container-style style/input-container
-            :token           token-symbol
-            :currency        fiat-currency
-            :currency-symbol currency-symbol
-            :crypto-decimals (min token-decimals 6)
-            :error?          (controlled-input/input-error input-state)
-            :networks        [network-details]
-            :title           (i18n/label
-                              :t/send-limit
-                              {:limit (if crypto-currency?
-                                        (utils/make-limit-label-crypto current-limit token-symbol)
-                                        (utils/make-limit-label-fiat current-limit currency-symbol))})
-            :conversion      conversion-rate
-            :show-keyboard?  false
-            :value           (controlled-input/input-value input-state)
-            :on-swap         swap-between-fiat-and-crypto}]
+           {:container-style  style/input-container
+            :token            token-symbol
+            :currency         fiat-currency
+            :currency-symbol  currency-symbol
+            :crypto-decimals  (min token-decimals 6)
+            :error?           (controlled-input/input-error input-state)
+            :networks         [network-details]
+            :title            (i18n/label
+                               :t/send-limit
+                               {:limit (if crypto-currency?
+                                         (utils/make-limit-label-crypto current-limit token-symbol)
+                                         (utils/make-limit-label-fiat current-limit currency-symbol))})
+            :conversion       conversion-rate
+            :show-keyboard?   false
+            :value            (controlled-input/input-value input-state)
+            :on-swap          swap-between-fiat-and-crypto
+            :allow-selection? false}]
           [quo/disclaimer
            {:on-change           (fn [checked?]
                                    (set-is-amount-locked checked?))

translations/en.json

@@ -70,6 +70,7 @@
     "bio-added": "Bio added",
     "bio-is-too-long": "Bio is too long",
     "bio-updated": "Bio updated",
+    "biometric": "Biometric",
     "biometric-auth-android-sensor-desc": "Touch sensor",
     "biometric-auth-android-sensor-error-desc": "Failed",
     "biometric-auth-android-title": "Authentication Required",