Merge branch 'develop' into 19188

Author: ibrkhalil

.env

@@ -34,3 +34,4 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.e2e

@@ -33,3 +33,4 @@ TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.jenkins

@@ -35,3 +35,4 @@ ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1

.env.nightly

@@ -22,3 +22,4 @@ COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

.env.release

@@ -20,3 +20,4 @@ MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

src/legacy/status_im/keycard/login.cljs

@@ -18,7 +18,7 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db db}
-            (navigation/pop-to-root :profiles)))
+            (navigation/pop-to-root :screen/profile.profiles)))
 
 (rf/defn login-pin-more-icon-pressed
   {:events [:keycard.login.pin.ui/more-icon-pressed]}

src/legacy/status_im/keycard/recovery.cljs

@@ -74,7 +74,8 @@
                  (assoc :recovered-account? true))
              :keycard/check-nfc-enabled nil}
             (bottom-sheet/hide-bottom-sheet-old)
-            (navigation/navigate-to-within-stack [:keycard-recovery-intro :new-to-status])))
+            (navigation/navigate-to-within-stack [:keycard-recovery-intro
+                                                  :screen/onboarding.new-to-status])))
 
 (rf/defn access-key-pressed
   {:events [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]}
@@ -127,7 +128,7 @@
                          :multiaccount-whisper-public-key)}
             (navigation/navigate-to (if platform/android?
                                       :notifications-settings
-                                      :welcome)
+                                      :screen/onboarding.welcome)
                                     nil)))
 
 (rf/defn intro-wizard

src/status_im/common/pairing/events.cljs

@@ -32,10 +32,10 @@
         multiaccount-data               (when received-account?
                                           (merge account {:password password}))
         navigate-to-syncing-devices?    (and (or connection-success? connection-error?) receiver?)
-        user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
-                                            (= (:view-id db) :profiles)
-                                            (= (:view-id db) :syncing-progress-intro))
-        user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
+        user-in-syncing-devices-screen? (or (= (:view-id db) :screen/onboarding.syncing-progress)
+                                            (= (:view-id db) :screen/profile.profiles)
+                                            (= (:view-id db) :screen/onboarding.syncing-progress-intro))
+        user-in-sign-in-intro-screen?   (= (:view-id db) :screen/onboarding.sign-in-intro)]
     (merge {:db (cond-> db
                   connection-success?
                   (assoc-in [:syncing :pairing-status] :connected)
@@ -51,8 +51,9 @@
            (cond
              (and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?))
              {:dispatch (if user-in-sign-in-intro-screen?
-                          [:navigate-to-within-stack [:syncing-progress-intro :sign-in-intro]]
-                          [:navigate-to :syncing-progress])}
+                          [:navigate-to-within-stack
+                           [:screen/onboarding.syncing-progress-intro :screen/onboarding.sign-in-intro]]
+                          [:navigate-to :screen/onboarding.syncing-progress])}
 
              (and completed-pairing? sender?)
              {:dispatch [:syncing/clear-states]}

src/status_im/common/universal_links.cljs

@@ -75,7 +75,7 @@
     (and public-key (own-public-key? db public-key))
     (rf/merge cofx
               {:pop-to-root-fx :shell-stack}
-              (navigation/navigate-to :my-profile nil))
+              (navigation/navigate-to :settings nil))
 
     public-key
     {:dispatch [:chat.ui/show-profile public-key ens-name]}))

src/status_im/config.cljs

@@ -169,3 +169,4 @@
 
 (def community-accounts-selection-enabled? true)
 (def fetch-messages-enabled? (enabled? (get-config :FETCH_MESSAGES_ENABLED "1")))
+(def test-networks-enabled? (enabled? (get-config :TEST_NETWORKS_ENABLED "0")))

src/status_im/contexts/onboarding/common/background/view.cljs

@@ -69,9 +69,9 @@
 
     (rn/use-effect
      (fn []
-       (reanimated/set-shared-value @paused? (not= view-id :intro))
+       (reanimated/set-shared-value @paused? (not= view-id :screen/onboarding.intro))
        (fn []
-         (when (= view-id :generating-keys)
+         (when (= view-id :screen/onboarding.generating-keys)
            (carousel.animation/cleanup-animation progress paused?))))
      [view-id])
 

src/status_im/contexts/onboarding/enable_biometrics/view.cljs

@@ -28,7 +28,7 @@
         bio-type-label           (biometric/get-label-by-type supported-biometric-type)
         profile-color            (or (:color (rf/sub [:onboarding/profile]))
                                      (rf/sub [:profile/customization-color]))
-        syncing-results?         (= :syncing-results @state/root-id)]
+        syncing-results?         (= :screen/onboarding.syncing-results @state/root-id)]
     [rn/view {:style (style/buttons insets)}
      [quo/button
       {:size                40
@@ -43,7 +43,8 @@
        :type                :grey
        :on-press            #(rf/dispatch (if syncing-results?
                                             [:navigate-to-within-stack
-                                             [:enable-notifications :enable-biometrics]]
+                                             [:screen/onboarding.enable-notifications
+                                              :screen/onboarding.enable-biometrics]]
                                             [:onboarding/create-account-and-login]))
        :container-style     {:margin-top 12}}
       (i18n/label :t/maybe-later)]]))

