diff --git a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap index 008021b18..fcaf2ed75 100644 --- a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap +++ b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap @@ -91,14 +91,9 @@ exports[`NotificationSettingsEmailAndroid should match snapshot 2`] = ` } /> ); diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js b/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js index ad10b5846..893890e88 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js @@ -24,7 +24,6 @@ describe('NotificationSettingsEmailAndroid', () => { savePreferences: jest.fn(), }, sendEmailNotifications: true, - siteName: 'Mattermost', theme: Preferences.THEMES.default, componentId: 'component-id', }; diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.ios.js b/app/screens/settings/notification_settings_email/notification_settings_email.ios.js index d426fa9df..80983f92f 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email.ios.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email.ios.js @@ -24,7 +24,6 @@ class NotificationSettingsEmailIos extends NotificationSettingsEmailBase { const { enableEmailBatching, sendEmailNotifications, - siteName, theme, isLandscape, } = this.props; @@ -36,8 +35,7 @@ class NotificationSettingsEmailIos extends NotificationSettingsEmailBase { headerId={t('mobile.notification_settings.email.send')} headerDefaultMessage='SEND EMAIL NOTIFICATIONS' footerId={t('user.settings.notifications.emailInfo')} - footerDefaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.' - footerValues={{siteName}} + footerDefaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.' disableFooter={!sendEmailNotifications} theme={theme} isLandscape={isLandscape} diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js b/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js index 857d2095e..5b5f3f265 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js @@ -31,7 +31,6 @@ describe('NotificationSettingsEmailIos', () => { savePreferences: jest.fn(), }, sendEmailNotifications: true, - siteName: 'Mattermost', theme: Preferences.THEMES.default, componentId: 'component-id', isLandscape: false, diff --git a/app/screens/settings/notification_settings_email/notification_settings_email_base.js b/app/screens/settings/notification_settings_email/notification_settings_email_base.js index 530448c10..6c98ce1be 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email_base.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email_base.js @@ -23,7 +23,6 @@ export default class NotificationSettingsEmailBase extends PureComponent { emailInterval: PropTypes.string.isRequired, enableEmailBatching: PropTypes.bool.isRequired, sendEmailNotifications: PropTypes.bool.isRequired, - siteName: PropTypes.string, theme: PropTypes.object.isRequired, }; diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index c0b36cd34..7931f1e32 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -594,7 +594,7 @@ "user.settings.notifications.email.immediately": "Immediately", "user.settings.notifications.email.never": "Never", "user.settings.notifications.email.send": "Send email notifications", - "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.", + "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away for more than 5 minutes.", "user.settings.notifications.never": "Never", "user.settings.notifications.onlyMentions": "Only for mentions and direct messages", "user.settings.push_notification.away": "Away or offline",