Merge branch 'develop' into milad/18751-fix-wrong-validation-in-send-…

…screen

src/legacy/status_im/currency/core.cljs

@@ -1,7 +1,6 @@
 (ns legacy.status-im.currency.core
   (:require
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [legacy.status-im.wallet.prices :as prices]
     [utils.re-frame :as rf]))
 
 (defn get-currency
@@ -16,5 +15,4 @@
              :currency
              currency
              ;; on changing currency, we should fetch tokens prices again
-             {:on-success #(rf/dispatch [:wallet/get-wallet-token])})
-            (prices/update-prices)))
+             {:on-success #(rf/dispatch [:wallet/get-wallet-token])})))

src/legacy/status_im/ens/core.cljs

@@ -7,7 +7,6 @@
     [legacy.status-im.ethereum.ens :as ens]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [legacy.status-im.utils.random :as random]
-    [legacy.status-im.wallet.utils :as wallet.utils]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
     [status-im.navigation.events :as navigation]
@@ -126,7 +125,7 @@
   {:events [::set-pub-key]}
   [{:keys [db]}]
   (let [{:keys [username address custom-domain?]} (:ens/registration db)
-        address                                   (or address (wallet.utils/default-address db))
+        address                                   address
         {:keys [public-key]}                      (:profile/profile db)
         chain-id                                  (chain/chain-id db)
         username                                  (fullname custom-domain? username)]

src/legacy/status_im/ethereum/transactions/core.cljs

@@ -4,7 +4,6 @@
     [legacy.status-im.ethereum.decode :as decode]
     [legacy.status-im.ethereum.encode :as encode]
     [legacy.status-im.utils.mobile-sync :as utils.mobile-sync]
-    [legacy.status-im.wallet.core :as wallet]
     [re-frame.core :as re-frame]
     [status-im.common.json-rpc.events :as json-rpc]
     [taoensso.timbre :as log]
@@ -256,24 +255,13 @@
   (let [checksum        (eip55/address->checksum address)
         max-known-block (get-max-block-with-transfers db address)
         effects         (cond-> [(when (seq transfers)
-                                   (set-lowest-fetched-block checksum transfers))
-                                 (wallet/set-max-block-with-transfers checksum transfers)]
+                                   (set-lowest-fetched-block checksum transfers))]
 
                           (seq transfers)
                           (concat
                            []
                            (mapv add-transfer transfers))
 
-                          (and max-known-block
-                               (some #(> (:block %) max-known-block) transfers))
-                          (conj (wallet/update-balances
-                                 [address]
-                                 (zero? max-known-block)))
-
-                          (and (zero? max-known-block)
-                               (empty? transfers))
-                          (conj (wallet/set-zero-balances {:address address}))
-
                           (< (count transfers) limit)
                           (conj (tx-history-end-reached checksum)))]
     (apply rf/merge cofx (tx-fetching-ended [checksum]) effects)))
@@ -282,8 +270,7 @@
   {:events [::new-transfers]}
   [cofx transfers params]
   (rf/merge cofx
-            (handle-new-transfer transfers params)
-            (wallet/stop-fetching-on-empty-tx-history transfers)))
+            (handle-new-transfer transfers params)))
 
 (rf/defn tx-fetching-failed
   {:events [::tx-fetching-failed]}

src/legacy/status_im/events.cljs

@@ -32,10 +32,6 @@
     legacy.status-im.visibility-status-popover.core
     legacy.status-im.visibility-status-updates.core
     legacy.status-im.waku.core
-    legacy.status-im.wallet.accounts.core
-    legacy.status-im.wallet.choose-recipient.core
-    [legacy.status-im.wallet.core :as wallet]
-    legacy.status-im.wallet.custom-tokens.core
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [react-native.core :as rn]
@@ -141,7 +137,6 @@
     (rf/merge cofx
               {:db (dissoc db :app-in-background-since)}
               (mailserver/process-next-messages-request)
-              (wallet/restart-wallet-service-after-background app-in-background-since)
               (when-not new-account?
                 (universal-links/process-stored-event))
               #(when-let [chat-id (:current-chat-id db)]
@@ -198,10 +193,8 @@
                :reset-card                    (keycard/reset-card-screen-did-load %)
                :enter-pin-settings            (keycard/enter-pin-screen-did-load %)
                :keycard-login-pin             (keycard/login-pin-screen-did-load %)
-               :add-new-account-pin           (keycard/enter-pin-screen-did-load %)
                :keycard-authentication-method (keycard/authentication-method-screen-did-load %)
                :multiaccounts                 (keycard/multiaccounts-screen-did-load %)
-               :wallet-legacy                 (wallet/wallet-will-focus %)
                nil)))
 
 ;;TODO :replace by named events