src/status_im/contexts/onboarding/enable_notifications/view.cljs

@@ -36,7 +36,8 @@
                                  :on-denied   #(log/error "user denied push notification permissions")}])
                               (rf/dispatch [:push-notifications/switch true platform/ios?])
                               (rf/dispatch [:navigate-to-within-stack
-                                            [:welcome :enable-notifications]]))
+                                            [:screen/onboarding.welcome
+                                             :screen/onboarding.enable-notifications]]))
        :type                :primary
        :icon-left           :i/notifications
        :accessibility-label :enable-notifications-button
@@ -46,7 +47,8 @@
       {:on-press            (fn []
                               (shell.utils/change-selected-stack-id :communities-stack true nil)
                               (rf/dispatch [:navigate-to-within-stack
-                                            [:welcome :enable-notifications]]))
+                                            [:screen/onboarding.welcome
+                                             :screen/onboarding.enable-notifications]]))
        :accessibility-label :enable-notifications-later-button
        :type                :grey
        :background          :blur

src/status_im/contexts/onboarding/events.cljs

@@ -27,7 +27,8 @@
   {:events [:onboarding/profile-data-set]}
   [{:keys [db]} onboarding-data]
   {:db       (update db :onboarding/profile merge onboarding-data)
-   :dispatch [:navigate-to-within-stack [:create-profile-password :new-to-status]]})
+   :dispatch [:navigate-to-within-stack
+              [:screen/onboarding.create-profile-password :screen/onboarding.new-to-status]]})
 
 (rf/defn enable-biometrics
   {:events [:onboarding/enable-biometrics]}
@@ -42,7 +43,8 @@
   [{:keys [db]}]
   (let [key-uid (get-in db [:profile/profile :key-uid])]
     {:db       (dissoc db :onboarding/profile)
-     :dispatch [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]}))
+     :dispatch [:navigate-to-within-stack
+                [:screen/onboarding.enable-notifications :screen/onboarding.enable-biometrics]]}))
 
 (rf/defn biometrics-done
   {:events [:onboarding/biometrics-done]}
@@ -64,7 +66,8 @@
   (let [{:keys [display-name seed-phrase password image-path color] :as profile}
         (:onboarding/profile db)]
     (rf/merge cofx
-              {:dispatch       [:navigate-to-within-stack [:generating-keys :new-to-status]]
+              {:dispatch       [:navigate-to-within-stack
+                                [:screen/onboarding.generating-keys :screen/onboarding.new-to-status]]
                :dispatch-later [{:ms       constants/onboarding-generating-keys-animation-duration-ms
                                  :dispatch [:onboarding/navigate-to-identifiers]}]
                :db             (-> db
@@ -82,7 +85,7 @@
     (merge
      {:db (assoc db :profile/profiles-overview multiaccounts)}
      (when-not (seq multiaccounts)
-       {:set-root :intro}))))
+       {:set-root :screen/onboarding.intro}))))
 
 (rf/defn password-set
   {:events [:onboarding/password-set]}
@@ -92,16 +95,17 @@
                    (assoc-in [:onboarding/profile :password] password)
                    (assoc-in [:onboarding/profile :auth-method] constants/auth-method-password))
      :dispatch (if supported-type
-                 [:navigate-to-within-stack [:enable-biometrics :new-to-status]]
+                 [:navigate-to-within-stack
+                  [:screen/onboarding.enable-biometrics :screen/onboarding.new-to-status]]
                  [:onboarding/create-account-and-login])}))
 
 (rf/defn navigate-to-enable-biometrics
   {:events [:onboarding/navigate-to-enable-biometrics]}
   [{:keys [db]}]
   (let [supported-type (get-in db [:biometrics :supported-type])]
     {:dispatch (if supported-type
-                 [:open-modal :enable-biometrics]
-                 [:open-modal :enable-notifications])}))
+                 [:open-modal :screen/onboarding.enable-biometrics]
+                 [:open-modal :screen/onboarding.enable-notifications])}))
 
 (rf/defn seed-phrase-entered
   {:events [:onboarding/seed-phrase-entered]}
@@ -121,19 +125,21 @@
       :content             (i18n/label :t/multiaccount-exists-content)
       :confirm-button-text (i18n/label :t/unlock)
       :on-accept           (fn []
-                             (re-frame/dispatch [:pop-to-root :profiles])
+                             (re-frame/dispatch [:pop-to-root :screen/profile.profiles])
                              (re-frame/dispatch
                               [:profile/profile-selected key-uid]))
       :on-cancel           #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
     {:db       (assoc-in db [:onboarding/profile :seed-phrase] seed-phrase)
-     :dispatch [:navigate-to-within-stack [:create-profile :new-to-status]]}))
+     :dispatch [:navigate-to-within-stack
+                [:screen/onboarding.create-profile :screen/onboarding.new-to-status]]}))
 
 (rf/defn navigate-to-create-profile
   {:events [:onboarding/navigate-to-create-profile]}
   [{:keys [db]}]
   ;; Restart the flow
   {:db       (dissoc db :onboarding/profile)
-   :dispatch [:navigate-to-within-stack [:create-profile :new-to-status]]})
+   :dispatch [:navigate-to-within-stack
+              [:screen/onboarding.create-profile :screen/onboarding.new-to-status]]})
 
 (rf/reg-event-fx :onboarding/set-auth-method
  (fn [{:keys [db]} [auth-method]]
@@ -167,6 +173,7 @@
   {:events [:onboarding/navigate-to-identifiers]}
   [{:keys [db]}]
   (if (:onboarding/generated-keys? db)
-    {:dispatch [:navigate-to-within-stack [:identifiers :new-to-status]]}
+    {:dispatch [:navigate-to-within-stack
+                [:screen/onboarding.identifiers :screen/onboarding.new-to-status]]}
     {:dispatch-later [{:ms       constants/onboarding-generating-keys-navigation-retry-ms
                        :dispatch [:onboarding/navigate-to-identifiers]}]}))

src/status_im/contexts/onboarding/identifiers/view.cljs

@@ -63,7 +63,8 @@
          :type                :grey
          :background          :blur
          :on-press            #(rf/dispatch [:navigate-to-within-stack
-                                             [:enable-notifications :new-to-status]])
+                                             [:screen/onboarding.enable-notifications
+                                              :screen/onboarding.new-to-status]])
          :container-style     style/button}
         (i18n/label :t/continue)]]]]))
 

