fix: move feature-flag usage to settings screen instead of settings i…

…tems definition
status-im · May 8, 2024 · 945d5d8 · 945d5d8
1 parent ba6e46c
commit 945d5d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/status_im/contexts/profile/settings/list_items.cljs b/src/status_im/contexts/profile/settings/list_items.cljs
@@ -35,13 +35,13 @@
      :image       :icon
      :blur?       true
      :action      :arrow}
-    (when (ff/enabled? ::ff/wallet.wallet-settings)
-      {:title       (i18n/label :t/wallet)
-       :on-press    #(rf/dispatch [:open-modal :screen/settings.wallet])
-       :image-props :i/wallet
-       :image       :icon
-       :blur?       true
-       :action      :arrow})
+    {:title        (i18n/label :t/wallet)
+     :on-press     #(rf/dispatch [:open-modal :screen/settings.wallet])
+     :image-props  :i/wallet
+     :image        :icon
+     :blur?        true
+     :action       :arrow
+     :feature-flag ::ff/wallet.wallet-settings}
     (when config/show-not-implemented-features?
       {:title       (i18n/label :t/dapps)
        :on-press    not-implemented/alert

diff --git a/src/status_im/contexts/profile/settings/view.cljs b/src/status_im/contexts/profile/settings/view.cljs
@@ -9,18 +9,24 @@
             [status-im.contexts.profile.settings.list-items :as settings.items]
             [status-im.contexts.profile.settings.style :as style]
             [status-im.contexts.profile.utils :as profile.utils]
+            [status-im.feature-flags :as ff]
             [utils.debounce :as debounce]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
+(defn show-settings-item?
+  [{:keys [feature-flag]}]
+  (or (ff/enabled? feature-flag)
+      (nil? feature-flag)))
+
 (defn- settings-item-view
   [data]
   [rf/delay-render
    [quo/category
     {:list-type       :settings
      :container-style {:padding-bottom 12}
      :blur?           true
-     :data            data}]])
+     :data            (filterv show-settings-item? data)}]])
 
 (defn scroll-handler
   [event scroll-y]