From 430f322f953718a76c0e524b7d4da678cc836e39 Mon Sep 17 00:00:00 2001
From: Parvesh Monu <parvesh.dhullmonu@gmail.com>
Date: Mon, 13 Jun 2022 21:15:59 +0530
Subject: [PATCH] Include UI toggle for all builds (#13464)

---
 src/quo/react_native.cljs                         |  5 ++---
 src/status_im/core.cljs                           |  3 +--
 .../ui/screens/advanced_settings/views.cljs       | 15 +++++++--------
 src/status_im/ui/screens/screens.cljs             |  3 +--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/quo/react_native.cljs b/src/quo/react_native.cljs
index 9220044755..850291ee62 100644
--- a/src/quo/react_native.cljs
+++ b/src/quo/react_native.cljs
@@ -6,8 +6,7 @@
             ["@react-native-community/hooks" :as hooks]
             ["react-native-navigation" :refer (Navigation)]
             ["rn-emoji-keyboard" :refer (EmojiKeyboard)]
-            ["react-native-draggable-flatlist" :default DraggableFlatList]
-            [status-im.utils.config :as config]))
+            ["react-native-draggable-flatlist" :default DraggableFlatList]))
 
 (def rn-draggable-flatlist (reagent/adapt-react-class DraggableFlatList))
 
@@ -108,7 +107,7 @@
                                                               :property (:opacity layout-animation-properties)}}})
 
 (defonce enable-layout-animations
-  (when (and platform/android? config/quo-preview-enabled?)
+  (when platform/android?
     (.setLayoutAnimationEnabledExperimental ^js ui-manager true)))
 
 (def activity-indicator (reagent/adapt-react-class (.-ActivityIndicator ^js rn)))
diff --git a/src/status_im/core.cljs b/src/status_im/core.cljs
index 20578fa16d..7fed9e3713 100644
--- a/src/status_im/core.cljs
+++ b/src/status_im/core.cljs
@@ -40,8 +40,7 @@
 
   (utils.universal-links/initialize)
 
-  (when config/quo-preview-enabled?
-    (async-storage/get-item :new-ui-enabled? #(reset! config/new-ui-enabled? %)))
+  (async-storage/get-item :new-ui-enabled? #(reset! config/new-ui-enabled? %))
 
   ;;DEV
   (snoopy/subscribe!)
diff --git a/src/status_im/ui/screens/advanced_settings/views.cljs b/src/status_im/ui/screens/advanced_settings/views.cljs
index aee913f6e2..3fabe55cfb 100644
--- a/src/status_im/ui/screens/advanced_settings/views.cljs
+++ b/src/status_im/ui/screens/advanced_settings/views.cljs
@@ -127,14 +127,13 @@
        [:multiaccounts.ui/switch-wallet-connect-enabled (not wallet-connect-enabled?)])
      :accessory               :switch
      :active                  wallet-connect-enabled?}
-    (when config/quo-preview-enabled?
-      {:size                    :small
-       :title                   (i18n/label :t/new-ui)
-       :accessibility-label     :new-ui-toggle
-       :container-margin-bottom 8
-       :on-press                #(re-frame/dispatch [:toggle-new-ui])
-       :accessory               :switch
-       :active                  new-ui-enabled?})]))
+    {:size                    :small
+     :title                   (i18n/label :t/new-ui)
+     :accessibility-label     :new-ui-toggle
+     :container-margin-bottom 8
+     :on-press                #(re-frame/dispatch [:toggle-new-ui])
+     :accessory               :switch
+     :active                  new-ui-enabled?}]))
 
 (defn- flat-list-data [options]
   (normal-mode-settings-data options))
diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs
index 6903cce2f7..041421a464 100644
--- a/src/status_im/ui/screens/screens.cljs
+++ b/src/status_im/ui/screens/screens.cljs
@@ -885,14 +885,13 @@
             :options   {:topBar {:visible false}}
             :component bug-report/bug-report}]
 
+          navigation2.screens/screens
           (when config/quo-preview-enabled?
             quo.preview/screens)
           (when config/quo-preview-enabled?
             quo.preview/main-screens)
           (when config/quo-preview-enabled?
             quo2.preview/screens)
-          (when config/quo-preview-enabled?
-            navigation2.screens/screens)
           (when @config/new-ui-enabled?
             navigation2.screens/screen-overwrites)
           (when config/quo-preview-enabled?