From ce364004acab7bc0756d4de48e2dce07a4fc0d41 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 16 Jun 2023 20:08:44 +0800 Subject: [PATCH 1/3] Use an iframe for recent emails to avoid them breaking CSS of the app --- packages/web/pages/settings/emails/recent.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/web/pages/settings/emails/recent.tsx b/packages/web/pages/settings/emails/recent.tsx index 98b33b937..0c3609667 100644 --- a/packages/web/pages/settings/emails/recent.tsx +++ b/packages/web/pages/settings/emails/recent.tsx @@ -133,9 +133,16 @@ const ViewRecentEmailModal = ( height: '100%', fontSize: '12px', overflowY: 'scroll', + iframe: { + width: '100%', + height: '100%', + display: 'block', + border: 'none', + }, }} - dangerouslySetInnerHTML={{ __html: props.recentEmail.html }} - > + > + + )} From 3eb15b0a988230cea29ae15fdeeb6d28ec2bcd1b Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 16 Jun 2023 20:08:56 +0800 Subject: [PATCH 2/3] Add youtube to CSP --- packages/web/next.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/next.config.js b/packages/web/next.config.js index aa52c8144..da6ad160d 100644 --- a/packages/web/next.config.js +++ b/packages/web/next.config.js @@ -6,7 +6,7 @@ const ContentSecurityPolicy = ` font-src 'self' data: cdn.jsdelivr.net; form-action 'self' ${process.env.NEXT_PUBLIC_SERVER_BASE_URL}; frame-ancestors 'none'; - frame-src accounts.google.com platform.twitter.com www.youtube-nocookie.com; + frame-src self accounts.google.com platform.twitter.com www.youtube.com www.youtube-nocookie.com; manifest-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' accounts.google.com widget.intercom.io js.intercomcdn.com platform.twitter.com cdnjs.cloudflare.com cdn.jsdelivr.net cdn.segment.com; style-src 'self' 'unsafe-inline' accounts.google.com cdnjs.cloudflare.com; From aa94331664d34c80dbe585bdcf1c557cc36d2f49 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 16 Jun 2023 20:32:43 +0800 Subject: [PATCH 3/3] Set iframe height --- packages/web/pages/settings/emails/recent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/pages/settings/emails/recent.tsx b/packages/web/pages/settings/emails/recent.tsx index 0c3609667..3dd1107b4 100644 --- a/packages/web/pages/settings/emails/recent.tsx +++ b/packages/web/pages/settings/emails/recent.tsx @@ -113,7 +113,7 @@ const ViewRecentEmailModal = ( ;(document.activeElement as HTMLElement).blur() }} > - + {props.display == 'text' ? (