From 08492330057f50c636b6bd801226290d906e421b Mon Sep 17 00:00:00 2001 From: Florian Dieminger <me@fiji-flo.de> Date: Thu, 21 Sep 2023 15:07:19 +0200 Subject: [PATCH 1/2] chore(plus): prepare account rebranding --- .github/workflows/prod-build.yml | 6 +++--- .github/workflows/stage-build.yml | 4 ++-- client/src/env.ts | 2 +- client/src/settings/manage.tsx | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml index 5622ae727fa0..66f3a738677c 100644 --- a/.github/workflows/prod-build.yml +++ b/.github/workflows/prod-build.yml @@ -207,9 +207,9 @@ jobs: # Firefox Accounts and SubPlat settings REACT_APP_FXA_SIGNIN_URL: /users/fxa/login/authenticate/ - REACT_APP_FXA_SETTINGS_URL: https://accounts.firefox.com/settings/ - REACT_APP_MDN_PLUS_SUBSCRIBE_URL: https://accounts.firefox.com/subscriptions/products/prod_LKvr8fYGbBxcaZ - REACT_APP_FXA_MANAGE_SUBSCRIPTIONS_URL: https://subscriptions.firefox.com/subscriptions/ + REACT_APP_FXA_SETTINGS_URL: https://accounts.firefox.com/settings/?brand=mozilla + REACT_APP_MDN_PLUS_SUBSCRIBE_URL: https://accounts.firefox.com/subscriptions/products/prod_LKvr8fYGbBxcaZ?brand=mozilla + REACT_APP_FXA_MANAGE_SUBSCRIPTIONS_URL: https://subscriptions.firefox.com/subscriptions/?brand=mozilla REACT_APP_MDN_PLUS_5M_PLAN: price_1KeG02JNcmPzuWtR1oBrw8o6 REACT_APP_MDN_PLUS_5Y_PLAN: price_1KeG02JNcmPzuWtRslZijhQu diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml index e8f8b3855c58..1e9d8ed8b2b5 100644 --- a/.github/workflows/stage-build.yml +++ b/.github/workflows/stage-build.yml @@ -203,8 +203,8 @@ jobs: # Firefox Accounts and SubPlat settings REACT_APP_FXA_SIGNIN_URL: /users/fxa/login/authenticate/ - REACT_APP_FXA_SETTINGS_URL: https://accounts.stage.mozaws.net/settings/ - REACT_APP_MDN_PLUS_SUBSCRIBE_URL: https://accounts.stage.mozaws.net/subscriptions/products/prod_Jtbg9tyGyLRuB0 + REACT_APP_FXA_SETTINGS_URL: https://accounts.stage.mozaws.net/settings/?brand=mozilla + REACT_APP_MDN_PLUS_SUBSCRIBE_URL: https://accounts.stage.mozaws.net/subscriptions/products/prod_Jtbg9tyGyLRuB0?brand=mozilla REACT_APP_MDN_PLUS_5M_PLAN: price_1JFoTYKb9q6OnNsLalexa03p REACT_APP_MDN_PLUS_5Y_PLAN: price_1JpIPwKb9q6OnNsLJLsIqMp7 REACT_APP_MDN_PLUS_10M_PLAN: price_1K6X7gKb9q6OnNsLi44HdLcC diff --git a/client/src/env.ts b/client/src/env.ts index 9d4b51b399f0..2c35966521e7 100644 --- a/client/src/env.ts +++ b/client/src/env.ts @@ -74,7 +74,7 @@ export const FXA_SIGNIN_URL = process.env.REACT_APP_FXA_SIGNIN_URL || ""; export const FXA_SETTINGS_URL = process.env.REACT_APP_FXA_SETTINGS_URL || ""; export const FXA_MANAGE_SUBSCRIPTIONS_URL = process.env.REACT_APP_FXA_MANAGE_SUBSCRIPTIONS_URL || - "https://accounts.stage.mozaws.net/subscriptions/"; + "https://accounts.stage.mozaws.net/subscriptions/?brand=mozilla"; export const DEFAULT_GEO_COUNTRY = process.env.REACT_APP_DEFAULT_GEO_COUNTRY || "United States"; diff --git a/client/src/settings/manage.tsx b/client/src/settings/manage.tsx index 2e4ac9aa3b8d..63af88e156ba 100644 --- a/client/src/settings/manage.tsx +++ b/client/src/settings/manage.tsx @@ -69,15 +69,15 @@ export function Manage() { )} <li> - <h3>Firefox account</h3> - <span>Manage your Firefox account</span> + <h3>Your account</h3> + <span>Manage your account</span> <a rel="noreferrer noopener" target="_blank" href={FXA_SETTINGS_URL} className="manage external" > - Firefox account + Your Account </a> </li> {user?.isSubscriber && ( From 4af47f3148fed5742894db7965a8995a80092cda Mon Sep 17 00:00:00 2001 From: Claas Augner <495429+caugner@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:41:20 +0200 Subject: [PATCH 2/2] chore(settings): replace "Your account" with "Account" --- client/src/settings/manage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/settings/manage.tsx b/client/src/settings/manage.tsx index 63af88e156ba..b97d49c03e4f 100644 --- a/client/src/settings/manage.tsx +++ b/client/src/settings/manage.tsx @@ -69,7 +69,7 @@ export function Manage() { )} <li> - <h3>Your account</h3> + <h3>Account</h3> <span>Manage your account</span> <a rel="noreferrer noopener" @@ -77,7 +77,7 @@ export function Manage() { href={FXA_SETTINGS_URL} className="manage external" > - Your Account + Account </a> </li> {user?.isSubscriber && (