diff --git a/react/features/notifications/components/native/Notification.tsx b/react/features/notifications/components/native/Notification.tsx index ffb0f5302..6beb5df6f 100644 --- a/react/features/notifications/components/native/Notification.tsx +++ b/react/features/notifications/components/native/Notification.tsx @@ -43,7 +43,7 @@ const ICON_COLOR = { }; -type Props = AbstractNotificationProps & WithTranslation & { +export type Props = AbstractNotificationProps & WithTranslation & { _participants: ArrayLike; }; @@ -188,12 +188,17 @@ class Notification extends AbstractNotification { const { icon } = this.props; const contentColumnStyles = icon === NOTIFICATION_ICON.PARTICIPANTS ? styles.contentColumn : styles.interactiveContentColumn; + const description = this._getDescription(); + + const notificationStyles = description?.length + ? styles.notificationWithDescription + : styles.notification; return ( { */ _renderContent() { // @ts-ignore - const { icon, t, title, titleArguments, titleKey } = this.props; + const { t, title, titleArguments, titleKey } = this.props; const titleText = title || (titleKey && t(titleKey, titleArguments)); const description = this._getDescription(); - const descriptionStyles = icon === NOTIFICATION_ICON.PARTICIPANTS - ? styles.contentTextInteractive : styles.contentText; if (description?.length) { return ( @@ -244,7 +247,7 @@ class Notification extends AbstractNotification { description.map((line, index) => ( + style = { styles.contentText }> { replaceNonUnicodeEmojis(line) } )) diff --git a/react/features/notifications/components/native/styles.js b/react/features/notifications/components/native/styles.js index d43463838..d232c7349 100644 --- a/react/features/notifications/components/native/styles.js +++ b/react/features/notifications/components/native/styles.js @@ -8,9 +8,18 @@ const contentColumn = { marginLeft: BaseTheme.spacing[2] }; -const contentText = { - color: BaseTheme.palette.text04, - marginLeft: BaseTheme.spacing[6] +const notification = { + display: 'flex', + backgroundColor: BaseTheme.palette.ui12, + borderRadius: BaseTheme.shape.borderRadius, + borderLeftColor: BaseTheme.palette.link01Active, + borderLeftWidth: 4, + flexDirection: 'row', + maxHeight: 104, + height: 'auto', + marginBottom: BaseTheme.spacing[3], + marginHorizontal: BaseTheme.spacing[2], + width: 400 }; /** @@ -39,17 +48,14 @@ export default { }, contentText: { - ...contentText, - marginVertical: BaseTheme.spacing[1] - }, - - contentTextInteractive: { - ...contentText, + color: BaseTheme.palette.text04, + marginLeft: BaseTheme.spacing[6], marginTop: BaseTheme.spacing[1] }, contentTextTitle: { - ...contentText, + color: BaseTheme.palette.text04, + marginLeft: BaseTheme.spacing[6], fontWeight: 'bold', marginTop: BaseTheme.spacing[1] }, @@ -63,14 +69,12 @@ export default { }, notification: { - display: 'flex', - backgroundColor: BaseTheme.palette.ui12, - borderRadius: BaseTheme.shape.borderRadius, - flexDirection: 'row', - maxHeight: 104, - height: 'auto', - marginBottom: BaseTheme.spacing[3], - marginHorizontal: BaseTheme.spacing[2] + ...notification + }, + + notificationWithDescription: { + ...notification, + paddingBottom: BaseTheme.spacing[2] }, /**