diff --git a/lib/shared/thread-settings-notifications-utils.js b/lib/shared/thread-settings-notifications-utils.js --- a/lib/shared/thread-settings-notifications-utils.js +++ b/lib/shared/thread-settings-notifications-utils.js @@ -18,7 +18,7 @@ const threadSettingsNotificationsCopy = { BANNER_NOTIFS: 'Banner notifs', - BADGE_COUNT: 'Badge count', + NOTIF_COUNT: 'Notif count', IN_FOCUSED_TAB: 'Lives in Focused tab', IN_BACKGROUND_TAB: 'Lives in Background tab', FOCUSED: 'Focused (enabled)', diff --git a/native/chat/settings/thread-settings-notifications.react.js b/native/chat/settings/thread-settings-notifications.react.js --- a/native/chat/settings/thread-settings-notifications.react.js +++ b/native/chat/settings/thread-settings-notifications.react.js @@ -26,7 +26,7 @@ type NotificationDescriptionProps = { +selected: boolean, +bannerNotifsEnabled: boolean, - +badgeCountEnabled: boolean, + +notifCountEnabled: boolean, +livesInFocusedTab: boolean, }; @@ -36,7 +36,7 @@ const { selected, bannerNotifsEnabled, - badgeCountEnabled, + notifCountEnabled, livesInFocusedTab, } = props; @@ -61,18 +61,18 @@ styles.notificationOptionDescriptionTextDisabledSelected, ]); - const badgeCountDescriptionTextStyles = React.useMemo(() => { + const notifCountDescriptionTextStyles = React.useMemo(() => { const style = [styles.notificationOptionDescriptionText]; - if (selected && !badgeCountEnabled) { + if (selected && !notifCountEnabled) { style.push(styles.notificationOptionDescriptionTextDisabledSelected); - } else if (!badgeCountEnabled) { + } else if (!notifCountEnabled) { style.push(styles.notificationOptionDescriptionTextDisabled); } return style; }, [ - badgeCountEnabled, + notifCountEnabled, selected, styles.notificationOptionDescriptionText, styles.notificationOptionDescriptionTextDisabled, @@ -86,11 +86,11 @@ bannerNotifsIconColor = colors.panelSecondaryForeground; } - let badgeCountIconColor = colors.panelForegroundSecondaryLabel; - if (selected && !badgeCountEnabled) { - badgeCountIconColor = colors.panelInputSecondaryForeground; - } else if (!badgeCountEnabled) { - badgeCountIconColor = colors.panelSecondaryForeground; + let notifCountIconColor = colors.panelForegroundSecondaryLabel; + if (selected && !notifCountEnabled) { + notifCountIconColor = colors.panelInputSecondaryForeground; + } else if (!notifCountEnabled) { + notifCountIconColor = colors.panelSecondaryForeground; } return ( @@ -107,12 +107,12 @@ - - {threadSettingsNotificationsCopy.BADGE_COUNT} + + {threadSettingsNotificationsCopy.NOTIF_COUNT} @@ -203,7 +203,7 @@ ), @@ -215,7 +215,7 @@ ), @@ -227,7 +227,7 @@ ), diff --git a/web/modals/threads/notifications/notifications-modal.react.js b/web/modals/threads/notifications/notifications-modal.react.js --- a/web/modals/threads/notifications/notifications-modal.react.js +++ b/web/modals/threads/notifications/notifications-modal.react.js @@ -24,7 +24,7 @@ styleStatementBasedOnValidity: true, }, { - statement: threadSettingsNotificationsCopy.BADGE_COUNT, + statement: threadSettingsNotificationsCopy.NOTIF_COUNT, isStatementValid: true, styleStatementBasedOnValidity: true, }, @@ -42,7 +42,7 @@ styleStatementBasedOnValidity: true, }, { - statement: threadSettingsNotificationsCopy.BADGE_COUNT, + statement: threadSettingsNotificationsCopy.NOTIF_COUNT, isStatementValid: true, styleStatementBasedOnValidity: true, }, @@ -60,7 +60,7 @@ styleStatementBasedOnValidity: true, }, { - statement: threadSettingsNotificationsCopy.BADGE_COUNT, + statement: threadSettingsNotificationsCopy.NOTIF_COUNT, isStatementValid: false, styleStatementBasedOnValidity: true, },