Skip to content

Commit

Permalink
BETA - Updating welcome message (#16489)
Browse files Browse the repository at this point in the history
  • Loading branch information
darkwing authored Nov 16, 2022
1 parent a523636 commit d10e6a4
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 22 deletions.
22 changes: 16 additions & 6 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 28 additions & 3 deletions ui/pages/first-time-flow/welcome/beta-welcome-footer.component.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
import React from 'react';
import { useI18nContext } from '../../../hooks/useI18nContext';

import Typography from '../../../components/ui/typography/typography';
import {
TEXT_ALIGN,
FONT_WEIGHT,
} from '../../../helpers/constants/design-system';

const BetaWelcomeFooter = () => {
const t = useI18nContext();

return (
<>
<div className="welcome-page__header">{t('betaWelcome')}</div>
<div className="welcome-page__description">
<p>{t('betaMetamaskDescription')}</p>
<p>
<Typography align={TEXT_ALIGN.CENTER} marginBottom={6}>
{t('betaMetamaskDescription')}
</Typography>
<Typography
align={TEXT_ALIGN.CENTER}
marginBottom={6}
fontWeight={FONT_WEIGHT.BOLD}
>
{t('betaMetamaskDescriptionDisclaimerHeading')}
</Typography>
<Typography align={TEXT_ALIGN.CENTER} marginBottom={6}>
{t('betaMetamaskDescriptionExplanation', [
<a href="https://metamask.io/terms.html" key="terms-link">
{t('betaMetamaskDescriptionExplanationTermsLinkText')}
Expand All @@ -18,7 +33,17 @@ const BetaWelcomeFooter = () => {
{t('betaMetamaskDescriptionExplanationBetaTermsLinkText')}
</a>,
])}
</p>
</Typography>
<Typography align={TEXT_ALIGN.CENTER}>
{t('betaMetamaskDescriptionExplanation2', [
<a href="https://metamask.io/terms.html" key="terms-link">
{t('betaMetamaskDescriptionExplanationTermsLinkText')}
</a>,
<a href="https://metamask.io/beta-terms.html" key="beta-terms-link">
{t('betaMetamaskDescriptionExplanation2BetaTermsLinkText')}
</a>,
])}
</Typography>
</div>
</>
);
Expand Down
9 changes: 0 additions & 9 deletions ui/pages/first-time-flow/welcome/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@
}

&__description {
text-align: center;

p {
@include Paragraph;

text-align: start;
margin-bottom: 22px;
}

a {
color: var(--color-primary-default);
}
Expand Down
12 changes: 8 additions & 4 deletions ui/pages/first-time-flow/welcome/welcome-footer.component.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import React from 'react';
import { useI18nContext } from '../../../hooks/useI18nContext';

import Typography from '../../../components/ui/typography/typography';
import { TEXT_ALIGN } from '../../../helpers/constants/design-system';

const WelcomeFooter = () => {
const t = useI18nContext();

return (
<>
<div className="welcome-page__header">{t('welcome')}</div>
<div className="welcome-page__description">
<p>{t('metamaskDescription')}</p>
<p>{t('happyToSeeYou')}</p>
</div>
<Typography align={TEXT_ALIGN.CENTER} marginBottom={6}>
{t('metamaskDescription')}
</Typography>

<Typography align={TEXT_ALIGN.CENTER}>{t('happyToSeeYou')}</Typography>
</>
);
};
Expand Down

0 comments on commit d10e6a4

Please sign in to comment.