From bffb02a216d1289f4f526c0d18d653624e5896b8 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Tue, 27 Oct 2020 11:54:04 +0100
Subject: [PATCH] Merge pull request #3271 from
 overleaf/msm-move-email-footer-bottom-layout

Move customFooter to the bottom of the email template

GitOrigin-RevId: a6c4bad241520f6814d6a63fa1fdc77bb6c56368
---
 .../web/app/src/Features/Email/EmailBuilder.js   | 16 +++++++++-------
 .../Email/Layouts/BaseWithHeaderEmailLayout.js   |  8 +++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/services/web/app/src/Features/Email/EmailBuilder.js b/services/web/app/src/Features/Email/EmailBuilder.js
index c1dadbc8b1..e0c3b1102f 100644
--- a/services/web/app/src/Features/Email/EmailBuilder.js
+++ b/services/web/app/src/Features/Email/EmailBuilder.js
@@ -29,6 +29,15 @@ function _emailBodyPlainText(content, opts, ctaEmail) {
   emailBody += `\r\n\r\n`
   emailBody += `Regards,\r\nThe ${settings.appName} Team - ${settings.siteUrl}`
 
+  if (
+    settings.email &&
+    settings.email.template &&
+    settings.email.template.customFooter
+  ) {
+    emailBody += `\r\n\r\n`
+    emailBody += settings.email.template.customFooter
+  }
+
   return emailBody
 }
 
@@ -114,13 +123,6 @@ function buildEmail(templateName, opts) {
   const template = templates[templateName]
   opts.siteUrl = settings.siteUrl
   opts.body = template.compiledTemplate(opts)
-  if (
-    settings.email &&
-    settings.email.template &&
-    settings.email.template.customFooter
-  ) {
-    opts.body += settings.email.template.customFooter
-  }
   return {
     subject: template.subject(opts),
     html: template.layout(opts),
diff --git a/services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js b/services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js
index 7c4b41cdb4..cfae30c17b 100644
--- a/services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js
+++ b/services/web/app/src/Features/Email/Layouts/BaseWithHeaderEmailLayout.js
@@ -364,7 +364,13 @@ module.exports = _.template(`\
 							<table class="wrapper secondary" align="center" style="background: #E4E8EE; border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tr style="padding: 0; text-align: left; vertical-align: top;"><td class="wrapper-inner" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; hyphens: auto; line-height: 1.3; margin: 0; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;">
 								<table class="spacer" style="border-collapse: collapse; border-spacing: 0; padding: 0; text-align: left; vertical-align: top; width: 100%;"><tbody><tr style="padding: 0; text-align: left; vertical-align: top;"><td height="10px" style="-moz-hyphens: auto; -webkit-hyphens: auto; Margin: 0; border-collapse: collapse !important; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 10px; font-weight: normal; hyphens: auto; line-height: 10px; margin: 0; mso-line-height-rule: exactly; padding: 0; text-align: left; vertical-align: top; word-wrap: break-word;">&#xA0;</td></tr></tbody></table>
 								<p style="Margin: 0; Margin-bottom: 10px; color: #5D6879; font-family: Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.3; margin: 0; margin-bottom: 10px; padding: 0; text-align: left;"><small style="color: #5D6879; font-size: 80%;">
-									${settings.appName} &bull; <a href="${
+									${
+                    settings.email &&
+                    settings.email.template &&
+                    settings.email.template.customFooter
+                      ? `${settings.email.template.customFooter}<br>`
+                      : ''
+                  }${settings.appName} &bull; <a href="${
   settings.siteUrl
 }" style="Margin: 0; color: #0F7A06; font-family: Helvetica, Arial, sans-serif; font-weight: normal; line-height: 1.3; margin: 0; padding: 0; text-align: left; text-decoration: none;">${
   settings.siteUrl