From 35d473b3a0ebfdedb092ce3b6012de712e088d4c Mon Sep 17 00:00:00 2001
From: Julien Tant <785518+JulienTant@users.noreply.github.com>
Date: Thu, 9 Jun 2022 16:01:24 -0700
Subject: [PATCH] [MM-44995] remove reference to 30 days trial in welcome email
 (#20425)

---
 app/email/email.go      |  2 +-
 app/email/email_test.go | 38 ++++++++++++++++++++++++++++++++++++++
 i18n/en.json            |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/app/email/email.go b/app/email/email.go
index a5f22e73d5..3fef37aff9 100644
--- a/app/email/email.go
+++ b/app/email/email.go
@@ -315,7 +315,7 @@ func (es *Service) SendCloudWelcomeEmail(userEmail, locale, teamInviteID, workSp
 	subject := T("api.templates.cloud_welcome_email.subject")
 
 	data := es.NewEmailTemplateData(locale)
-	data.Props["Title"] = T("api.templates.cloud_welcome_email.title", map[string]interface{}{"WorkSpace": workSpaceName})
+	data.Props["Title"] = T("api.templates.cloud_welcome_email.title")
 	data.Props["SubTitle"] = T("api.templates.cloud_welcome_email.subtitle")
 	data.Props["SubTitleInfo"] = T("api.templates.cloud_welcome_email.subtitle_info")
 	data.Props["Info"] = T("api.templates.cloud_welcome_email.info")
diff --git a/app/email/email_test.go b/app/email/email_test.go
index 2d6d722fb5..b74636257b 100644
--- a/app/email/email_test.go
+++ b/app/email/email_test.go
@@ -301,6 +301,44 @@ func TestSendCloudUpgradedEmail(t *testing.T) {
 	})
 }
 
+func TestSendCloudWelcomeEmail(t *testing.T) {
+	th := Setup(t).InitBasic()
+	defer th.TearDown()
+	th.ConfigureInbucketMail()
+
+	emailTo := "testclouduser@example.com"
+
+	t.Run("TestSendCloudWelcomeEmail", func(t *testing.T) {
+		verifyMailbox := func(t *testing.T) {
+			t.Helper()
+
+			var resultsMailbox mail.JSONMessageHeaderInbucket
+			err2 := mail.RetryInbucket(5, func() error {
+				var err error
+				resultsMailbox, err = mail.GetMailBox(emailTo)
+				return err
+			})
+			if err2 != nil {
+				t.Skipf("No email was received, maybe due load on the server: %v", err2)
+			}
+
+			require.Len(t, resultsMailbox, 1)
+			require.Contains(t, resultsMailbox[0].To[0], emailTo, "Wrong To: recipient")
+			resultsEmail, err := mail.GetMessageFromMailbox(emailTo, resultsMailbox[0].ID)
+			require.NoError(t, err, "Could not get message from mailbox")
+			require.Contains(t, resultsEmail.Subject, "Congratulations!", "Wrong subject message %s", resultsEmail.Subject)
+			require.Contains(t, resultsEmail.Body.Text, "Your workspace is ready to go!", "Wrong body %s", resultsEmail.Body.Text)
+
+		}
+		mail.DeleteMailBox(emailTo)
+
+		err := th.service.SendCloudWelcomeEmail(emailTo, th.BasicUser.Locale, "inviteID", "SomeName", "example.com", "https://example.com")
+		require.NoError(t, err)
+
+		verifyMailbox(t)
+	})
+}
+
 func TestMailServiceConfig(t *testing.T) {
 	configuredReplyTo := "feedbackexample@test.com"
 	customReplyTo := "customreplyto@test.com"
diff --git a/i18n/en.json b/i18n/en.json
index e2fc1c52bb..cfaea23aea 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3237,7 +3237,7 @@
   },
   {
     "id": "api.templates.cloud_welcome_email.title",
-    "translation": "Your 30-day trial of the {{.WorkSpace}} workspace is ready to go!"
+    "translation": "Your workspace is ready to go!"
   },
   {
     "id": "api.templates.copyright",