Merge pull request #1130 from OneSignal/fix/hide_bell_if_user_is_subs…

…cribed [Fix] hide bell if user is subscribed, dashboard setting
OneSignal · Nov 14, 2023 · 36d42a9 · 36d42a9
2 parents e93f2bb + c50a923
commit 36d42a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/shared/helpers/ConfigHelper.ts b/src/shared/helpers/ConfigHelper.ts
@@ -532,14 +532,7 @@ export class ConfigHelper {
             enable: serverConfig.config.staticPrompts.bell.enabled,
             displayPredicate: serverConfig.config.staticPrompts.bell
               .hideWhenSubscribed
-              ? () => {
-                  return OneSignal.isPushNotificationsEnabled().then(
-                    (isPushEnabled: boolean) => {
-                      /* The user is subscribed, so we want to return "false" to hide the notify button */
-                      return !isPushEnabled;
-                    },
-                  );
-                }
+              ? () => !OneSignal.User.PushSubscription.optedIn
               : null,
             size: serverConfig.config.staticPrompts.bell.size,
             position: serverConfig.config.staticPrompts.bell.location,

diff --git a/src/shared/models/Prompts.ts b/src/shared/models/Prompts.ts
@@ -123,7 +123,7 @@ export interface BellText {
 export interface AppUserConfigNotifyButton {
   options?: AppUserConfigNotifyButton;
   enable: boolean;
-  displayPredicate?: () => void | null | undefined;
+  displayPredicate?: null | (() => void | null | undefined | boolean);
   size?: BellSize;
   position?: BellPosition;
   offset?: { bottom: string; left: string; right: string };