src/legacy/status_im/keycard/card.cljs

@@ -401,15 +401,12 @@
    (merge
     args
     {:on-success
-     (fn [response]
+     (fn [_response]
        (log/debug "[keycard response succ] export-key")
-       (re-frame/dispatch [:keycard.callback/on-export-key-success
-                           response]))
+       (js/alert "feature no longer supported"))
      :on-failure
-     (fn [response]
-       (log/debug "[keycard response fail] export-key")
-       (re-frame/dispatch [:keycard.callback/on-export-key-error
-                           (error-object->map response)]))})))
+     (fn [_response]
+       (log/debug "[keycard response fail] export-key"))})))
 
 (defn unpair-and-delete
   [args]

src/legacy/status_im/keycard/core.cljs

@@ -12,7 +12,6 @@
     [legacy.status-im.keycard.recovery :as recovery]
     [legacy.status-im.keycard.sign :as sign]
     legacy.status-im.keycard.unpair
-    [legacy.status-im.keycard.wallet :as wallet]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [re-frame.db]
     [status-im.navigation.events :as navigation]
@@ -401,10 +400,6 @@
            (= pin-code-length numbers-entered))
       (common/verify-pin {:pin-step :current})
 
-      (and (= enter-step :export-key)
-           (= pin-code-length numbers-entered))
-      (wallet/verify-pin-with-delay)
-
       (and (= enter-step :sign)
            (= pin-code-length numbers-entered))
       (sign/prepare-to-sign)

src/legacy/status_im/keycard/export_key.cljs

