From ac961f577c4355dd6089deeb3a151ed870a8a260 Mon Sep 17 00:00:00 2001 From: Matilde Park Date: Thu, 12 Nov 2020 08:05:50 -0500 Subject: [PATCH 1/2] hark: pass remotecontentpolicy to chat notifs --- pkg/interface/src/views/apps/notifications/chat.tsx | 4 +++- pkg/interface/src/views/apps/notifications/inbox.tsx | 4 ++++ pkg/interface/src/views/apps/notifications/notification.tsx | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/interface/src/views/apps/notifications/chat.tsx b/pkg/interface/src/views/apps/notifications/chat.tsx index 8566bbe4e1..100a31a163 100644 --- a/pkg/interface/src/views/apps/notifications/chat.tsx +++ b/pkg/interface/src/views/apps/notifications/chat.tsx @@ -34,8 +34,9 @@ export function ChatNotification(props: { contacts: Rolodex; groups: Groups; api: GlobalApi; + remoteContentPolicy: any; }) { - const { index, contents, read, time, api, timebox } = props; + const { index, contents, read, time, api, timebox, remoteContentPolicy } = props; const authors = _.map(contents, "author"); const { chat, mention } = index; @@ -86,6 +87,7 @@ export function ChatNotification(props: { contacts={groupContacts} fontSize='0' pt='2' + remoteContentPolicy={remoteContentPolicy} /> ); diff --git a/pkg/interface/src/views/apps/notifications/inbox.tsx b/pkg/interface/src/views/apps/notifications/inbox.tsx index cb7294c207..1fb35dc290 100644 --- a/pkg/interface/src/views/apps/notifications/inbox.tsx +++ b/pkg/interface/src/views/apps/notifications/inbox.tsx @@ -134,6 +134,7 @@ export default function Inbox(props: { graphConfig={props.notificationsGraphConfig} groupConfig={props.notificationsGroupConfig} chatConfig={props.notificationsChatConfig} + remoteContentPolicy={props.remoteContentPolicy} api={api} /> )} @@ -153,6 +154,7 @@ export default function Inbox(props: { graphConfig={props.notificationsGraphConfig} groupConfig={props.notificationsGroupConfig} chatConfig={props.notificationsChatConfig} + remoteContentPolicy={props.remoteContentPolicy} /> ) )} @@ -182,6 +184,7 @@ function DaySection({ groupConfig, graphConfig, chatConfig, + remoteContentPolicy }) { const calendar = latest ? MOMENT_CALENDAR_DATE @@ -216,6 +219,7 @@ function DaySection({ contacts={contacts} groups={groups} time={date} + remoteContentPolicy={remoteContentPolicy} /> )) diff --git a/pkg/interface/src/views/apps/notifications/notification.tsx b/pkg/interface/src/views/apps/notifications/notification.tsx index 870fbeeca2..500ed1233d 100644 --- a/pkg/interface/src/views/apps/notifications/notification.tsx +++ b/pkg/interface/src/views/apps/notifications/notification.tsx @@ -31,6 +31,7 @@ interface NotificationProps { graphConfig: NotificationGraphConfig; groupConfig: GroupNotificationsConfig; chatConfig: string[]; + remoteContentPolicy: any; } function getMuted( @@ -180,6 +181,7 @@ export function Notification(props: NotificationProps) { timebox={props.time} time={time} associations={associations} + remoteContentPolicy={props.remoteContentPolicy} /> ); From fcefc4b1c14ff61d8c86e5bbe248ed67cc041d06 Mon Sep 17 00:00:00 2001 From: Matilde Park Date: Thu, 12 Nov 2020 08:07:21 -0500 Subject: [PATCH 2/2] hark: remove extraneous "}" --- pkg/interface/src/views/apps/notifications/header.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/interface/src/views/apps/notifications/header.tsx b/pkg/interface/src/views/apps/notifications/header.tsx index 22a6ca3860..63cdce0e58 100644 --- a/pkg/interface/src/views/apps/notifications/header.tsx +++ b/pkg/interface/src/views/apps/notifications/header.tsx @@ -87,9 +87,9 @@ export function Header(props: { {!!moduleIcon && } {!!channel && {channelTitle}} - {groupTitle && + {groupTitle && <> - {groupTitle}} + {groupTitle} }