Skip to content

Commit

Permalink
lint fixes and polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
briansztamfater committed Apr 24, 2024
1 parent 54007a3 commit 1e2058f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 53 deletions.
3 changes: 1 addition & 2 deletions src/status_im/contexts/wallet/common/utils/send.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
(ns status-im.contexts.wallet.common.utils.send
(:require [clojure.string :as string]
[utils.money :as money]))
(:require [utils.money :as money]))

(defn calculate-gas-fee
[data]
Expand Down
41 changes: 0 additions & 41 deletions src/status_im/contexts/wallet/common/utils/send_test.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -73,44 +73,3 @@
; converted to Ether
(is (money/equal-to (utils/calculate-full-route-gas-fee route)
expected-result)))))

(deftest test-find-affordable-networks
(testing "All networks affordable and selected, none disabled"
(let [balances-per-chain {"1" {:balance "50.0" :chain-id "1"}
"2" {:balance "40.0" :chain-id "2"}}
input-value 20
selected-networks ["1" "2"]
disabled-chain-ids []
expected ["1" "2"]]
(is (= (set (utils/find-affordable-networks {:balances-per-chain balances-per-chain
:input-value input-value
:selected-networks selected-networks
:disabled-chain-ids disabled-chain-ids}))
(set expected)))))

(testing "No networks affordable"
(let [balances-per-chain {"1" {:balance "5.0" :chain-id "1"}
"2" {:balance "1.0" :chain-id "2"}}
input-value 10
selected-networks ["1" "2"]
disabled-chain-ids []
expected []]
(is (= (set (utils/find-affordable-networks {:balances-per-chain balances-per-chain
:input-value input-value
:selected-networks selected-networks
:disabled-chain-ids disabled-chain-ids}))
(set expected)))))

(testing "Selected networks subset, with some disabled"
(let [balances-per-chain {"1" {:balance "100.0" :chain-id "1"}
"2" {:balance "50.0" :chain-id "2"}
"3" {:balance "20.0" :chain-id "3"}}
input-value 15
selected-networks ["1" "2" "3"]
disabled-chain-ids ["2"]
expected ["1" "3"]]
(is (= (set (utils/find-affordable-networks {:balances-per-chain balances-per-chain
:input-value input-value
:selected-networks selected-networks
:disabled-chain-ids disabled-chain-ids}))
(set expected))))))
6 changes: 3 additions & 3 deletions src/status_im/contexts/wallet/send/input_amount/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
[status-im.contexts.wallet.send.utils :as send-utils]
[utils.address :as address]
[utils.i18n :as i18n]
[utils.re-frame :as rf]
[utils.money :as money]))
[utils.money :as money]
[utils.re-frame :as rf]))

(defn- make-limit-label
[amount currency]
Expand Down Expand Up @@ -169,7 +169,7 @@
routes (when suggested-routes
(or (:best suggested-routes) []))
no-routes-found? (and
(every? (fn [{:keys [total-amount type]}]
(every? (fn [{:keys [total-amount]}]
(and
total-amount
(money/equal-to total-amount
Expand Down
3 changes: 1 addition & 2 deletions src/status_im/contexts/wallet/send/routes/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
[status-im.contexts.wallet.send.utils :as send-utils]
[utils.debounce :as debounce]
[utils.i18n :as i18n]
[utils.re-frame :as rf]
[utils.money :as money]))
[utils.re-frame :as rf]))

(def row-height 44)
(def space-between-rows 11)
Expand Down
7 changes: 2 additions & 5 deletions src/status_im/contexts/wallet/send/utils.cljs
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
(ns status-im.contexts.wallet.send.utils
(:require
[clojure.string :as string]
[legacy.status-im.utils.hex :as utils.hex]
[native-module.core :as native-module]
[status-im.contexts.wallet.common.utils :as utils]
[utils.money :as money]
[status-im.contexts.preview.quo.wallet.network-amount :as network-amount]))
[utils.money :as money]))

(defn amount-in-hex
[amount token-decimal]
Expand Down Expand Up @@ -99,8 +97,7 @@
(let [disabled-set (set disabled-chain-ids)
receiver-networks-set (set receiver-networks)
network-values-keys (set (keys network-values))
network-values-count (count network-values-keys)
routes-found? (pos? network-values-count)
routes-found? (pos? (count network-values-keys))
updated-network-values (when routes-found?
(reduce (fn [acc k]
(if (or (contains? network-values-keys k)
Expand Down

0 comments on commit 1e2058f

Please sign in to comment.