Skip to content

Commit

Permalink
Merge pull request #844 from OneSignal/autoprompt-hiding-fix
Browse files Browse the repository at this point in the history
Move the bell manager function until after knowing whether to show sl…
  • Loading branch information
Rodrigo Gomez Palacio authored Jul 6, 2021
2 parents 7c2e3b7 + 61ca4a9 commit 8f328bf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/managers/PromptsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import OneSignalUtils from "../utils/OneSignalUtils";
import { ContextInterface } from "../models/Context";
import MainHelper from '../helpers/MainHelper';
import { ResourceLoadState } from '../services/DynamicResourceLoader';
import Slidedown, { manageNotifyButtonStateWhileSlidedownShows } from '../slidedown/Slidedown';
import Slidedown from '../slidedown/Slidedown';
import {
DelayedPromptOptions,
AppUserConfigPromptOptions,
Expand Down Expand Up @@ -232,7 +232,6 @@ export class PromptsManager {

public installEventHooksForSlidedown(): void {
this.eventHooksInstalled = true;
manageNotifyButtonStateWhileSlidedownShows();

OneSignal.emitter.on(Slidedown.EVENTS.SHOWN, () => {
this.context.slidedownManager.setIsSlidedownShowing(true);
Expand Down
4 changes: 3 additions & 1 deletion src/managers/slidedownManager/SlidedownManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import TaggingContainer from "../../slidedown/TaggingContainer";
import TagUtils from "../../utils/TagUtils";
import { ContextInterface } from "../../models/Context";
import { DelayedPromptType } from "../../models/Prompts";
import Slidedown from "../../slidedown/Slidedown";
import Slidedown, { manageNotifyButtonStateWhileSlidedownShows } from "../../slidedown/Slidedown";
import { AutoPromptOptions } from "../PromptsManager";
import Log from "../../libraries/Log";
import { CONFIG_DEFAULTS_SLIDEDOWN_OPTIONS } from "../../config";
Expand Down Expand Up @@ -376,6 +376,8 @@ export class SlidedownManager {
return;
}

manageNotifyButtonStateWhileSlidedownShows();

if (this.isSlidedownShowing) {
// already showing, enqueue
this.enqueue(options);
Expand Down

0 comments on commit 8f328bf

Please sign in to comment.