From 7b30412d066c446c77e2a00a9b9435b7550570fc Mon Sep 17 00:00:00 2001
From: Michael Morran <mmorran@mozilla.com>
Date: Fri, 29 Sep 2023 13:21:15 -0500
Subject: [PATCH 1/4] init commit for fxa rebrand to mozilla accounts

---
 README.md                                                   | 2 +-
 client/README.md                                            | 2 +-
 .../modals/SubscriptionModal/SubscriptionModal.tsx          | 6 +++---
 .../modules/side-panel/SupportGrid/SupportGrid.tsx          | 2 +-
 client/components/navigation/MainNav/MainNav.tsx            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1bf998a2..7b2e7b79 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,6 @@ Run `mix dash` and `mix help dash.<task_name>` for more info.
 - CORS_ORIGINS - Comma separated list of origins to allow CORS requests.
 - DASHBOARD_ACCESS_KEY - Access key for communicating with reticulum. Should be a strong secret that is shared with reticulum.
 - FXA_JWK_STRING - Used to verify token in FxA webhook, the payload from the Subplat/FxA endpoint with the live public keys is stringified by Jason.encode!()
-- FXA_SERVER - Firefox Accounts server used for account management links. e.g. "accounts.firefox.com"
+- FXA_SERVER - Mozilla Accounts (previously Firefox Accounts) server used for account management links. e.g. "accounts.firefox.com"
 - SECRET_KEY_BASE - Base secret key. This should be a strong cryptographcially generated secret.
 - PLANS - Used in getting currency and amount, MUST BE IN THIS FORMAT: "plan_id1,USD,10;plan_id2,EUR,20"
diff --git a/client/README.md b/client/README.md
index 76033bc7..d47e5c84 100644
--- a/client/README.md
+++ b/client/README.md
@@ -42,7 +42,7 @@ See [/README.md](/README.md) 'README' in root project.
 
 - PUBLIC_API_SERVER - public server url ( todo more info here )
 - AUTH_SERVER - Server used for login links. e.g. "auth.myhubs.net"
-- FXA_SERVER - Firefox Accounts server used for account management links. e.g. "accounts.firefox.com"
+- FXA_SERVER - Mozilla Accounts (previously Firefox Accounts) server used for account management links. e.g. "accounts.firefox.com"
 - MARKETING_PAGE_URL - URL to the marketing page that we use as logged out homepage for the Dashboard e.g. "https://marketing.page"
 - FXA_PAYMENT_URL - subscription payment url
 - PRODUCT_ID - subscription payment ID