src/status_im/contexts/onboarding/intro/view.cljs

@@ -19,17 +19,18 @@
                             (reset! scan-sync-code/dismiss-animations reset-top-animation-fn))
      :animations-duration constants/onboarding-modal-animation-duration
      :animations-delay    constants/onboarding-modal-animation-delay
-     :top-card            {:on-press            #(debounce/throttle-and-dispatch [:open-modal
-                                                                                  :sign-in-intro]
-                                                                                 2000)
+     :top-card            {:on-press            #(debounce/throttle-and-dispatch
+                                                  [:open-modal
+                                                   :screen/onboarding.sign-in-intro]
+                                                  2000)
                            :heading             (i18n/label :t/sign-in)
                            :animated-heading    (i18n/label :t/sign-in-by-syncing)
                            :accessibility-label :already-use-status-button}
      :bottom-card         {:on-press            (fn []
                                                   (when-let [blur-show-fn @overlay/blur-show-fn-atom]
                                                     (blur-show-fn))
                                                   (debounce/throttle-and-dispatch
-                                                   [:open-modal :new-to-status]
+                                                   [:open-modal :screen/onboarding.new-to-status]
                                                    1000))
                            :heading             (i18n/label :t/new-to-status)
                            :accessibility-label :new-to-status-button}}

src/status_im/contexts/onboarding/new_to_status/view.cljs

@@ -45,7 +45,9 @@
         :title    (i18n/label :t/use-recovery-phrase)
         :subtitle (i18n/label :t/use-recovery-phrase-subtitle)
         :image    (resources/get-image :ethereum-address)
-        :on-press #(rf/dispatch [:navigate-to-within-stack [:enter-seed-phrase :new-to-status]])}]
+        :on-press #(rf/dispatch [:navigate-to-within-stack
+                                 [:screen/onboarding.enter-seed-phrase
+                                  :screen/onboarding.new-to-status]])}]
       [rn/view {:style style/space-between-suboptions}]
       [quo/small-option-card
        {:variant  :icon

src/status_im/contexts/onboarding/syncing/progress/view.cljs

@@ -32,11 +32,14 @@
                            (rf/dispatch [:syncing/clear-states])
                            (cond
                              logged-in?     (rf/dispatch [:navigate-back])
-                             in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro])
+                             in-onboarding? (rf/dispatch [:navigate-back-to
+                                                          :screen/onboarding.sign-in-intro])
                              :else          (do
                                               (rf/dispatch [:navigate-back])
-                                              (debounce/throttle-and-dispatch [:open-modal :sign-in]
-                                                                              1000))))
+                                              (debounce/throttle-and-dispatch
+                                               [:open-modal
+                                                :screen/onboarding.sign-in]
+                                               1000))))
     :accessibility-label :try-again-later-button
     :customization-color profile-color
     :container-style     style/try-again-button}

