Mike/removedomainwarning

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"

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

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 account"
             onClick={onManageAccountClick}
             category="primary_solid"
             classProp="mb-24-mb"
-            text="Continue to Firefox Account"
+            text="Continue to Account"
             target="_blank"
           />
         </div>

client/components/modules/hubs/HubFormCard/HubFormCard.tsx

@@ -238,7 +238,7 @@ const HubFormCard = ({ hub: _hub, classProp = '' }: HubFormCardPropsT) => {
           <h1 className={styles.title}>Hub Details</h1>
         </div>
 
-        <Warning />
+        {/* <Warning /> */}
 
         <form onSubmit={formik.handleSubmit}>
           <div className={styles.form_contents}>

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 account."
           />
         </div>
       </section>

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 Firefox Account
+          Manage Your Account
         </button>
 
         <button