From 255ba9a862caaa805dca44147f1c58429e0e0f5f Mon Sep 17 00:00:00 2001 From: Ajay Sivan Date: Tue, 11 Jun 2024 21:48:12 +0530 Subject: [PATCH] Move buy assets recurrent tab out of feature flag (#20319) --- .../contexts/wallet/sheets/buy_token/view.cljs | 16 +++++++--------- src/status_im/feature_flags.cljs | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/status_im/contexts/wallet/sheets/buy_token/view.cljs b/src/status_im/contexts/wallet/sheets/buy_token/view.cljs index a1235c294be..8ec15f48ead 100644 --- a/src/status_im/contexts/wallet/sheets/buy_token/view.cljs +++ b/src/status_im/contexts/wallet/sheets/buy_token/view.cljs @@ -3,7 +3,6 @@ [quo.core :as quo] [react-native.core :as rn] [status-im.contexts.wallet.sheets.buy-token.style :as style] - [status-im.feature-flags :as ff] [utils.i18n :as i18n] [utils.re-frame :as rf])) @@ -46,15 +45,14 @@ (oops/oget % :nativeEvent :layout :height)))] [:<> [quo/drawer-top {:title (i18n/label :t/buy-assets)}] - (when (ff/enabled? ::ff/wallet.buy-recurrent-assets) - [quo/segmented-control - {:size 32 - :container-style style/tabs - :default-active initial-tab - :on-change set-selected-tab - :data tabs}]) + [quo/segmented-control + {:size 32 + :container-style style/tabs + :default-active initial-tab + :on-change set-selected-tab + :data tabs}] [rn/flat-list - {:data (if (and (ff/enabled? ::ff/wallet.buy-recurrent-assets) (= selected-tab :recurrent)) + {:data (if (= selected-tab :recurrent) (:recurrent crypto-on-ramps) (:one-time crypto-on-ramps)) :on-layout on-layout diff --git a/src/status_im/feature_flags.cljs b/src/status_im/feature_flags.cljs index c809f5443f0..4cd23469875 100644 --- a/src/status_im/feature_flags.cljs +++ b/src/status_im/feature_flags.cljs @@ -19,7 +19,6 @@ ::wallet.assets-modal-hide (enabled-in-env? :FLAG_ASSETS_MODAL_HIDE) ::wallet.assets-modal-manage-tokens (enabled-in-env? :FLAG_ASSETS_MODAL_MANAGE_TOKENS) ::wallet.bridge-token (enabled-in-env? :FLAG_BRIDGE_TOKEN_ENABLED) - ::wallet.buy-recurrent-assets (enabled-in-env? :FLAG_BUY_RECURRENT_ASSETS) ::wallet.contacts (enabled-in-env? :FLAG_CONTACTS_ENABLED) ::wallet.edit-derivation-path (enabled-in-env? :FLAG_EDIT_DERIVATION_PATH) ::wallet.graph (enabled-in-env? :FLAG_GRAPH_ENABLED)