Merge branch 'develop' into 15563

Clean
Lint
2023-04-11 10:12:37 +02:00 · 2023-04-08 14:21:49 +02:00 · 2023-04-08 14:21:20 +02:00 · 2023-04-08 14:20:32 +02:00 · 2023-04-08 14:20:22 +02:00 · 2023-04-04 17:59:27 +02:00
3 changed files with 36 additions and 35 deletions
@@ -42,25 +42,26 @@

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

 (defn enable-notifications
  []
@@ -163,8 +163,7 @@
                            constants/auth-method-biometric
                            (get-in db [:onboarding-2/profile :auth-method]))]

-    (cond-> {:db       (dissoc db :onboarding-2/profile)
-             :dispatch [:navigate-to :enable-notifications]}
+    (cond-> {:dispatch [:navigate-to :enable-notifications]}
      biometric-enabled?
      (assoc :biometric/enable-and-save-password
             {:key-uid         key-uid
@@ -39,17 +39,18 @@

 (defn view
  []
-  [rn/view {:style style/welcome-container}
-   [background/view true]
-   [navigation-bar :enable-notifications]
-   [page-title]
-   [rn/view {:style style/page-illustration}
-    [quo/text
-     "Illustration here"]]
-   [quo/button
-    {:on-press                  #(rf/dispatch [:init-root :shell-stack])
-     :type                      :primary
-     :accessibility-label       :welcome-button
-     :override-background-color (colors/custom-color :magenta 60)
-     :style                     {:margin 20}}
-    (i18n/label :t/start-using-status)]])
+  (let [{profile-color :color} (rf/sub [:onboarding-2/profile])]
+    [rn/view {:style style/welcome-container}
+     [background/view true]
+     [navigation-bar :enable-notifications]
+     [page-title]
+     [rn/view {:style style/page-illustration}
+      [quo/text
+       "Illustration here"]]
+     [quo/button
+      {:on-press                  #(rf/dispatch [:init-root :shell-stack])
+       :type                      :primary
+       :accessibility-label       :welcome-button
+       :override-background-color (colors/custom-color profile-color 60)
+       :style                     {:margin 20}}
+      (i18n/label :t/start-using-status)]]))
Author	SHA1	Message	Date
Ibrahem Khalil	9761cb66f0	Merge branch 'develop' into 15563	2023-04-11 10:12:37 +02:00
Ibrahem	7a28c0c120	Clean	2023-04-08 14:21:49 +02:00
Ibrahem	cb4d8cd899	Lint	2023-04-08 14:21:20 +02:00
Ibrahem	b242f4a94c	Merge branch '15563' of https://www.github.com/status-im/status-mobile into 15563 https://github.com/status-im/status-go/compare/ee01fe4e...ee01fe4e	2023-04-08 14:20:32 +02:00
Ibrahem Khalil	6296530810	Merge branch 'develop' into 15563	2023-04-08 14:20:22 +02:00
Ibrahem	90095c84f7	Fix album count not showing on receiver side	2023-04-04 17:59:27 +02:00
Ibrahem	2f53a5ca2c	Add start using status color	2023-04-04 02:00:28 +02:00
Ibrahem	d7afbb6a86	Add user color to enable notifications button	2023-04-04 00:03:31 +02:00