mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Write down your SRP page fixes (#13729)
* Fixed few things in 'Write down srp page' flow * Applied requested changes * Modified messages Co-authored-by: Alex Donesky <adonesky@gmail.com>
This commit is contained in:
parent
4a6585fc4a
commit
ac9f263e1a
6
app/_locales/en/messages.json
generated
6
app/_locales/en/messages.json
generated
@ -1412,6 +1412,9 @@
|
|||||||
"hide": {
|
"hide": {
|
||||||
"message": "Hide"
|
"message": "Hide"
|
||||||
},
|
},
|
||||||
|
"hideSeedPhrase": {
|
||||||
|
"message": "Hide seed phrase"
|
||||||
|
},
|
||||||
"hideToken": {
|
"hideToken": {
|
||||||
"message": "Hide token"
|
"message": "Hide token"
|
||||||
},
|
},
|
||||||
@ -2555,6 +2558,9 @@
|
|||||||
"revealSeedWordsWarningTitle": {
|
"revealSeedWordsWarningTitle": {
|
||||||
"message": "DO NOT share this phrase with anyone!"
|
"message": "DO NOT share this phrase with anyone!"
|
||||||
},
|
},
|
||||||
|
"revealTheSeedPhrase": {
|
||||||
|
"message": "Reveal seed phrase"
|
||||||
|
},
|
||||||
"rinkeby": {
|
"rinkeby": {
|
||||||
"message": "Rinkeby Test Network"
|
"message": "Rinkeby Test Network"
|
||||||
},
|
},
|
||||||
|
@ -66,26 +66,39 @@
|
|||||||
&--button {
|
&--button {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
align-self: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
&--copy {
|
&__copy-and-hide {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
|
|
||||||
&--button {
|
&__area {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__button {
|
||||||
@include H6;
|
@include H6;
|
||||||
|
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
display: flex;
|
|
||||||
justify-content: space-evenly;
|
|
||||||
width: 32%;
|
width: 32%;
|
||||||
color: var(--primary-blue);
|
color: var(--primary-blue);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
|
||||||
|
&__hide-seed {
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__copy-to-clipboard {
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
svg {
|
svg {
|
||||||
width: 15px;
|
width: 15px;
|
||||||
|
@ -21,6 +21,7 @@ export default function RecoveryPhraseChips({
|
|||||||
setInputValue,
|
setInputValue,
|
||||||
inputValue,
|
inputValue,
|
||||||
indicesToCheck,
|
indicesToCheck,
|
||||||
|
hiddenPhrase,
|
||||||
}) {
|
}) {
|
||||||
const t = useI18nContext();
|
const t = useI18nContext();
|
||||||
const hideSeedPhrase = phraseRevealed === false;
|
const hideSeedPhrase = phraseRevealed === false;
|
||||||
@ -83,14 +84,18 @@ export default function RecoveryPhraseChips({
|
|||||||
|
|
||||||
{hideSeedPhrase && (
|
{hideSeedPhrase && (
|
||||||
<div className="recovery-phrase__secret-blocker">
|
<div className="recovery-phrase__secret-blocker">
|
||||||
<i className="far fa-eye-slash" color="white" />
|
{!hiddenPhrase && (
|
||||||
<Typography
|
<>
|
||||||
variant={TYPOGRAPHY.H6}
|
<i className="far fa-eye" color="white" />
|
||||||
color={COLORS.WHITE}
|
<Typography
|
||||||
className="recovery-phrase__secret-blocker--text"
|
variant={TYPOGRAPHY.H6}
|
||||||
>
|
color={COLORS.WHITE}
|
||||||
{t('makeSureNoOneWatching')}
|
className="recovery-phrase__secret-blocker--text"
|
||||||
</Typography>
|
>
|
||||||
|
{t('makeSureNoOneWatching')}
|
||||||
|
</Typography>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
@ -104,4 +109,5 @@ RecoveryPhraseChips.propTypes = {
|
|||||||
setInputValue: PropTypes.func,
|
setInputValue: PropTypes.func,
|
||||||
inputValue: PropTypes.string,
|
inputValue: PropTypes.string,
|
||||||
indicesToCheck: PropTypes.array,
|
indicesToCheck: PropTypes.array,
|
||||||
|
hiddenPhrase: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
@ -25,6 +25,8 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
|
|||||||
const t = useI18nContext();
|
const t = useI18nContext();
|
||||||
const [copied, handleCopy] = useCopyToClipboard();
|
const [copied, handleCopy] = useCopyToClipboard();
|
||||||
const [phraseRevealed, setPhraseRevealed] = useState(false);
|
const [phraseRevealed, setPhraseRevealed] = useState(false);
|
||||||
|
const [hiddenPhrase, setHiddenPhrase] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="recovery-phrase">
|
<div className="recovery-phrase">
|
||||||
<ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_REVIEW} />
|
<ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_REVIEW} />
|
||||||
@ -58,12 +60,7 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
|
|||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<Typography variant={TYPOGRAPHY.H4}>
|
<Typography variant={TYPOGRAPHY.H4}>
|
||||||
{t('seedPhraseIntroSidebarBulletFour')}
|
{t('seedPhraseIntroSidebarBulletOne')}
|
||||||
</Typography>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<Typography variant={TYPOGRAPHY.H4}>
|
|
||||||
{t('seedPhraseIntroSidebarBulletTwo')}
|
|
||||||
</Typography>
|
</Typography>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
@ -80,21 +77,39 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
|
|||||||
</Box>
|
</Box>
|
||||||
<RecoveryPhraseChips
|
<RecoveryPhraseChips
|
||||||
secretRecoveryPhrase={secretRecoveryPhrase.split(' ')}
|
secretRecoveryPhrase={secretRecoveryPhrase.split(' ')}
|
||||||
phraseRevealed={phraseRevealed}
|
phraseRevealed={phraseRevealed && !hiddenPhrase}
|
||||||
|
hiddenPhrase={hiddenPhrase}
|
||||||
/>
|
/>
|
||||||
<div className="recovery-phrase__footer">
|
<div className="recovery-phrase__footer">
|
||||||
{phraseRevealed ? (
|
{phraseRevealed ? (
|
||||||
<div className="recovery-phrase__footer--copy">
|
<div className="recovery-phrase__footer__copy-and-hide">
|
||||||
<Button
|
<div className="recovery-phrase__footer__copy-and-hide__area">
|
||||||
onClick={() => {
|
<Button
|
||||||
handleCopy(secretRecoveryPhrase);
|
type="link"
|
||||||
}}
|
icon={
|
||||||
icon={copied ? null : <Copy size={20} color="#3098DC" />}
|
<i
|
||||||
className="recovery-phrase__footer--copy--button"
|
className={`far fa-eye${hiddenPhrase ? '' : '-slash'}`}
|
||||||
type="link"
|
color="#3098DC"
|
||||||
>
|
/>
|
||||||
{copied ? t('copiedExclamation') : t('copyToClipboard')}
|
}
|
||||||
</Button>
|
className="recovery-phrase__footer__copy-and-hide__button recovery-phrase__footer__copy-and-hide__button__hide-seed"
|
||||||
|
onClick={() => {
|
||||||
|
setHiddenPhrase(!hiddenPhrase);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{hiddenPhrase ? t('revealTheSeedPhrase') : t('hideSeedPhrase')}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
handleCopy(secretRecoveryPhrase);
|
||||||
|
}}
|
||||||
|
icon={copied ? null : <Copy size={20} color="#3098DC" />}
|
||||||
|
className="recovery-phrase__footer__copy-and-hide__button recovery-phrase__footer__copy-and-hide__button__copy-to-clipboard"
|
||||||
|
type="link"
|
||||||
|
>
|
||||||
|
{copied ? t('copiedExclamation') : t('copyToClipboard')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
<Button
|
<Button
|
||||||
data-testid="recovery-phrase-next"
|
data-testid="recovery-phrase-next"
|
||||||
type="primary"
|
type="primary"
|
||||||
|
Loading…
Reference in New Issue
Block a user