Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

init commit for fxa rebrand to mozilla accounts #415

Merged
merged 4 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions client/components/modals/SubscriptionModal/README.md
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 1 addition & 7 deletions client/components/navigation/MainNav/MainNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading