diff --git a/conference.js b/conference.js index 3ec751eb7..a4b4ec5f4 100644 --- a/conference.js +++ b/conference.js @@ -62,6 +62,7 @@ import { setVideoAvailable, setVideoMuted } from './react/features/base/media'; +import { showNotification } from './react/features/notifications'; import { dominantSpeakerChanged, getAvatarURLByParticipantId, @@ -203,7 +204,7 @@ function muteLocalVideo(muted) { * * @param {object} options used to decide which particular close page to show * or if close page is disabled, whether we should show the thankyou dialog - * @param {boolean} options.thankYouDialogVisible - whether we should + * @param {boolean} options.showThankYou - whether we should * show thank you dialog * @param {boolean} options.feedbackSubmitted - whether feedback was submitted */ @@ -222,9 +223,11 @@ function maybeRedirectToWelcomePage(options) { } // else: show thankYou dialog only if there is no feedback - if (options.thankYouDialogVisible) { - APP.UI.messageHandler.openMessageDialog( - null, 'dialog.thankYou', { appName: interfaceConfig.APP_NAME }); + if (options.showThankYou) { + APP.store.dispatch(showNotification({ + titleArguments: { appName: interfaceConfig.APP_NAME }, + titleKey: 'dialog.thankYou' + })); } // if Welcome page is enabled redirect to welcome page after 3 sec. diff --git a/react/features/feedback/actions.js b/react/features/feedback/actions.js index b958814e9..57c3881be 100644 --- a/react/features/feedback/actions.js +++ b/react/features/feedback/actions.js @@ -43,7 +43,7 @@ export function cancelFeedback(score: number, message: string) { export function maybeOpenFeedbackDialog(conference: Object) { type R = { feedbackSubmitted: boolean, - thankYouDialogVisible: boolean + showThankYou: boolean }; return (dispatch: Dispatch<*>, getState: Function): Promise => { @@ -61,7 +61,7 @@ export function maybeOpenFeedbackDialog(conference: Object) { return Promise.resolve({ feedbackSubmitted: true, - thankYouDialogVisible: true + showThankYou: true }); } else if (conference.isCallstatsEnabled()) { return new Promise(resolve => { @@ -70,18 +70,18 @@ export function maybeOpenFeedbackDialog(conference: Object) { resolve({ feedbackSubmitted: submitted, - thankYouDialogVisible: false + showThankYou: false }); })); }); } // If the feedback functionality isn't enabled we show a "thank you" - // dialog. Signaling it (true), so the caller of requestFeedback can act - // on it. + // message. Signaling it (true), so the caller of requestFeedback can + // act on it. return Promise.resolve({ feedbackSubmitted: false, - thankYouDialogVisible: true + showThankYou: true }); }; }