From 8b417524faef2c3ad45326fdf9a5cc7ae2dcb2fa Mon Sep 17 00:00:00 2001 From: Volodymyr Kozieiev Date: Wed, 10 Apr 2024 16:25:41 +0100 Subject: [PATCH] Remove unused subs (#19530) * Remove unused subs * lint fix --- src/legacy/status_im/subs/keycard.cljs | 193 --------------------- src/legacy/status_im/subs/mailservers.cljs | 21 --- src/legacy/status_im/subs/stickers.cljs | 6 - src/status_im/subs/chats.cljs | 129 -------------- src/status_im/subs/communities.cljs | 50 ------ src/status_im/subs/communities_test.cljs | 31 ---- src/status_im/subs/contact.cljs | 45 ----- src/status_im/subs/general.cljs | 69 -------- src/status_im/subs/messages.cljs | 6 - src/status_im/subs/pairing.cljs | 5 - src/status_im/subs/profile.cljs | 94 ---------- src/status_im/subs/wallet/wallet.cljs | 10 -- 12 files changed, 659 deletions(-) diff --git a/src/legacy/status_im/subs/keycard.cljs b/src/legacy/status_im/subs/keycard.cljs index 5f866ef31a..dd9bb23ea1 100644 --- a/src/legacy/status_im/subs/keycard.cljs +++ b/src/legacy/status_im/subs/keycard.cljs @@ -1,210 +1,17 @@ (ns legacy.status-im.subs.keycard (:require - [clojure.string :as string] [legacy.status-im.keycard.common :as common] [re-frame.core :as re-frame] - [utils.address :as address] [utils.datetime :as datetime])) -(re-frame/reg-sub - :keycard/nfc-enabled? - (fn [db] - (get-in db [:keycard :nfc-enabled?]))) - -(re-frame/reg-sub - :keycard/card-read-in-progress? - (fn [db] - (get-in db [:keycard :card-read-in-progress?] false))) - -(re-frame/reg-sub - :keycard-setup-step - (fn [db] - (get-in db [:keycard :setup-step]))) - -(re-frame/reg-sub - :keycard-card-state - (fn [db] - (get-in db [:keycard :card-state]))) - -(re-frame/reg-sub - :keycard-flow - (fn [db] - (get-in db [:keycard :flow]))) - -(re-frame/reg-sub - :keycard-flow-steps - (fn [db] - (case (get-in db [:keycard :flow]) - :recovery "2" - "3"))) - -(re-frame/reg-sub - :keycard-pair-code - (fn [db] - (get-in db [:keycard :secrets :password]))) - -(re-frame/reg-sub - :keycard-recovery-phrase-word - (fn [db] - (get-in db - [:keycard - :recovery-phrase - (get-in db [:keycard :recovery-phrase :step])]))) - -(re-frame/reg-sub - :keycard-recovery-phrase-input-word - (fn [db] - (get-in db [:keycard :recovery-phrase :input-word]))) - -(re-frame/reg-sub - :keycard-recovery-phrase-confirm-error - (fn [db] - (get-in db [:keycard :recovery-phrase :confirm-error]))) - -(re-frame/reg-sub - :keycard-recovery-phrase-step - (fn [db] - (get-in db [:keycard :recovery-phrase :step]))) - -(re-frame/reg-sub - :keycard-secrets - (fn [db] - (get-in db [:keycard :secrets]))) - -(re-frame/reg-sub - :keycard-puk-code - (fn [db] - (->> (get-in db [:keycard :secrets :puk]) - (partition 4) - (map string/join) - (string/join " ")))) - -(re-frame/reg-sub - :keycard-setup-error - (fn [db] - (get-in db [:keycard :setup-error]))) - -(re-frame/reg-sub - :keycard-mnemonic - (fn [db] - (map-indexed vector - (partition 3 - (map-indexed vector - (string/split - (get-in db [:keycard :secrets :mnemonic]) - #" ")))))) - -(re-frame/reg-sub - :keycard-application-info - (fn [db] - (get-in db [:keycard :application-info]))) - -(re-frame/reg-sub - :keycard-application-info-error - (fn [db] - (get-in db [:keycard :application-info-error]))) - -(re-frame/reg-sub - :keycard-multiaccount - (fn [db] - (get-in db [:keycard :profile/profile]))) - -(re-frame/reg-sub - :keycard-multiaccount-wallet-address - (fn [db] - (str "0x" (get-in db [:keycard :multiaccount-wallet-address])))) - -(re-frame/reg-sub - :keycard-multiaccount-whisper-public-key - (fn [db] - (address/normalized-hex (get-in db [:keycard :multiaccount-whisper-public-key])))) - (re-frame/reg-sub :keycard-paired-on (fn [db] (some-> (get-in db [:profile/profile :keycard-paired-on]) (datetime/timestamp->year-month-day-date)))) -(re-frame/reg-sub - :keycard-multiaccount-pairing - (fn [db] - (get-in db [:profile/profile :keycard-pairing]))) - -(re-frame/reg-sub - :keycard/pin-retry-counter - (fn [db] - (get-in db [:keycard :application-info :pin-retry-counter]))) - -(re-frame/reg-sub - :keycard/puk-retry-counter - (fn [db] - (get-in db [:keycard :application-info :puk-retry-counter]))) - -(re-frame/reg-sub - :keycard/retry-counter - :<- [:keycard/pin-retry-counter] - :<- [:keycard/puk-retry-counter] - (fn [[pin puk]] - (if (zero? pin) puk pin))) - -(re-frame/reg-sub - :keycard-reset-card-disabled? - (fn [db] - (get-in db [:keycard :reset-card :disabled?] false))) - (re-frame/reg-sub :keycard-multiaccount? common/keycard-multiaccount?) -(re-frame/reg-sub - :keycard/original-pin - (fn [db] - (get-in db [:keycard :pin :original]))) -(re-frame/reg-sub - :keycard/login-pin - (fn [db] - (get-in db [:keycard :pin :login]))) - -(re-frame/reg-sub - :keycard/pin-confirmation - (fn [db] - (get-in db [:keycard :pin :confirmation]))) - -(re-frame/reg-sub - :keycard/pin-enter-step - (fn [db] - (get-in db [:keycard :pin :enter-step]))) - -(re-frame/reg-sub - :keycard/pin-operation - (fn [db] - (get-in db [:keycard :pin :operation]))) - -(re-frame/reg-sub - :keycard/pin-data - (fn [db] - (get-in db [:keycard :pin]))) - -(re-frame/reg-sub - :keycard/pin - :<- [:keycard/pin-data] - :<- [:keycard/pin-enter-step] - (fn [[pin-data step]] - (get pin-data step))) - -(re-frame/reg-sub - :keycard/pin-status - (fn [db] - (get-in db [:keycard :pin :status]))) - -(re-frame/reg-sub - :keycard/pin-error-label - (fn [db] - (get-in db [:keycard :pin :error-label]))) - -(re-frame/reg-sub - :keycard/frozen-card? - (fn [db] - (and (common/keycard-multiaccount? db) - (zero? (get-in db [:keycard :application-info :pin-retry-counter]))))) diff --git a/src/legacy/status_im/subs/mailservers.cljs b/src/legacy/status_im/subs/mailservers.cljs index a796e1b3c7..68d8f757b9 100644 --- a/src/legacy/status_im/subs/mailservers.cljs +++ b/src/legacy/status_im/subs/mailservers.cljs @@ -1,7 +1,6 @@ (ns legacy.status-im.subs.mailservers (:require [legacy.status-im.fleet.core :as fleet] - [legacy.status-im.mailserver.core :as mailserver] [re-frame.core :as re-frame])) (re-frame/reg-sub @@ -24,12 +23,6 @@ (fn [state] (#{:error :disconnected} state))) -(re-frame/reg-sub - :chats/fetching-gap-in-progress? - :<- [:mailserver/fetching-gaps-in-progress] - (fn [gaps [_ ids _]] - (seq (select-keys gaps ids)))) - (re-frame/reg-sub :mailserver/fetching? :<- [:mailserver/state] @@ -58,11 +51,6 @@ (= (get-in mailserver [:id :value]) current-mailserver-id))) -(re-frame/reg-sub - :mailserver/use-status-nodes? - (fn [db _] - (boolean (mailserver/fetch-use-mailservers? db)))) - (re-frame/reg-sub :mailserver.edit/validation-errors :<- [:mailserver.edit/mailserver] @@ -72,15 +60,6 @@ (when error k)) mailserver)))) -(re-frame/reg-sub - :mailserver/connected? - :<- [:mailserver/state] - :<- [:disconnected?] - (fn [[mail-state disconnected?]] - (let [mailserver-connected? (= :connected mail-state)] - (and mailserver-connected? - (not disconnected?))))) - (re-frame/reg-sub :mailserver/preferred-id :<- [:profile/profile] diff --git a/src/legacy/status_im/subs/stickers.cljs b/src/legacy/status_im/subs/stickers.cljs index d6fdcef654..8790cab798 100644 --- a/src/legacy/status_im/subs/stickers.cljs +++ b/src/legacy/status_im/subs/stickers.cljs @@ -3,12 +3,6 @@ [re-frame.core :as re-frame] [status-im.constants :as constants])) -(re-frame/reg-sub - :stickers/installed-packs - :<- [:stickers/packs] - (fn [packs] - (filter #(= (:status %) constants/sticker-pack-status-installed) (vals packs)))) - (re-frame/reg-sub :stickers/all-packs :<- [:stickers/packs] diff --git a/src/status_im/subs/chats.cljs b/src/status_im/subs/chats.cljs index ace2197153..18ab6b86f1 100644 --- a/src/status_im/subs/chats.cljs +++ b/src/status_im/subs/chats.cljs @@ -1,12 +1,10 @@ (ns status-im.subs.chats (:require [clojure.string :as string] - [legacy.status-im.group-chats.core :as group-chat] [legacy.status-im.group-chats.db :as group-chats.db] [re-frame.core :as re-frame] [status-im.constants :as constants] [status-im.contexts.chat.events :as chat.events] - [status-im.contexts.chat.messenger.composer.constants :as composer.constants] [status-im.contexts.profile.utils :as profile.utils])) (def memo-chats-stack-items (atom nil)) @@ -47,36 +45,6 @@ chat))) (sort-by :timestamp >)))) -(re-frame/reg-sub - :chats/with-empty-category-by-community-id - (fn [[_ community-id]] - [(re-frame/subscribe [:chats/by-community-id community-id]) - (re-frame/subscribe [:communities/community-chats community-id])]) - (fn [[chats comm-chats] [_ community-id]] - (filter #(string/blank? (get-in comm-chats - [(string/replace (:chat-id %) community-id "") :categoryID])) - chats))) - -(re-frame/reg-sub - :chats/sorted-categories-by-community-id - (fn [[_ community-id]] - [(re-frame/subscribe [:chats/by-community-id community-id]) - (re-frame/subscribe [:communities/community-chats community-id])]) - (fn [[chats comm-chats] [_ community-id]] - (let [chat-cat (into {} - (map (fn [{:keys [id categoryID position]}] - {(str community-id id) {:categoryID categoryID - :position position}}) - (vals comm-chats)))] - (group-by :categoryID (sort-by :position (map #(merge % (chat-cat (:chat-id %))) chats)))))) - -(re-frame/reg-sub - :chats/category-by-chat-id - (fn [[_ community-id _]] - [(re-frame/subscribe [:communities/community community-id])]) - (fn [[{:keys [chats categories]}] [_ community-id chat-id]] - (get categories (get-in chats [(string/replace chat-id community-id "") :categoryID])))) - (re-frame/reg-sub :chats/community-chat-by-id (fn [[_ community-id _]] @@ -134,24 +102,6 @@ (fn [[chat-id inputs]] (get inputs chat-id))) -(re-frame/reg-sub - :chats/composer-height - :<- [:chats/current-chat-input] - :<- [:chats/link-previews-unfurled] - (fn [[{:keys [input-content-height metadata]} link-previews]] - (let [{:keys [responding-to-message editing-message sending-image]} metadata] - (+ (max composer.constants/input-height input-content-height) - (when responding-to-message - composer.constants/reply-container-height) - (when editing-message - composer.constants/edit-container-height) - (when (seq sending-image) - composer.constants/images-container-height) - (when (seq link-previews) - composer.constants/links-container-height) - composer.constants/bar-container-height - composer.constants/actions-container-height)))) - (re-frame/reg-sub :chats/sending-image :<- [:chats/current-chat-id] @@ -159,12 +109,6 @@ (fn [[chat-id inputs]] (get-in inputs [chat-id :metadata :sending-image]))) -(re-frame/reg-sub - :chats/timeline-chat-input-text - :<- [:chats/timeline-chat-input] - (fn [input] - (:input-text input))) - (re-frame/reg-sub :chats/current-chat-membership :<- [:chats/current-chat-id] @@ -289,28 +233,6 @@ :message-pin-enabled message-pin-enabled :can-delete-message-for-everyone? can-delete-message-for-everyone?}))) -(re-frame/reg-sub - :current-chat/metadata - :<- [:chats/current-raw-chat] - (fn [current-chat] - (select-keys current-chat - [:community-id - :contacts - :public? - :group-chat - :chat-type - :chat-id - :chat-name - :color - :invitation-admin]))) - -(re-frame/reg-sub - :current-chat/one-to-one-chat? - :<- [:chats/current-raw-chat] - (fn [current-chat] - (not (or (chat.events/group-chat? current-chat) - (chat.events/public-chat? current-chat))))) - (re-frame/reg-sub :chats/photo-path :<- [:contacts/contacts] @@ -319,28 +241,6 @@ (let [contact (or (when (= id public-key) multiaccount) (get contacts id))] (profile.utils/photo contact)))) -(re-frame/reg-sub - :chats/unread-messages-number - :<- [:chats/home-list-chats] - (fn [chats _] - (reduce (fn [{:keys [public other]} {:keys [unviewed-messages-count public?] :as chat}] - (if (or public? (chat.events/community-chat? chat)) - {:public (+ public unviewed-messages-count) - :other other} - {:other (+ other unviewed-messages-count) - :public public})) - {:public 0 - :other 0} - chats))) - -(re-frame/reg-sub - :chats/current-chat-cooldown-enabled? - :<- [:chats/current-chat] - :<- [:chats/cooldown-enabled?] - (fn [[{:keys [public?]} cooldown-enabled?]] - (and public? - cooldown-enabled?))) - (re-frame/reg-sub :chats/reply-message :<- [:chats/current-chat-input] @@ -360,12 +260,6 @@ (fn [[chat-id inputs]] (get-in inputs [chat-id :audio]))) -(re-frame/reg-sub - :chats/timeline-sending-image - :<- [:chats/timeline-chat-input] - (fn [{:keys [metadata]}] - (:sending-image metadata))) - (defn filter-selected-contacts [selected-contacts contacts] (filter #(:added? (contacts %)) selected-contacts)) @@ -394,15 +288,6 @@ (fn [[selected-contacts active-contacts]] (filter-contacts selected-contacts active-contacts))) -(re-frame/reg-sub - :group-chat/inviter-info - (fn [[_ chat-id] _] - [(re-frame/subscribe [:chats/chat-by-id chat-id]) - (re-frame/subscribe [:multiaccount/public-key])]) - (fn [[chat my-public-key]] - {:member? (group-chats.db/member? my-public-key chat) - :inviter-pk (group-chats.db/get-inviter-pk my-public-key chat)})) - (re-frame/reg-sub :group-chat/invitations-by-chat-id :<- [:group-chat/invitations] @@ -416,13 +301,6 @@ (fn [[invitations]] (filter #(= constants/invitation-state-requested (:state %)) invitations))) -(re-frame/reg-sub - :group-chat/removed-from-current-chat? - :<- [:chats/current-raw-chat] - :<- [:multiaccount/public-key] - (fn [[current-chat pk]] - (group-chat/member-removed? current-chat pk))) - (re-frame/reg-sub :chat/mention-suggestions :<- [:chats/current-chat-id] @@ -461,13 +339,6 @@ (fn [status-link-previews] (boolean (seq status-link-previews)))) -(re-frame/reg-sub - :chat/check-channel-muted? - (fn [[_ community-id channel-id]] - [(re-frame/subscribe [:chats/chat (str community-id channel-id)])]) - (fn [[chat]] - (:muted? chat))) - (re-frame/reg-sub :camera-roll/total-photos-count-android (fn [{:keys [camera-roll/albums]}] diff --git a/src/status_im/subs/communities.cljs b/src/status_im/subs/communities.cljs index 5d97cef6be..b49282b237 100644 --- a/src/status_im/subs/communities.cljs +++ b/src/status_im/subs/communities.cljs @@ -14,30 +14,12 @@ (fn [info [_ id]] (get info id))) -(re-frame/reg-sub - :communities/section-list - :<- [:communities] - (fn [communities] - (->> (vals communities) - (group-by (comp (fnil string/upper-case "") first :name)) - (sort-by (fn [[title]] title)) - (map (fn [[title data]] - {:title title - :data data}))))) - (re-frame/reg-sub :communities/community :<- [:communities] (fn [communities [_ id]] (get communities id))) -(re-frame/reg-sub - :communities/community-chats - (fn [[_ community-id]] - [(re-frame/subscribe [:communities/community community-id])]) - (fn [[{:keys [chats]}] _] - chats)) - (re-frame/reg-sub :communities/community-color (fn [[_ community-id]] @@ -135,12 +117,6 @@ (fn [contract-communities] (sort-by :name (vals (:other contract-communities))))) -(re-frame/reg-sub - :communities/community-ids - :<- [:communities] - (fn [communities] - (map :id (vals communities)))) - (def memo-communities-stack-items (atom nil)) (defn- merge-opened-communities @@ -230,16 +206,6 @@ (fn [[communities {:keys [community-id]}]] (get communities community-id))) -(re-frame/reg-sub - :communities/unviewed-count - (fn [[_ community-id]] - [(re-frame/subscribe [:chats/by-community-id community-id])]) - (fn [[chats]] - (reduce (fn [acc {:keys [unviewed-messages-count]}] - (+ acc (or unviewed-messages-count 0))) - 0 - chats))) - (defn calculate-unviewed-counts [chats] (reduce (fn [acc {:keys [unviewed-mentions-count unviewed-messages-count muted]}] @@ -269,22 +235,6 @@ (filter (fn [{:keys [state]}] (= state constants/request-to-join-pending-state)))))) -(re-frame/reg-sub - :community/categories - (fn [[_ community-id]] - [(re-frame/subscribe [:communities/community community-id])]) - (fn [[{:keys [categories]}] _] - categories)) - -(re-frame/reg-sub - :communities/sorted-categories - :<- [:communities] - (fn [communities [_ id]] - (->> (get-in communities [id :categories]) - (map #(assoc (get % 1) :community-id id)) - (sort-by :position) - (into [])))) - (defn- reduce-over-categories [community-id categories diff --git a/src/status_im/subs/communities_test.cljs b/src/status_im/subs/communities_test.cljs index 1d4b820172..75adb05ccb 100644 --- a/src/status_im/subs/communities_test.cljs +++ b/src/status_im/subs/communities_test.cljs @@ -21,37 +21,6 @@ raw-communities) (is (match? raw-communities (rf/sub [sub-name])))))) -(h/deftest-sub :communities/section-list - [sub-name] - (testing "builds sections using the first community name char (uppercased)" - (swap! rf-db/app-db assoc - :communities - {"0x1" {:name "civilized monkeys"} - "0x2" {:name "Civilized rats"}}) - (is (match? [{:title "C" - :data [{:name "civilized monkeys"} - {:name "Civilized rats"}]}] - (rf/sub [sub-name])))) - - (testing "sorts by section ascending" - (swap! rf-db/app-db assoc - :communities - {"0x3" {:name "Memorable"} - "0x1" {:name "Civilized monkeys"}}) - (is (match? [{:title "C" :data [{:name "Civilized monkeys"}]} - {:title "M" :data [{:name "Memorable"}]}] - (rf/sub [sub-name])))) - - (testing "builds default section for communities without a name" - (swap! rf-db/app-db assoc - :communities - {"0x2" {:id "0x2"} - "0x1" {:id "0x1"}}) - (is (match? [{:title "" - :data [{:id "0x2"} - {:id "0x1"}]}] - (rf/sub [sub-name]))))) - (h/deftest-sub :communities/unviewed-counts [sub-name] (testing "sums counts for a particular community" diff --git a/src/status_im/subs/contact.cljs b/src/status_im/subs/contact.cljs index b109cb1a8d..74c9413209 100644 --- a/src/status_im/subs/contact.cljs +++ b/src/status_im/subs/contact.cljs @@ -179,26 +179,6 @@ (fn [blocked-contacts] (count blocked-contacts))) -(defn filter-recipient-contacts - [search-filter {:keys [primary-name secondary-name]}] - (or - (when primary-name - (string/includes? (string/lower-case (str primary-name)) search-filter)) - (when secondary-name - (string/includes? (string/lower-case (str secondary-name)) search-filter)))) - -(re-frame/reg-sub - :contacts/active-with-ens-names - :<- [:contacts/active] - :<- [:wallet-legacy/search-recipient-filter] - (fn [[contacts search-filter]] - (let [contacts (filter :ens-verified contacts)] - (if (string/blank? search-filter) - contacts - (filter (partial filter-recipient-contacts - (string/lower-case search-filter)) - contacts))))) - (defn- enrich-contact [_ contact-identity ens-name port font-file] (let [contact (contact.db/enrich-contact @@ -224,20 +204,6 @@ (fn [contacts [_ contact-identity]] (get contacts contact-identity {:public-key contact-identity}))) -(re-frame/reg-sub - :contacts/contact-added? - (fn [[_ contact-identity] _] - [(re-frame/subscribe [:contacts/contact-by-identity contact-identity])]) - (fn [[contact] _] - (:added? contact))) - -(re-frame/reg-sub - :contacts/contact-blocked? - (fn [[_ contact-identity] _] - [(re-frame/subscribe [:contacts/contact-by-identity contact-identity])]) - (fn [[contact] _] - (:blocked contact))) - (re-frame/reg-sub :contacts/contact-two-names-by-identity (fn [[_ contact-identity] _] @@ -287,17 +253,6 @@ multiaccount (contact.db/find-contact-by-address contacts address)))) -(re-frame/reg-sub - :contacts/contacts-by-address - :<- [:contacts/contacts] - (fn [contacts] - (reduce (fn [acc [_ {:keys [address] :as contact}]] - (if address - (assoc acc address contact) - acc)) - {} - contacts))) - (re-frame/reg-sub :contacts/filtered-active-sections :<- [:contacts/active-sections] diff --git a/src/status_im/subs/general.cljs b/src/status_im/subs/general.cljs index a22f44f053..30faf425bb 100644 --- a/src/status_im/subs/general.cljs +++ b/src/status_im/subs/general.cljs @@ -1,7 +1,6 @@ (ns status-im.subs.general (:require [clojure.string :as string] - [legacy.status-im.ethereum.tokens :as tokens] [legacy.status-im.multiaccounts.model :as multiaccounts.model] [legacy.status-im.utils.build :as build] [legacy.status-im.utils.mobile-sync :as mobile-network-utils] @@ -47,12 +46,6 @@ (when-let [network (get networks current-network)] (assoc network :rpc-network? (get-in network [:config :UpstreamConfig :Enabled]))))) -(re-frame/reg-sub - :custom-rpc-node - :<- [:current-network] - (fn [{:keys [id]}] - (= 45 (count id)))) - (re-frame/reg-sub :chain-keyword :<- [:current-network] @@ -77,12 +70,6 @@ (fn [chain-id] (= 1 chain-id))) -(re-frame/reg-sub - :ethereum-network? - :<- [:chain-id] - (fn [chain-id] - (< chain-id 6))) - (re-frame/reg-sub :network-name :<- [:current-network] @@ -100,16 +87,6 @@ ;; Otherwise use peers-count fetched from "discovery.summary" signal (if wakuv2-flag (not (:isOnline peer-stats)) (zero? peers-count)))) -(re-frame/reg-sub - :offline? - :<- [:network-status] - :<- [:sync-state] - :<- [:disconnected?] - (fn [[network-status sync-state disconnected?]] - (or disconnected? - (= network-status :offline) - (= sync-state :offline)))) - (re-frame/reg-sub :syncing? :<- [:sync-state] @@ -126,12 +103,6 @@ :<- [:dimensions/window] :-> :height) -(re-frame/reg-sub - :dimensions/small-screen? - :<- [:dimensions/window-height] - (fn [height] - (< height 550))) - (re-frame/reg-sub :get-screen-params :<- [:screen-params] @@ -139,34 +110,16 @@ (fn [[params view-id-db] [_ view-id]] (get params (or view-id view-id-db)))) -(re-frame/reg-sub - :delete-swipe-position - :<- [:animations] - (fn [animations [_ type item-id]] - (get-in animations [type item-id :delete-swiped]))) - (re-frame/reg-sub :wallet-legacy/search-recipient-filter :<- [:ui/search] (fn [search] (get search :recipient-filter))) -(re-frame/reg-sub - :search/currency-filter - :<- [:ui/search] - (fn [search] - (get search :currency-filter))) - (defn- node-version [web3-node-version] (or web3-node-version "N/A")) -(re-frame/reg-sub - :get-app-version - :<- [:web3-node-version] - (fn [web3-node-version] - (str build/app-short-version "; " (node-version web3-node-version)))) - (re-frame/reg-sub :get-app-short-version (fn [_] build/app-short-version)) @@ -216,12 +169,6 @@ (fn [network] (chain/network->chain-keyword network))) -(re-frame/reg-sub - :ethereum/native-currency - :<- [:current-network] - (fn [network] - (tokens/native-currency network))) - (re-frame/reg-sub :connectivity/state :<- [:network-status] @@ -264,22 +211,6 @@ (fn [{:keys [mnemonic]}] mnemonic)) -(re-frame/reg-sub - :get-profile-unread-messages-number - :<- [:profile/profile] - (fn [{:keys [mnemonic]}] - (if mnemonic 1 0))) - -(re-frame/reg-sub - :mobile-network/syncing-allowed? - :<- [:network/type] - :<- [:profile/profile] - (fn [[network-type {:keys [syncing-on-mobile-network?]}]] - (or (= network-type "wifi") - (and - (= network-type "cellular") - syncing-on-mobile-network?)))) - (re-frame/reg-sub :toasts/toast :<- [:toasts] diff --git a/src/status_im/subs/messages.cljs b/src/status_im/subs/messages.cljs index f06d735267..bde5fa892a 100644 --- a/src/status_im/subs/messages.cljs +++ b/src/status_im/subs/messages.cljs @@ -180,12 +180,6 @@ (fn [pinned-messages _] (count pinned-messages))) -(re-frame/reg-sub - :chats/pin-modal - :<- [:messages/pin-modal] - (fn [pin-modal [_ chat-id]] - (get pin-modal chat-id))) - (re-frame/reg-sub :chats/message-reactions :<- [:multiaccount/public-key] diff --git a/src/status_im/subs/pairing.cljs b/src/status_im/subs/pairing.cljs index 9bff5f8377..7c79db255d 100644 --- a/src/status_im/subs/pairing.cljs +++ b/src/status_im/subs/pairing.cljs @@ -23,11 +23,6 @@ :<- [:profile/profile] (fn [multiaccount] (:installation-id multiaccount))) -(re-frame/reg-sub - :pairing/installation-name - :<- [:profile/profile] - (fn [multiaccount] (:installation-name multiaccount))) - (re-frame/reg-sub :pairing/pairing-status :<- [:syncing] diff --git a/src/status_im/subs/profile.cljs b/src/status_im/subs/profile.cljs index c0529e30b9..660d3149dd 100644 --- a/src/status_im/subs/profile.cljs +++ b/src/status_im/subs/profile.cljs @@ -10,7 +10,6 @@ [status-im.common.pixel-ratio :as pixel-ratio] [status-im.constants :as constants] [status-im.contexts.profile.utils :as profile.utils] - [utils.address :as address] [utils.image-server :as image-server] [utils.security.core :as security])) @@ -33,28 +32,6 @@ (-> (get currency/currencies currency-id) :symbol))) -(re-frame/reg-sub - :profile/onboarding-placeholder-avatar - :<- [:mediaserver/port] - :<- [:initials-avatar-font-file] - (fn [[port font-file] [_ profile-pic]] - {:fn - (if profile-pic - (image-server/get-account-image-uri-fn {:port port - :ratio pixel-ratio/ratio - :image-name profile-pic - :override-ring? false - :uppercase-ratio (:uppercase-ratio - constants/initials-avatar-font-conf) - :theme (theme/get-theme)}) - (image-server/get-initials-avatar-uri-fn {:port port - :ratio pixel-ratio/ratio - :theme (theme/get-theme) - :override-ring? false - :uppercase-ratio (:uppercase-ratio - constants/initials-avatar-font-conf) - :font-file font-file}))})) - (re-frame/reg-sub :profile/login-profiles-picture :<- [:profile/profiles-overview] @@ -157,12 +134,6 @@ (fn [accounts] (first accounts))) -(re-frame/reg-sub - :multiaccount/visible-accounts - :<- [:profile/wallet-accounts] - (fn [accounts] - (remove :hidden accounts))) - (re-frame/reg-sub :sign-in-enabled? :<- [:profile/login] @@ -207,16 +178,6 @@ (fn [[accounts address]] (some #(when (= (:address %) address) %) accounts))) -(re-frame/reg-sub - :multiaccount/current-account - :<- [:profile/wallet-accounts] - :<- [:get-screen-params :wallet-account] - (fn [[accounts acc]] - (some #(when (= (string/lower-case (:address %)) - (string/lower-case (:address acc))) - %) - accounts))) - (re-frame/reg-sub :account-by-address :<- [:profile/wallet-accounts] @@ -227,20 +188,6 @@ %) accounts)))) -;; NOTE: this subscription only works on login -(re-frame/reg-sub - :multiaccounts.login/keycard-account? - :<- [:profile/profiles-overview] - :<- [:profile/login] - (fn [[multiaccounts {:keys [key-uid]}]] - (get-in multiaccounts [key-uid :keycard-pairing]))) - -(re-frame/reg-sub - :multiaccounts/keycard-account? - :<- [:profile/profile] - (fn [multiaccount] - (:keycard-pairing multiaccount))) - (re-frame/reg-sub :accounts-without-watch-only :<- [:profile/wallet-accounts] @@ -253,41 +200,6 @@ (fn [accounts] (remove :hidden (filter #(not= (:type %) :watch) accounts)))) -(defn filter-recipient-accounts - [search-filter {:keys [name]}] - (string/includes? (string/lower-case (str name)) search-filter)) - -(re-frame/reg-sub - :accounts-for-recipient - :<- [:multiaccount/visible-accounts] - :<- [:wallet-legacy/prepare-transaction] - :<- [:wallet-legacy/search-recipient-filter] - (fn [[accounts {:keys [from]} search-filter]] - (let [accounts (remove #(= (:address %) (:address from)) accounts)] - (if (string/blank? search-filter) - accounts - (filter (partial filter-recipient-accounts - (string/lower-case search-filter)) - accounts))))) - -(re-frame/reg-sub - :add-account-disabled? - :<- [:profile/wallet-accounts] - :<- [:add-account] - (fn [[accounts {:keys [address type account seed private-key]}]] - (or (string/blank? (:name account)) - (case type - :generate - false - :watch - (or (not (address/address? address)) - (some #(when (= (:address %) address) %) accounts)) - :key - (string/blank? (security/safe-unmask-data private-key)) - :seed - (string/blank? (security/safe-unmask-data seed)) - false)))) - (re-frame/reg-sub :multiaccount/current-user-visibility-status :<- [:profile/profile] @@ -379,12 +291,6 @@ (fn [{:keys [processing]}] processing)) -(re-frame/reg-sub - :profile/login-password - :<- [:profile/login] - (fn [{:keys [password]}] - password)) - ;; LINK PREVIEW ;; ======================================================================================================== diff --git a/src/status_im/subs/wallet/wallet.cljs b/src/status_im/subs/wallet/wallet.cljs index 897ef861b6..f76b117bc9 100644 --- a/src/status_im/subs/wallet/wallet.cljs +++ b/src/status_im/subs/wallet/wallet.cljs @@ -95,11 +95,6 @@ :<- [:wallet/wallet-send] :-> :token) -(rf/reg-sub - :wallet/wallet-send-amount - :<- [:wallet/wallet-send] - :-> :amount) - (rf/reg-sub :wallet/wallet-send-loading-suggested-routes? :<- [:wallet/wallet-send] @@ -110,11 +105,6 @@ :<- [:wallet/wallet-send] :-> :suggested-routes) -(rf/reg-sub - :wallet/wallet-bridge-to-chain-id - :<- [:wallet/wallet-send] - :-> :bridge-to-chain-id) - (rf/reg-sub :wallet/keypairs :<- [:wallet]