Merge branch 'develop' into 15563

https://github.com/status-im/status-go/compare/ee01fe4e...ee01fe4e

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

@@ -42,25 +42,26 @@
 
 (defn enable-notification-buttons
   []
-  [rn/view {:style style/enable-notifications-buttons}
+  (let [{profile-color :color} (rf/sub [:onboarding-2/profile])]
-   [quo/button
+    [rn/view {:style style/enable-notifications-buttons}
-    {:on-press                  (fn []
+     [quo/button
-                                  (shell.animation/change-selected-stack-id :communities-stack true)
+      {:on-press                  (fn []
-                                  (rf/dispatch [::notifications/switch true platform/ios?])
+                                    (shell.animation/change-selected-stack-id :communities-stack true)
-                                  (rf/dispatch [:init-root :welcome]))
+                                    (rf/dispatch [::notifications/switch true platform/ios?])
-     :type                      :primary
+                                    (rf/dispatch [:init-root :welcome]))
-     :before                    :i/notifications
+       :type                      :primary
-     :accessibility-label       :enable-notifications-button
+       :before                    :i/notifications
-     :override-background-color (colors/custom-color :magenta 60)}
+       :accessibility-label       :enable-notifications-button
-    (i18n/label :t/intro-wizard-title6)]
+       :override-background-color (colors/custom-color profile-color 60)}
-   [quo/button
+      (i18n/label :t/intro-wizard-title6)]
-    {:on-press                  (fn []
+     [quo/button
-                                  (shell.animation/change-selected-stack-id :communities-stack true)
+      {:on-press                  (fn []
-                                  (rf/dispatch [:init-root :welcome]))
+                                    (shell.animation/change-selected-stack-id :communities-stack true)
-     :accessibility-label       :enable-notifications-later-button
+                                    (rf/dispatch [:init-root :welcome]))
-     :override-background-color colors/white-opa-5
+       :accessibility-label       :enable-notifications-later-button
-     :style                     {:margin-top 12}}
+       :override-background-color colors/white-opa-5
-    (i18n/label :t/maybe-later)]])
+       :style                     {:margin-top 12}}
+      (i18n/label :t/maybe-later)]]))
 
 (defn enable-notifications
   []

src/status_im2/contexts/onboarding/events.cljs

@@ -163,8 +163,7 @@
                             constants/auth-method-biometric
                             (get-in db [:onboarding-2/profile :auth-method]))]
 
-    (cond-> {:db       (dissoc db :onboarding-2/profile)
+    (cond-> {:dispatch [:navigate-to :enable-notifications]}
-             :dispatch [:navigate-to :enable-notifications]}
       biometric-enabled?
       (assoc :biometric/enable-and-save-password
              {:key-uid         key-uid

src/status_im2/contexts/onboarding/welcome/view.cljs

@@ -39,17 +39,18 @@
 
 (defn view
   []
-  [rn/view {:style style/welcome-container}
+  (let [{profile-color :color} (rf/sub [:onboarding-2/profile])]
-   [background/view true]
+    [rn/view {:style style/welcome-container}
-   [navigation-bar :enable-notifications]
+     [background/view true]
-   [page-title]
+     [navigation-bar :enable-notifications]
-   [rn/view {:style style/page-illustration}
+     [page-title]
-    [quo/text
+     [rn/view {:style style/page-illustration}
-     "Illustration here"]]
+      [quo/text
-   [quo/button
+       "Illustration here"]]
-    {:on-press                  #(rf/dispatch [:init-root :shell-stack])
+     [quo/button
-     :type                      :primary
+      {:on-press                  #(rf/dispatch [:init-root :shell-stack])
-     :accessibility-label       :welcome-button
+       :type                      :primary
-     :override-background-color (colors/custom-color :magenta 60)
+       :accessibility-label       :welcome-button
-     :style                     {:margin 20}}
+       :override-background-color (colors/custom-color profile-color 60)
-    (i18n/label :t/start-using-status)]])
+       :style                     {:margin 20}}
+      (i18n/label :t/start-using-status)]]))