From 141252e5a0fc2d74b6608311c772b668bc9af2e7 Mon Sep 17 00:00:00 2001 From: Parvesh Monu Date: Mon, 24 Jun 2024 15:12:03 +0530 Subject: [PATCH] fix no request for permission for push notifications when you enable them in app settings (#20531) --- .../ui/screens/notifications_settings/views.cljs | 11 ++++++++++- .../onboarding/enable_notifications/view.cljs | 3 +-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/legacy/status_im/ui/screens/notifications_settings/views.cljs b/src/legacy/status_im/ui/screens/notifications_settings/views.cljs index e87b36c38a..11e8b828f6 100644 --- a/src/legacy/status_im/ui/screens/notifications_settings/views.cljs +++ b/src/legacy/status_im/ui/screens/notifications_settings/views.cljs @@ -6,6 +6,7 @@ [legacy.status-im.ui.components.react :as react] [quo.core :as quo] [react-native.platform :as platform] + [taoensso.timbre :as log] [utils.i18n :as i18n] [utils.re-frame :as rf])) @@ -57,7 +58,15 @@ :accessibility-label :local-notifications-settings-button :subtitle (i18n/label :t/local-notifications-subtitle) :active notifications-enabled? - :on-press #(rf/dispatch [:push-notifications/switch (not notifications-enabled?)]) + :on-press (fn [] + (when-not notifications-enabled? + (rf/dispatch + [:request-permissions + {:permissions [:post-notifications] + :on-allowed #(log/info "push notification permissions were allowed") + :on-denied #(log/error + "user denied push notification permissions")}])) + (rf/dispatch [:push-notifications/switch (not notifications-enabled?)])) :accessory :switch}]])) (defn notifications-settings diff --git a/src/status_im/contexts/onboarding/enable_notifications/view.cljs b/src/status_im/contexts/onboarding/enable_notifications/view.cljs index f383f028cb..1706597eff 100644 --- a/src/status_im/contexts/onboarding/enable_notifications/view.cljs +++ b/src/status_im/contexts/onboarding/enable_notifications/view.cljs @@ -2,7 +2,6 @@ (:require [quo.core :as quo] [react-native.core :as rn] - [react-native.platform :as platform] [react-native.safe-area :as safe-area] [status-im.common.resources :as resources] [status-im.contexts.onboarding.enable-notifications.style :as style] @@ -36,7 +35,7 @@ {:permissions [:post-notifications] :on-allowed #(log/info "push notification permissions were allowed") :on-denied #(log/error "user denied push notification permissions")}]) - (rf/dispatch [:push-notifications/switch true platform/ios?]) + (rf/dispatch [:push-notifications/switch true]) (rf/dispatch [:navigate-to-within-stack [:screen/onboarding.welcome :screen/onboarding.enable-notifications]]))