diff --git a/src/status_im/subs/communities.cljs b/src/status_im/subs/communities.cljs index 82217a37770..0b8a00d33c1 100644 --- a/src/status_im/subs/communities.cljs +++ b/src/status_im/subs/communities.cljs @@ -4,8 +4,8 @@ [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils] [re-frame.core :as re-frame] [status-im.constants :as constants] - [status-im.contexts.wallet.common.utils :as wallet.utils] - [utils.i18n :as i18n])) + [utils.i18n :as i18n] + [utils.money :as money])) (re-frame/reg-sub :communities/fetching-community @@ -306,12 +306,13 @@ [checking-permissions? token-images {:keys [satisfied criteria]}] - (let [sym (:symbol criteria) - amount (:amount criteria)] + (let [sym (:symbol criteria) + amount-in-wei (:amountInWei criteria) + decimals (:decimals criteria)] {:symbol sym :sufficient? satisfied :loading? checking-permissions? - :amount (wallet.utils/remove-trailing-zeroes amount) + :amount (money/to-fixed (money/token->unit amount-in-wei decimals)) :img-src (get token-images sym)})) (re-frame/reg-sub diff --git a/src/status_im/subs/communities_test.cljs b/src/status_im/subs/communities_test.cljs index dafc2245032..224e0b44b04 100644 --- a/src/status_im/subs/communities_test.cljs +++ b/src/status_im/subs/communities_test.cljs @@ -289,19 +289,23 @@ checks {:checking? checking-permissions? :check {:satisfied true - :highestRole {:type constants/community-token-permission-become-admin - :criteria [{:tokenRequirement [{:satisfied true - :criteria {:contract_addresses - {:5 "0x0"} - :type 1 - :symbol "DAI" - :amount "5.0" - :decimals 18}}]} - {:tokenRequirement [{:satisfied false - :criteria {:type 1 - :symbol "ETH" - :amount "0.002" - :decimals 18}}]}]} + :highestRole + {:type constants/community-token-permission-become-admin + :criteria [{:tokenRequirement [{:satisfied true + :criteria {:contract_addresses + {:5 "0x0"} + :type 1 + :symbol "DAI" + :amountInWei + "5000000000000000000" + :amount "5.0" + :decimals 18}}]} + {:tokenRequirement [{:satisfied false + :criteria {:type 1 + :symbol "ETH" + :amountInWei "2000000000000000" + :amount "0.002" + :decimals 18}}]}]} :permissions {:a3dd5b6b-d93b-452c-b22a-09a8f42ec566 {:criteria [true false