From 8896f001248d2d98d6616555bf1e279183d767bf Mon Sep 17 00:00:00 2001
From: MrMeeb <mrmeeb@noreply.git.mrmeeb.stream>
Date: Mon, 26 Aug 2024 12:00:07 +0100
Subject: [PATCH] 4.49.5

---
 app/templates/dashboard/support.html                        | 2 +-
 .../emails/com/onboarding/welcome-proton-user.html          | 3 +--
 .../emails/com/onboarding/welcome-proton-user.txt.jinja2    | 3 +--
 app/templates/emails/com/welcome.html                       | 6 ++----
 app/templates/emails/com/welcome.txt                        | 4 +---
 app/templates/footer.html                                   | 2 +-
 app/templates/header.html                                   | 2 +-
 app/templates/menu.html                                     | 2 +-
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/templates/dashboard/support.html b/app/templates/dashboard/support.html
index d51f697..0d18ae8 100644
--- a/app/templates/dashboard/support.html
+++ b/app/templates/dashboard/support.html
@@ -18,7 +18,7 @@
           <br />
           For generic questions, i.e. not related to your account, we recommend to post the question on
           our
-          <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a> or <a href="https://forum.simplelogin.io/">our official forum</a>
+          <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a> or <a href="https://github.com/simple-login/app/discussions">forum</a>
           where our community can help answer the question
           and other people with the same question can find the answer there.
         </div>
diff --git a/app/templates/emails/com/onboarding/welcome-proton-user.html b/app/templates/emails/com/onboarding/welcome-proton-user.html
index b14e7c3..7da3069 100644
--- a/app/templates/emails/com/onboarding/welcome-proton-user.html
+++ b/app/templates/emails/com/onboarding/welcome-proton-user.html
@@ -43,8 +43,7 @@ Note, if you are a paying Proton Mail user, you automatically receive the premiu
 {% endcall %}
 
 {% call text() %}
-For any question or feedback, please join our <a href="https://forum.simplelogin.io/">official forum</a>.
-If you want to request a feature, please submit it on our <a href="https://github.com/simple-login/app/discussions">GitHub repo</a>.
+For any question or if you want to request a feature, please submit it on our <a href="https://github.com/simple-login/app/discussions">forum</a>.
 You can also join our
 <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a>
 or follow our
diff --git a/app/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2 b/app/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
index c10a783..07e621d 100644
--- a/app/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
+++ b/app/templates/emails/com/onboarding/welcome-proton-user.txt.jinja2
@@ -27,8 +27,7 @@ Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
 Edge: https://microsoftedge.microsoft.com/addons/detail/simpleloginreceive-sen/diacfpipniklenphgljfkmhinphjlfff
 Android: https://play.google.com/store/apps/details?id=io.simplelogin.android
 iOS: https://apps.apple.com/app/id1494359858
-Github repo: https://github.com/simple-login/app/discussions
-Official forum: https://forum.simplelogin.io/
+Forum: https://github.com/simple-login/app/discussions
 Reddit: https://www.reddit.com/r/Simplelogin/
 Twitter: https://twitter.com/simple_login
 
diff --git a/app/templates/emails/com/welcome.html b/app/templates/emails/com/welcome.html
index c298db5..73707b7 100644
--- a/app/templates/emails/com/welcome.html
+++ b/app/templates/emails/com/welcome.html
@@ -71,10 +71,8 @@ Please note that you can't create more than {{ MAX_NB_EMAIL_FREE_PLAN }} aliases
 
 {% endif %}
 {% call text() %}
-For any question or feedback,
-please join our <a href="https://forum.simplelogin.io/">official forum</a>.
-If you want to request a feature,
-please submit it on our <a href="https://github.com/simple-login/app/discussions">GitHub repo</a>.
+For any question or if you want to request a feature,
+please submit it on our <a href="https://github.com/simple-login/app/discussions">forum</a>.
 You can also join our
 <a href="https://www.reddit.com/r/Simplelogin/">Reddit</a>
 or follow our
diff --git a/app/templates/emails/com/welcome.txt b/app/templates/emails/com/welcome.txt
index fd4c8eb..82e6cb2 100644
--- a/app/templates/emails/com/welcome.txt
+++ b/app/templates/emails/com/welcome.txt
@@ -26,8 +26,6 @@ No worries: all aliases you create during this period will continue to work norm
 
 At any time, you can reach out to us by simply replying to this email.
 
-For any question or feedback, please join our official forum at https://forum.simplelogin.io/
-
-If you want to request a feature, please submit it on our GitHub repo at https://github.com/simple-login/app/discussions
+For any question or if you want to request a feature, please submit it on our 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/simplelogin
diff --git a/app/templates/footer.html b/app/templates/footer.html
index 0aa7c33..21753c3 100644
--- a/app/templates/footer.html
+++ b/app/templates/footer.html
@@ -93,7 +93,7 @@
           </li>
           <li>
             <a class="list-group-item text-white footer-item "
-               href="https://forum.simplelogin.io">Forum</a>
+               href="https://github.com/simple-login/app/discussions">Forum</a>
           </li>
         </ul>
       </div>
diff --git a/app/templates/header.html b/app/templates/header.html
index 4920c89..f6d72eb 100644
--- a/app/templates/header.html
+++ b/app/templates/header.html
@@ -91,7 +91,7 @@
                 </a>
               </div>
               <div class="dropdown-item">
-                <a href="https://forum.simplelogin.io"
+                <a href="https://github.com/simple-login/app/discussions"
                    target="_blank"
                    rel="noopener noreferrer">
                   Forum
diff --git a/app/templates/menu.html b/app/templates/menu.html
index 76a0a42..e8b1b28 100644
--- a/app/templates/menu.html
+++ b/app/templates/menu.html
@@ -107,7 +107,7 @@
             </a>
           </div>
           <div class="dropdown-item">
-            <a href="https://forum.simplelogin.io/"
+            <a href="https://github.com/simple-login/app/discussions"
                target="_blank"
                rel="noopener noreferrer">
               Forum