diff --git a/.env b/.env index 898935d330..54923925e3 100644 --- a/.env +++ b/.env @@ -2,7 +2,6 @@ TESTFAIRY_ENABLED=0 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 -ERC20_ENABLED=1 OFFLINE_INBOX_ENABLED=1 OFFLINE_INBOX_MANY_ENABLED=1 LOG_LEVEL=debug diff --git a/.env.jenkins b/.env.jenkins index 0f02a5bb88..24abe6b03e 100644 --- a/.env.jenkins +++ b/.env.jenkins @@ -2,7 +2,6 @@ TESTFAIRY_ENABLED=1 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=1 MAINNET_NETWORKS_ENABLED=1 -ERC20_ENABLED=1 OFFLINE_INBOX_ENABLED=1 OFFLINE_INBOX_MANY_ENABLED=0 LOG_LEVEL=debug diff --git a/.env.prod b/.env.prod index 9ef13d1d18..58ad5a4967 100644 --- a/.env.prod +++ b/.env.prod @@ -2,7 +2,6 @@ TESTFAIRY_ENABLED=0 STUB_STATUS_GO=0 ETHEREUM_DEV_CLUSTER=0 MAINNET_NETWORKS_ENABLED=0 -ERC20_ENABLED=0 OFFLINE_INBOX_ENABLED=0 OFFLINE_INBOX_MANY_ENABLED=0 LOG_LEVEL=info diff --git a/Jenkinsfile.parameters b/Jenkinsfile.parameters index b3929c0f8e..f7d32fef68 100644 --- a/Jenkinsfile.parameters +++ b/Jenkinsfile.parameters @@ -42,7 +42,6 @@ node ('macos1') { sh 'echo STUB_STATUS_GO=' + STUB_STATUS_GO + '>>' + '.env' sh 'echo ETHEREUM_DEV_CLUSTER=' + ETHEREUM_DEV_CLUSTER + '>>' + '.env' sh 'echo MAINNET_NETWORKS_ENABLED=' + MAINNET_NETWORKS_ENABLED + '>>' + '.env' - sh 'echo ERC20_ENABLED=' + ERC20_ENABLED + '>>' + '.env' sh 'echo LOG_LEVEL=' + LOG_LEVEL + '>>' + '.env' sh 'echo LOG_LEVEL_STATUS_GO=' + LOG_LEVEL_STATUS_GO + '>>' + '.env' sh 'echo JSC_ENABLED=' + JSC_ENABLED + '>>' + '.env' diff --git a/src/status_im/ui/screens/wallet/main/views.cljs b/src/status_im/ui/screens/wallet/main/views.cljs index 6a83aefc36..ccf27125cf 100644 --- a/src/status_im/ui/screens/wallet/main/views.cljs +++ b/src/status_im/ui/screens/wallet/main/views.cljs @@ -84,14 +84,14 @@ (defn- asset-section [network balance visible-tokens prices-loading? balance-loading?] (let [tokens (current-tokens visible-tokens network) - assets (map #(assoc % :amount (get balance (:symbol %))) (concat [tokens/ethereum] (when config/erc20-enabled? tokens)))] + assets (map #(assoc % :amount (get balance (:symbol %))) (concat [tokens/ethereum] tokens))] [react/view styles/asset-section [react/text {:style styles/asset-section-title} (i18n/label :t/wallet-assets)] [list/flat-list {:default-separator? true :data assets :render-fn render-asset - :on-refresh #(re-frame/dispatch [:update-wallet (when config/erc20-enabled? (map :symbol tokens))]) + :on-refresh #(re-frame/dispatch [:update-wallet (map :symbol tokens)]) :refreshing (boolean (or prices-loading? balance-loading?))}]])) (defview wallet [] diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index 9441dc2b1e..c35ea1cefd 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -16,13 +16,11 @@ ;; ;; TESTFAIRY_ENABLED - indefinite ;; STUB_STATUS_GO - indefinite -;; ERC20_ENABLED - until idea #3 is merged, remove in develop when ready ;; OFFLINE_INBOX_ENABLED - TBD, tenatively until #idea 1 is merged (def testfairy-enabled? (enabled? (get-config :TESTFAIRY_ENABLED))) (def stub-status-go? (enabled? (get-config :STUB_STATUS_GO 0))) (def mainnet-networks-enabled? (enabled? (get-config :MAINNET_NETWORKS_ENABLED 0))) -(def erc20-enabled? (enabled? (get-config :ERC20_ENABLED 0))) (def offline-inbox-enabled? (enabled? (get-config :OFFLINE_INBOX_ENABLED 0))) (def offline-inbox-many-enabled? (enabled? (get-config :OFFLINE_INBOX_MANY_ENABLED 0))) (def log-level