diff --git a/client/components/modals/SubscriptionModal/SubscriptionModal.tsx b/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
index d9119b89..7c33e443 100644
--- a/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
+++ b/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
@@ -60,7 +60,7 @@ const SubscriptionModal = ({
         </ul>
 
         <p className="body-md">
-          If you are happy to proceed, please continue to your Firefox Accounts
+          If you are happy to proceed, please continue to your Mozilla Accounts
           page where you can finish cancelling your subscription.
         </p>
       </div>
@@ -76,11 +76,11 @@ const SubscriptionModal = ({
             onClick={handleCloseClick}
           />
           <Button
-            label="continue to firefox account"
+            label="continue to mozilla account"
             onClick={onManageAccountClick}
             category="primary_solid"
             classProp="mb-24-mb"
-            text="Continue to Firefox Account"
+            text="Continue to Mozilla Account"
             target="_blank"
           />
         </div>
diff --git a/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx b/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
index 31b0df6c..005aea4c 100644
--- a/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
+++ b/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
@@ -36,7 +36,7 @@ const SupportGrid = () => {
             title="Help"
             image={questionCircle}
             href="https://support.mozilla.org/en-US/products/hubs "
-            body="Get help managing your subscription and firefox account."
+            body="Get help managing your subscription and mozilla account."
           />
         </div>
       </section>
diff --git a/client/components/navigation/MainNav/MainNav.tsx b/client/components/navigation/MainNav/MainNav.tsx
index f8c29af2..3d295ecf 100644
--- a/client/components/navigation/MainNav/MainNav.tsx
+++ b/client/components/navigation/MainNav/MainNav.tsx
@@ -82,7 +82,7 @@ const MainNav = ({
             name="fx-account"
             size={24}
           />
-          Manage Your Firefox Account
+          Manage Your Mozilla Account
         </button>
 
         <button

From fc95f48d6aec951e823992c8c7efa2bede6a2cd3 Mon Sep 17 00:00:00 2001
From: Michael Morran <mmorran@mozilla.com>
Date: Fri, 29 Sep 2023 13:30:05 -0500
Subject: [PATCH 2/4] remove firefox logo from button and remove unnecessary
 mozilla

---
 .../modals/SubscriptionModal/SubscriptionModal.tsx        | 4 ++--
 client/components/navigation/MainNav/MainNav.tsx          | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/client/components/modals/SubscriptionModal/SubscriptionModal.tsx b/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
index 7c33e443..925a7de3 100644
--- a/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
+++ b/client/components/modals/SubscriptionModal/SubscriptionModal.tsx
@@ -76,11 +76,11 @@ const SubscriptionModal = ({
             onClick={handleCloseClick}
           />
           <Button
-            label="continue to mozilla account"
+            label="continue to account"
             onClick={onManageAccountClick}
             category="primary_solid"
             classProp="mb-24-mb"
-            text="Continue to Mozilla Account"
+            text="Continue to Account"
             target="_blank"
           />
         </div>
diff --git a/client/components/navigation/MainNav/MainNav.tsx b/client/components/navigation/MainNav/MainNav.tsx
index 3d295ecf..4787408b 100644
--- a/client/components/navigation/MainNav/MainNav.tsx
+++ b/client/components/navigation/MainNav/MainNav.tsx
@@ -76,13 +76,7 @@ const MainNav = ({
             onManageAccountClick();
           }}
         >
-          <HubIcon
-            classProp="mr-10"
-            color="currentColor"
-            name="fx-account"
-            size={24}
-          />
-          Manage Your Mozilla Account
+          Manage Your Account
         </button>
 
         <button

From 81239b9bc86eef5b03eb64412ca27e6ae922baf3 Mon Sep 17 00:00:00 2001
From: Michael Morran <mmorran@mozilla.com>
Date: Mon, 2 Oct 2023 08:32:54 -0500
Subject: [PATCH 3/4] finishing generic

---
 .../components/modules/side-panel/SupportGrid/SupportGrid.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx b/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
index 005aea4c..0e8fffe8 100644
--- a/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
+++ b/client/components/modules/side-panel/SupportGrid/SupportGrid.tsx
@@ -36,7 +36,7 @@ const SupportGrid = () => {
             title="Help"
             image={questionCircle}
             href="https://support.mozilla.org/en-US/products/hubs "
-            body="Get help managing your subscription and mozilla account."
+            body="Get help managing your subscription and account."
           />
         </div>
       </section>

From 8b70f5ce85930d2c80d9a88916e99085cdbd57ef Mon Sep 17 00:00:00 2001
From: Nick Grato <nickgrato@ngrato-27545.local>
Date: Tue, 24 Oct 2023 10:50:26 -0700
Subject: [PATCH 4/4] fixing readme

---
 client/components/modals/SubscriptionModal/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/components/modals/SubscriptionModal/README.md b/client/components/modals/SubscriptionModal/README.md
index ceb5dae6..8c59101e 100644
--- a/client/components/modals/SubscriptionModal/README.md
+++ b/client/components/modals/SubscriptionModal/README.md
@@ -1,3 +1,4 @@
-This component has been taken out for the time being as a confirmation to cancel you plaan. Leaving in for now if
-we find our selves using it again. Feel free to deleting if it's been a substantial amount of time
+This component has been taken out for the time being as a confirmation to cancel your plan. I'm leaving it in for now incase
+we find our selves using it again. Feel free to delete it if it's been a substantial amount of time.
+
 -NG 5/11/23