From 56a5dddc08d07e66f65e002cd1503522eb80eb1b Mon Sep 17 00:00:00 2001
From: dougfabris <deefabris@gmail.com>
Date: Wed, 20 Jan 2021 23:50:44 -0300
Subject: [PATCH 1/3] fix announcement instance

---
 app/ui/client/views/app/room.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 6f33ad1ddccdf..0b5f67f5aa330 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -27,7 +27,6 @@ import { callbacks } from '../../../../callbacks';
 import { hasAllPermission, hasRole } from '../../../../authorization';
 import { ChatMessages } from '../../lib/chatMessages';
 import { fileUpload } from '../../lib/fileUpload';
-import { Markdown } from '../../../../markdown/client';
 import './room.html';
 import { getCommonRoomEvents } from './lib/getCommonRoomEvents';
 
@@ -258,8 +257,7 @@ Template.roomOld.helpers({
 	},
 
 	announcement() {
-		const announcement = Template.instance().state.get('announcement');
-		return announcement ? Markdown.parse(announcement).replace(/^<p>|<\/p>$/, '') : undefined;
+		return Template.instance().state.get('announcement');
 	},
 
 	announcementDetails() {

From ffd7dc2d638074cfc3d9482ced0c14c111868816 Mon Sep 17 00:00:00 2001
From: dougfabris <deefabris@gmail.com>
Date: Wed, 20 Jan 2021 23:51:04 -0300
Subject: [PATCH 2/3] style and ux fixes

---
 client/views/room/Announcement/Announcement.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/views/room/Announcement/Announcement.js b/client/views/room/Announcement/Announcement.js
index d647a46ef5abf..bb969594c5153 100644
--- a/client/views/room/Announcement/Announcement.js
+++ b/client/views/room/Announcement/Announcement.js
@@ -9,11 +9,15 @@ import { useSetModal } from '../../../contexts/ModalContext';
 import MarkdownText from '../../../components/MarkdownText';
 
 export const Announcement = ({ children, onClickOpen }) => {
-	const clickable = css`
+	const announcementBar = css`
 		background-color: ${ colors.b200 };
 		color: ${ colors.b600 };
 		cursor: pointer;
 		transition: transform 0.2s ease-out;
+		a{
+			color: ${ colors.b600 } !important;
+			text-decoration: underline !important;
+		}
 		> * {
 			flex: auto;
 		}
@@ -23,13 +27,17 @@ export const Announcement = ({ children, onClickOpen }) => {
 			color: ${ colors.b800 };
 		}`;
 
-	return <Box onClick={onClickOpen} height='x40' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={clickable}><Box withTruncatedText w='none'>{children}</Box></Box>;
+	return <Box onClick={onClickOpen} pi='x24' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={announcementBar}><Box withTruncatedText w='none'>{children}</Box></Box>;
 };
 
 export default ({ announcement, announcementDetails }) => {
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal());
 	const handleClick = () => {
+		if (window.getSelection().toString() !== '') {
+			return;
+		}
+
 		announcementDetails ? announcementDetails() : setModal(<AnnouncementModal onClose={closeModal}>{announcement}</AnnouncementModal>);
 	};
 

From 9766319d64ad947c1a5ab67aeae2fff51090bc6a Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 21 Jan 2021 01:21:05 -0300
Subject: [PATCH 3/3] Update Announcement.js

---
 client/views/room/Announcement/Announcement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/room/Announcement/Announcement.js b/client/views/room/Announcement/Announcement.js
index bb969594c5153..3036c95d449c9 100644
--- a/client/views/room/Announcement/Announcement.js
+++ b/client/views/room/Announcement/Announcement.js
@@ -27,7 +27,7 @@ export const Announcement = ({ children, onClickOpen }) => {
 			color: ${ colors.b800 };
 		}`;
 
-	return <Box onClick={onClickOpen} pi='x24' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={announcementBar}><Box withTruncatedText w='none'>{children}</Box></Box>;
+	return <Box onClick={onClickOpen} height='x40' pi='x24' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={announcementBar}><Box withTruncatedText w='none'>{children}</Box></Box>;
 };
 
 export default ({ announcement, announcementDetails }) => {