src/status_im/contexts/preview/quo/common.cljs

@@ -9,7 +9,7 @@
   [{:keys [theme title]}]
   (let [logged-in?    (rf/sub [:multiaccount/logged-in?])
         has-profiles? (boolean (rf/sub [:profile/profiles-overview]))
-        root          (if has-profiles? :profiles :intro)
+        root          (if has-profiles? :screen/profile.profiles :screen/onboarding.intro)
         light?        (= theme :light)]
     [quo/page-nav
      {:type       :title

src/status_im/contexts/profile/config.cljs

@@ -44,7 +44,8 @@
             :networkId                config/default-network-id
             :currentNetwork           config/default-network
             :wakuV2LightClient        false
-            :previewPrivacy           config/blank-preview?})))
+            :previewPrivacy           config/blank-preview?
+            :testNetworksEnabled      config/test-networks-enabled?})))
 
 (defn strip-file-prefix
   [path]

src/status_im/contexts/profile/events.cljs

@@ -45,14 +45,14 @@
                   (assoc :profile/profiles-overview profiles)
                   (update :profile/login #(select-profile % key-uid)))
               db)
-        :fx [[:set-root :profiles]
+        :fx [[:set-root :screen/profile.profiles]
              (when key-uid
                [:effects.biometric/check-if-available
                 {:key-uid    key-uid
                  :on-success (fn [auth-method]
                                (rf/dispatch [:profile.login/check-biometric-success key-uid
                                              auth-method]))}])]})
-     {:fx [[:set-root :intro]]})))
+     {:fx [[:set-root :screen/onboarding.intro]]})))
 
 (rf/reg-event-fx
  :profile/update-setting-from-backup

src/status_im/contexts/profile/login/events.cljs

@@ -71,7 +71,7 @@
 
                 (cond
                   pairing-completed?
-                  [[:set-root :syncing-results]]
+                  [[:set-root :screen/onboarding.syncing-results]]
 
                   (get db :onboarding/new-account?)
                   [[:dispatch [:onboarding/finalize-setup]]]

src/status_im/contexts/profile/profiles/view.cljs

@@ -50,13 +50,13 @@
                              (when @push-animation-fn-atom
                                (@push-animation-fn-atom))
                              (debounce/throttle-and-dispatch
-                              [:open-modal :new-to-status]
+                              [:open-modal :screen/onboarding.new-to-status]
                               1000))
       :accessibility-label :create-new-profile}
      {:icon                :i/multi-profile
       :label               (i18n/label :t/add-existing-status-profile)
       :on-press            #(debounce/throttle-and-dispatch
-                             [:open-modal :sign-in]
+                             [:open-modal :screen/onboarding.sign-in]
                              1000)
       :accessibility-label :multi-profile}]]])
 

src/status_im/contexts/profile/settings/view.cljs

@@ -53,7 +53,8 @@
        {:background :blur
         :icon-name  :i/close
         :on-press   #(rf/dispatch [:navigate-back])
-        :right-side [{:icon-name :i/multi-profile :on-press #(rf/dispatch [:open-modal :sign-in])}
+        :right-side [{:icon-name :i/multi-profile
+                      :on-press  #(rf/dispatch [:open-modal :screen/onboarding.sign-in])}
                      {:icon-name :i/qr-code
                       :on-press  #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)}
                      {:icon-name :i/share :on-press not-implemented/alert}]}]]

src/status_im/contexts/syncing/scan_sync_code/view.cljs

@@ -301,8 +301,8 @@
                                          @camera-permission-granted?
                                          @preflight-check-passed?
                                          (some #{view-id}
-                                               [:sign-in-intro
-                                                :sign-in
+                                               [:screen/onboarding.sign-in-intro
+                                                :screen/onboarding.sign-in
                                                 :scan-sync-code-page])
                                          (boolean (not-empty @qr-view-finder)))
             camera-ready-to-scan?   (and (or (not animated?) @render-camera?)
@@ -326,7 +326,7 @@
         (when animated?
           (rn/use-effect
            (fn []
-             (when (= view-id :sign-in-intro)
+             (when (= view-id :screen/onboarding.sign-in-intro)
                (rn/hw-back-add-listener reset-animations-fn)
                #(rn/hw-back-remove-listener reset-animations-fn)))
            [view-id])