put browser extension onboarding email to the welcome email

app/models.py

@@ -19,7 +19,6 @@ from app.config import (
     AVATAR_URL_EXPIRATION,
     JOB_ONBOARDING_1,
     JOB_ONBOARDING_2,
-    JOB_ONBOARDING_3,
     JOB_ONBOARDING_4,
     LANDING_PAGE_URL,
     FIRST_ALIAS_DOMAIN,
@@ -286,15 +285,10 @@ class User(db.Model, ModelMixin, UserMixin):
             payload={"user_id": user.id},
             run_at=arrow.now().shift(days=2),
         )
-        Job.create(
-            name=JOB_ONBOARDING_3,
-            payload={"user_id": user.id},
-            run_at=arrow.now().shift(days=3),
-        )
         Job.create(
             name=JOB_ONBOARDING_4,
             payload={"user_id": user.id},
-            run_at=arrow.now().shift(days=4),
+            run_at=arrow.now().shift(days=3),
         )
         db.session.flush()
 

job_runner.py

@@ -12,7 +12,6 @@ from app import s3
 from app.config import (
     JOB_ONBOARDING_1,
     JOB_ONBOARDING_2,
-    JOB_ONBOARDING_3,
     JOB_ONBOARDING_4,
     JOB_BATCH_IMPORT,
 )
@@ -200,18 +199,6 @@ if __name__ == "__main__":
                     if user and user.notification and user.activated:
                         LOG.d("send onboarding mailbox email to user %s", user)
                         onboarding_mailbox(user)
-                elif job.name == JOB_ONBOARDING_3:
-                    user_id = job.payload.get("user_id")
-                    user = User.get(user_id)
-
-                    # user might delete their account in the meantime
-                    # or disable the notification
-                    if user and user.notification and user.activated:
-                        LOG.d(
-                            "send onboarding browser-extension email to user %s", user
-                        )
-                        onboarding_browser_extension(user)
-
                 elif job.name == JOB_ONBOARDING_4:
                     user_id = job.payload.get("user_id")
                     user = User.get(user_id)

templates/emails/com/welcome.html

@@ -14,23 +14,36 @@
   {% if alias %}
     {% call text() %}
       This is the first email you receive via your <b>first alias</b> <em>{{ alias }}</em>.
-      It is automatically created when you signed up on SimpleLogin.
     {% endcall %}
 
     {% call text() %}
-      This alias is for receiving our news, feature announcements or tips -
+      This alias is automatically created for receiving SimpleLogin news and tips -
       feel free to <a href="{{ URL + '/dashboard/setting#notification' }}">disable</a> it if you don't need any of
       these.
     {% endcall %}
   {% endif %}
 
   {% call text() %}
-    You can reach out to us by: <br>
-    <ul>
-      <li>Simply replying to this email </li>
-      <li>On <a href="https://twitter.com/simple_login">Twitter</a> </li>
-      <li>On <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a></li>
-    </ul>
+    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>
+    or <a href="https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn">Chrome extension</a>
+    to create aliases in one click (literally).
+  {% endcall %}
+
+  {% call text() %}
+    <img src="https://simplelogin.io/images/one-click-alias.gif" style="max-width: 80%; margin: auto; border: 1px solid">
+  {% endcall %}
+
+  {% call text() %}
+    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 create new aliases on the fly.
   {% endcall %}
 
   {% if user.in_trial() and user.trial_end %}
@@ -44,12 +57,15 @@
   {% endif %}
 
   {% call text() %}
-    Please don't hesitate to talk around you about the benefits of using <b>email alias</b>
-    to protect your personal email address and your privacy. <br>
+    At any time, you can reach out to us by: <br>
+    <ul>
+      <li>Simply replying to this email </li>
+      <li>On <a href="https://twitter.com/simple_login">Twitter</a> </li>
+      <li>On <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a></li>
+    </ul>
   {% endcall %}
 
   {% call text() %}
-    Let's make spammers and Big Tech's life harder.<br/>
     SimpleLogin Team.
   {% endcall %}
 

templates/emails/com/welcome.txt

@@ -1,23 +1,32 @@
 Hi {{name}}
 
-My name is Son. I’m the founder of SimpleLogin and I wanted to be the first to welcome you on board.
-
-To better secure your account, I recommend enabling Multi-Factor Authentication (MFA) on your setting page at
-{{URL}}/dashboard/setting
+{% if alias %}
+  This is the first email you receive via your first alias {{ alias }}.
+  This alias is automatically created for receiving SimpleLogin news and tips -
+  feel free to disable it on {{URL}}/dashboard/setting#notification
+  if you don't need any of  these.
+{% endif %}
 
-If you have any feedback or improvement ideas please let me know by simply replying to this email. Yes, this email is not sent from a no-reply address.
+To better secure your account, we recommend enabling Multi-Factor Authentication (MFA) or WebAuthn (Yubikey)
+on your setting page at {{URL}}/dashboard/setting
 
-To be informed of SimpleLogin latest features, you can check out our Twitter at https://twitter.com/simple_login or Reddit at https://www.reddit.com/r/Simplelogin/
 
-{% if user.in_trial() %}
-You can use all premium features like custom domain or alias directory during the trial period.
-Your trial will end {{ user.trial_end.humanize() }}.
-All aliases you create during the trial will continue to work normally when the trial ends.
-{% endif %}
+If you are using Firefox or a Chromium-browser like Chrome, Edge, Brave, you can
+install our Firefox add-on or Chrome extension
+to create aliases in one click (literally).
 
-In the next coming days, you are going to receive some onboarding emails to quickly present some SimpleLogin features. If you don't want to receive these emails, you can disable them in your notification settings on {{URL}}/dashboard/setting#notification.
+Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
+Chrome: https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn
 
+{% if user.in_trial() and user.trial_end %}
+When you signed up, you can use all premium features like custom domain, alias directory, mailbox, PGP
+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/
 
-Thanks.
-Son.
+SimpleLogin Team.