Merge branch 'dev_260106_edit_text' of Web/contentCooper into master

src/views/messages/messages.tsx

@@ -27,6 +27,12 @@ const Messages = () => {
 	const [total, setTotal] = useState(0)
 	const [loading, setLoading] = useState(true)
 
+	const convertNewlines = (text: string) => {
+		return text
+			.replace(/\r\n/g, '<br/>')
+			.replace(/\n/g, '<br/>')
+	}
+
 	useEffect(() => {
 		getMessages()
 	}, [page])
@@ -81,7 +87,7 @@ const Messages = () => {
 								<div className='w-2 h-2'></div> }
 							<div className='flex-1 py-1 flex flex-col gap-2'>
 								<div className='text-l font-bold text-gray-800'>{message.title}</div>
-								<div className='text-sm text-gray-500'>{message.msg}</div>
+								<div className='text-sm text-gray-500' dangerouslySetInnerHTML={{ __html: convertNewlines(message.msg) }}></div>
 							</div>
 							<div className='text-sm text-gray-500'>{message.createTimestamp ? new Date(message.createTimestamp).toLocaleString() : ''}</div>
 						</div>