@@ -1,51 +1,13 @@
 (ns legacy.status-im.keycard.export-key
   (:require
     [legacy.status-im.keycard.common :as common]
-    [legacy.status-im.keycard.wallet :as wallet]
-    [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
-(rf/defn on-export-key-error
-  {:events [:keycard.callback/on-export-key-error]}
-  [{:keys [db] :as cofx} error]
-  (log/debug "[keycard] export key error" error)
-  (let [tag-was-lost? (common/tag-lost? (:error error))
-        pin-retries   (common/pin-retries (:error error))]
-    (cond
-      tag-was-lost?
-      (rf/merge cofx
-                {:db (assoc-in db [:keycard :pin :status] nil)}
-                (common/set-on-card-connected :wallet-legacy.accounts/generate-new-keycard-account))
-
-      (not (nil? pin-retries))
-      (rf/merge cofx
-                {:db (-> db
-                         (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries)
-                         (update-in [:keycard :pin]
-                                    assoc
-                                    :status       :error
-                                    :enter-step   :export-key
-                                    :puk          []
-                                    :current      []
-                                    :original     []
-                                    :confirmation []
-                                    :sign         []
-                                    :export-key   []
-                                    :error-label  :t/pin-mismatch))}
-                (common/hide-connection-sheet)
-                (when (zero? pin-retries) (common/frozen-keycard-popup)))
-      :else
-      (rf/merge cofx
-                (common/show-wrong-keycard-alert)
-                (common/clear-pin)
-                (common/hide-connection-sheet)))))
-
 (rf/defn on-export-key-success
   {:events [:keycard.callback/on-export-key-success]}
   [{:keys [db] :as cofx} pubkey]
   (let [callback-fn (get-in db [:keycard :on-export-success])]
     (rf/merge cofx
               {:dispatch (callback-fn pubkey)}
-              (wallet/hide-pin-sheet)
               (common/clear-pin)
               (common/hide-connection-sheet))))

src/legacy/status_im/keycard/sign.cljs

@@ -3,7 +3,6 @@
     [clojure.string :as string]
     [legacy.status-im.keycard.common :as common]
     [legacy.status-im.utils.deprecated-types :as types]
-    [legacy.status-im.wallet.utils :as wallet.utils]
     [re-frame.core :as re-frame]
     [taoensso.timbre :as log]
     [utils.address :as address]
@@ -24,8 +23,7 @@
         typed?              (get-in db [:keycard :typed?])
         pin                 (common/vector->string (get-in db [:keycard :pin :sign]))
         from                (or (get-in db [:signing/tx :from :address])
-                                (get-in db [:signing/tx :message :from])
-                                (wallet.utils/default-address db))
+                                (get-in db [:signing/tx :message :from]))
         path                (reduce
                              (fn [_ {:keys [address path]}]
                                (when (address/address= from address)

src/legacy/status_im/mobile_sync_settings/core.cljs

@@ -5,7 +5,6 @@
     [legacy.status-im.multiaccounts.model :as multiaccounts.model]
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [legacy.status-im.utils.mobile-sync :as utils]
-    [legacy.status-im.wallet.core :as wallet]
     [status-im.contexts.chat.home.add-new-contact.events :as add-new-contact]
     [status-im.navigation.events :as navigation]
     [taoensso.timbre :as log]
@@ -35,7 +34,6 @@
        (and logged-in? initialized?)
        [(mailserver/process-next-messages-request)
         (bottom-sheet/hide-bottom-sheet-old)
-        (wallet/restart-wallet-service nil)
         #(add-new-contact/set-new-identity-reconnected %)]
 
        logged-in?
@@ -67,8 +65,7 @@
          (boolean remember-choice?)
          {})
         (when (and cellular? sync?)
-          (mailserver/process-next-messages-request))
-        (wallet/restart-wallet-service nil))))))
+          (mailserver/process-next-messages-request)))))))
 
 (rf/defn mobile-network-continue-syncing
   {:events [:mobile-network/continue-syncing]}

src/legacy/status_im/multiaccounts/logout/core.cljs

@@ -1,6 +1,5 @@
 (ns legacy.status-im.multiaccounts.logout.core
   (:require
-    [legacy.status-im.wallet.core :as wallet]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [status-im.common.keychain.events :as keychain]
@@ -39,7 +38,6 @@
                :profile/get-profiles-overview          #(rf/dispatch
                                                          [:profile/get-profiles-overview-success %])}
               (keychain/save-auth-method key-uid auth-method)
-              (wallet/clear-timeouts)
               (initialize-app-db))))
 
 (rf/defn logout

src/legacy/status_im/network/net_info.cljs

@@ -2,7 +2,6 @@
   (:require
     ["@react-native-community/netinfo" :default net-info]
     [legacy.status-im.mobile-sync-settings.core :as mobile-network]
-    [legacy.status-im.wallet.core :as wallet]
     [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [taoensso.timbre :as log]
@@ -11,12 +10,7 @@
 (rf/defn change-network-status
   [{:keys [db] :as cofx} is-connected?]
   (rf/merge cofx
-            {:db (assoc db :network-status (if is-connected? :online :offline))}
-            (when (and is-connected?
-                       (or (not= (count (get-in db [:wallet-legacy :accounts]))
-                                 (count (get db :profile/wallet-accounts)))
-                           (wallet/has-empty-balances? db)))
-              (wallet/update-balances nil nil))))
+            {:db (assoc db :network-status (if is-connected? :online :offline))}))
 
 (rf/defn change-network-type
   [{:keys [db] :as cofx} old-network-type network-type expensive?]