From 2fccde0e8dae564d9e52fdf4ea84d339276e8134 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 3 Nov 2020 23:09:23 +0000 Subject: [PATCH] Hide prompt to add email for notifications if 3pid ui feature is off --- src/components/views/settings/Notifications.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js index cd87803d84..1337991dc3 100644 --- a/src/components/views/settings/Notifications.js +++ b/src/components/views/settings/Notifications.js @@ -31,6 +31,7 @@ import SdkConfig from "../../../SdkConfig"; import LabelledToggleSwitch from "../elements/LabelledToggleSwitch"; import AccessibleButton from "../elements/AccessibleButton"; import {SettingLevel} from "../../../settings/SettingLevel"; +import {UIFeature} from "../../../settings/UIFeature"; // TODO: this "view" component still has far too much application logic in it, // which should be factored out to other files. @@ -783,14 +784,14 @@ export default class Notifications extends React.Component { const emailThreepids = this.state.threepids.filter((tp) => tp.medium === "email"); let emailNotificationsRows; - if (emailThreepids.length === 0) { - emailNotificationsRows =
- { _t('Add an email address to configure email notifications') } -
; - } else { + if (emailThreepids.length > 0) { emailNotificationsRows = emailThreepids.map((threePid) => this.emailNotificationsRow( threePid.address, `${_t('Enable email notifications')} (${threePid.address})`, )); + } else if (SettingsStore.getValue(UIFeature.ThirdPartyID)) { + emailNotificationsRows =
+ { _t('Add an email address to configure email notifications') } +
; } // Build external push rules