diff --git a/src/status_im/currency/core.cljs b/src/status_im/currency/core.cljs index 9262d98596a2..51a6126ea27d 100644 --- a/src/status_im/currency/core.cljs +++ b/src/status_im/currency/core.cljs @@ -14,6 +14,6 @@ (rf/merge cofx (multiaccounts.update/multiaccount-update :currency - "USD" + currency {}) (prices/update-prices))) diff --git a/src/status_im/ui/screens/advanced_settings/views.cljs b/src/status_im/ui/screens/advanced_settings/views.cljs index 3c3368392a89..561a2a617f55 100644 --- a/src/status_im/ui/screens/advanced_settings/views.cljs +++ b/src/status_im/ui/screens/advanced_settings/views.cljs @@ -19,8 +19,7 @@ transactions-management-enabled? wakuv2-flag current-fleet - webview-debug - test-networks-enabled?]}] + webview-debug]}] (keep identity [{:size :small @@ -101,15 +100,6 @@ [:profile.settings/change-webview-debug (not webview-debug)]) :accessory :switch :active webview-debug} - {:size :small - :title "Test Networks Enabled" - :accessibility-label :test-networks-enabled - :container-margin-bottom 8 - :on-press - #(re-frame/dispatch - [:profile.settings/change-test-networks-enabled (not test-networks-enabled?)]) - :accessory :switch - :active test-networks-enabled?} {:size :small :title (i18n/label :t/waku-bloom-filter-mode) :accessibility-label :waku-bloom-filter-mode-settings-switch @@ -155,7 +145,6 @@ :dev-mode? false :wakuv2-flag wakuv2-flag :waku-bloom-filter-mode waku-bloom-filter-mode - :webview-debug webview-debug - :test-networks-enabled? test-networks-enabled?}) + :webview-debug webview-debug}) :key-fn (fn [_ i] (str i)) :render-fn render-item}])) diff --git a/src/status_im/wallet/core.cljs b/src/status_im/wallet/core.cljs index de6f6c504537..5844fe978f7f 100644 --- a/src/status_im/wallet/core.cljs +++ b/src/status_im/wallet/core.cljs @@ -1074,38 +1074,38 @@ ;;TODO: this could be replaced by a single API call on status-go side (re-frame/reg-fx :wallet-legacy/initialize-wallet - (fn [[network-id _network callback]] - (-> (js/Promise.all - (clj->js - [(js/Promise. - (fn [resolve-fn reject] - (json-rpc/call {:method "accounts_getAccounts" - :on-success resolve-fn - :on-error reject}))) - (js/Promise. - (fn [resolve-fn _] - (json-rpc/call {:method "wallet_getTokens" - :params [(int network-id)] - :on-success resolve-fn - :on-error (fn [_] - (resolve-fn nil))}))) - (js/Promise. - (fn [resolve-fn reject] - (json-rpc/call {:method "wallet_getCustomTokens" - :on-success resolve-fn - :on-error reject}))) - (js/Promise. - (fn [resolve-fn reject] - (json-rpc/call {:method "wallet_getSavedAddresses" - :on-success resolve-fn - :on-error reject})))])) - (.then (fn [[accounts _ tokens custom-tokens favourites]] - (callback accounts - (normalize-tokens network-id tokens) - (mapv #(update % :symbol keyword) custom-tokens) - (filter :favourite favourites)))) - (.catch (fn [_] - (log/error "Failed to initialize wallet")))))) + (fn [[network-id _network callback]] + (-> (js/Promise.all + (clj->js + [(js/Promise. + (fn [resolve-fn reject] + (json-rpc/call {:method "accounts_getAccounts" + :on-success resolve-fn + :on-error reject}))) + (js/Promise. + (fn [resolve-fn _] + (json-rpc/call {:method "wallet_getTokens" + :params [(int network-id)] + :on-success resolve-fn + :on-error (fn [_] + (resolve-fn nil))}))) + (js/Promise. + (fn [resolve-fn reject] + (json-rpc/call {:method "wallet_getCustomTokens" + :on-success resolve-fn + :on-error reject}))) + (js/Promise. + (fn [resolve-fn reject] + (json-rpc/call {:method "wallet_getSavedAddresses" + :on-success resolve-fn + :on-error reject})))])) + (.then (fn [[accounts _ tokens custom-tokens favourites]] + (callback accounts + (normalize-tokens network-id tokens) + (mapv #(update % :symbol keyword) custom-tokens) + (filter :favourite favourites)))) + (.catch (fn [_] + (log/error "Failed to initialize wallet")))))) (defn rpc->accounts [accounts] diff --git a/src/status_im2/config.cljs b/src/status_im2/config.cljs index fc58a2571b15..29e62532164e 100644 --- a/src/status_im2/config.cljs +++ b/src/status_im2/config.cljs @@ -74,7 +74,7 @@ (def default-multiaccount {:preview-privacy? blank-preview? - :wallet-legacy/visible-tokens {:mainnet #{:SNT :ETH :DAI}} + :wallet-legacy/visible-tokens {:mainnet #{:SNT}} :currency :usd :appearance 0 :profile-pictures-show-to 2 diff --git a/src/status_im2/contexts/communities/discover/view.cljs b/src/status_im2/contexts/communities/discover/view.cljs index d6ce0475c3e2..668eca5096a1 100644 --- a/src/status_im2/contexts/communities/discover/view.cljs +++ b/src/status_im2/contexts/communities/discover/view.cljs @@ -242,7 +242,6 @@ (defn- internal-discover-view [params] - (rf/dispatch [:fetch-contract-communities]) [:f> f-view-internal params]) (def view (quo.theme/with-theme internal-discover-view)) diff --git a/src/status_im2/contexts/profile/settings/events.cljs b/src/status_im2/contexts/profile/settings/events.cljs index a1166b9b99ba..eaa5f02e20e6 100644 --- a/src/status_im2/contexts/profile/settings/events.cljs +++ b/src/status_im2/contexts/profile/settings/events.cljs @@ -14,7 +14,6 @@ :on-success #(log/debug "sent contact update")}]})) (rf/defn profile-update - {:events [:profile.settings/profile-update]} [{:keys [db] :as cofx} setting setting-value {:keys [dont-sync? on-success] :or {on-success #()}}] @@ -57,10 +56,6 @@ {:profile.settings/webview-debug-changed value} (profile-update :webview-debug (boolean value) {}))) -(rf/reg-event-fx :profile.settings/change-test-networks-enabled - (fn [_ [value]] - {:fx [[:dispatch [:profile.settings/profile-update :test-networks-enabled? (boolean value) {}]]]})) - (rf/defn change-preview-privacy-flag {:events [:profile.settings/change-preview-privacy]} [{:keys [db] :as cofx} private?] diff --git a/src/status_im2/contexts/wallet/home/view.cljs b/src/status_im2/contexts/wallet/home/view.cljs index 12d96aa9a3f6..b40c110eea38 100644 --- a/src/status_im2/contexts/wallet/home/view.cljs +++ b/src/status_im2/contexts/wallet/home/view.cljs @@ -40,9 +40,9 @@ (defn view [] - #_(rf/dispatch [:wallet/request-collectibles - {:start-at-index 0 - :new-request? true}]) + (rf/dispatch [:wallet/request-collectibles + {:start-at-index 0 + :new-request? true}]) (let [top (safe-area/get-top) selected-tab (reagent/atom (:id (first tabs-data)))] (fn []