Skip to content

Commit 00a3218

Browse files
committed
fix: ensure we disable the toggle
1 parent 4ea25cf commit 00a3218

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/status_im/contexts/onboarding/events.cljs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,25 @@
223223
:onboarding/password-set
224224
(fn [{:keys [db]} [masked-password]]
225225
(let [biometric-supported-type (get-in db [:biometrics :supported-type])
226+
syncing? (get-in db [:onboarding/profile :syncing?])
226227
from-screen (get db
227228
:onboarding/navigated-to-enter-seed-phrase-from-screen
228229
:screen/onboarding.create-profile)]
229230
{:db (-> db
230231
(assoc-in [:onboarding/profile :password] masked-password)
231232
(assoc-in [:onboarding/profile :auth-method] constants/auth-method-password))
232233
:fx [[:dispatch
233-
(if biometric-supported-type
234+
(cond
235+
biometric-supported-type
234236
[:navigate-to-within-stack [:screen/onboarding.enable-biometrics from-screen]]
237+
238+
(ff/enabled? ::ff/settings.news-notifications)
239+
[:onboarding/notifications-setup
240+
{:onboarding? true
241+
:biometrics? false
242+
:syncing? syncing?}]
243+
244+
:else
235245
[:onboarding/create-account-and-login])]]})))
236246

237247
(rf/reg-event-fx

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
[quo/selectors
135135
{:type :toggle
136136
:checked? (:checked? action-props)
137+
:disabled? (:disabled? action-props)
137138
:on-change (:on-change action-props)}]]
138139
[rn/flat-list
139140
{:data [(chat-non-contacts-notifications-setting notifications-settings)

0 commit comments

Comments
 (0)