From d59cee0bcc7f6a1f8483d4916a8c26e1ada2de67 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 23 Mar 2021 18:47:16 +0100
Subject: [PATCH] improve welcome email

---
 app/config.py                     |  2 --
 app/email_utils.py                |  5 ++---
 templates/emails/com/welcome.html | 17 +++--------------
 templates/emails/com/welcome.txt  |  9 ++++-----
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/app/config.py b/app/config.py
index 3866eff6..eb08c0e0 100644
--- a/app/config.py
+++ b/app/config.py
@@ -369,5 +369,3 @@ try:
     COINBASE_YEARLY_PRICE = float(os.environ["COINBASE_YEARLY_PRICE"])
 except Exception:
     COINBASE_YEARLY_PRICE = 30.00
-
-REDDIT_URL = "https://www.reddit.com/r/Simplelogin/"
diff --git a/app/email_utils.py b/app/email_utils.py
index 40a418f6..e4737776 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -39,7 +39,6 @@ from app.config import (
     EMAIL_DOMAIN,
     ALERT_DIRECTORY_DISABLED_ALIAS_CREATION,
     TRANSACTIONAL_BOUNCE_EMAIL,
-    REDDIT_URL,
     ALERT_SPF,
     POSTFIX_PORT_FORWARD,
 )
@@ -90,8 +89,8 @@ def send_welcome_email(user):
     send_email(
         to_email,
         f"Welcome to SimpleLogin",
-        render("com/welcome.txt", user=user, alias=alias, reddit_url=REDDIT_URL),
-        render("com/welcome.html", user=user, alias=alias, reddit_url=REDDIT_URL),
+        render("com/welcome.txt", user=user, alias=alias),
+        render("com/welcome.html", user=user, alias=alias),
         unsubscribe_link,
         via_email,
     )
diff --git a/templates/emails/com/welcome.html b/templates/emails/com/welcome.html
index 34389b54..11578ce0 100644
--- a/templates/emails/com/welcome.html
+++ b/templates/emails/com/welcome.html
@@ -19,11 +19,6 @@
     {% endcall %}
   {% endif %}
 
-  {% call text() %}
-    To better secure your account, we recommend enabling Multi-Factor Authentication (MFA) or WebAuthn (Yubikey) on your
-    <a href="{{ URL + '/dashboard/setting/#totp' }}">Setting page</a>.
-  {% endcall %}
-
   {% call text() %}
     If you are using Firefox or a Chromium-browser like Chrome, Edge, Brave, you can
     install our <a href="https://addons.mozilla.org/firefox/addon/simplelogin/">Firefox add-on</a>
@@ -39,7 +34,7 @@
     SimpleLogin is also available on
     <a href="https://play.google.com/store/apps/details?id=io.simplelogin.android">Android</a> and
     <a href="https://apps.apple.com/app/id1494359858">iOS</a>
-    so you can easily create new aliases on the go.
+    so you can manage your aliases on the go.
   {% endcall %}
 
   {% if user.in_trial() and user.trial_end %}
@@ -53,14 +48,8 @@
   {% endif %}
 
   {% call text() %}
-    Feel free to join our Reddit to ask any question or to have updates about our latest features. <br>
-    If you don't have a Reddit account, this is an occasion to create a new alias 😉.
-  {% endcall %}
-
-  {{ render_button("Join SimpleLogin on Reddit", reddit_url) }}
-
-  {% call text() %}
-    SimpleLogin Team.
+    For any question, feedback or feature request, please join our <a href="https://github.com/simple-login/app/discussions">GitHub forum</a>.
+    You can also join our <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a> or follow our <a href="https://twitter.com/simple_login">Twitter</a>.
   {% endcall %}
 
 {% endblock %}
diff --git a/templates/emails/com/welcome.txt b/templates/emails/com/welcome.txt
index 0e9fe3e5..9c2fc4ee 100644
--- a/templates/emails/com/welcome.txt
+++ b/templates/emails/com/welcome.txt
@@ -24,9 +24,8 @@ without any limit during 7 days (the "trial period").
 No worries: all aliases you create during this period will continue to work normally even if you don't upgrade.
 {% endif %}
 
-At any time, you can reach out to us by:
-- Simply replying to this email
-- On Twitter at https://twitter.com/simple_login
-- On Reddit at https://www.reddit.com/r/Simplelogin/
+At any time, you can reach out to us by simply replying to this email.
 
-SimpleLogin Team.
\ No newline at end of file
+For any question, feedback or feature request, please join our GitHub forum at https://github.com/simple-login/app/discussions
+
+You can also join our Reddit at https://www.reddit.com/r/Simplelogin/ follow our Twitter at https://twitter.com/simple_login