Merge branch 'develop' into travis/3pid-invites

This commit is contained in:
Travis Ralston 2020-09-15 08:53:32 -06:00
commit 246b802206
9 changed files with 11 additions and 31 deletions

View file

@ -1363,7 +1363,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
this.firstSyncComplete = true;
this.firstSyncPromise.resolve();
if (Notifier.shouldShowToolbar()) {
if (Notifier.shouldShowPrompt()) {
showNotificationsToast();
}