Skip to content
Draft
10 changes: 5 additions & 5 deletions app/_locales/en/messages.json

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

10 changes: 5 additions & 5 deletions app/_locales/en_GB/messages.json

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

4 changes: 2 additions & 2 deletions ui/components/app/password-form/password-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default function PasswordForm({
}, [password.length]);

return (
<Box>
<Box paddingInline={3}>
<FormTextField
label={t('newPasswordCreate')}
id="create-password-new"
Expand All @@ -99,7 +99,7 @@ export default function PasswordForm({
handlePasswordChange(e.target.value);
}}
helpTextProps={{
color: TextColor.textMuted,
color: TextColor.textAlternative,
'data-testid': 'short-password-error',
}}
helpText={t('passwordNotLongEnough')}
Expand Down
3 changes: 2 additions & 1 deletion ui/components/app/srp-details-modal/srp-details-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
AlignItems,
Display,
TextAlign,
TextColor,

Check failure on line 7 in ui/components/app/srp-details-modal/srp-details-modal.tsx

View workflow job for this annotation

GitHub Actions / test-lint / Test lint

'TextColor' is defined but never used
TextVariant,
} from '../../../helpers/constants/design-system';
import { useI18nContext } from '../../../hooks/useI18nContext';
Expand Down Expand Up @@ -33,7 +34,7 @@
<ModalOverlay />
<ModalContent alignItems={AlignItems.center}>
<ModalHeader onClose={onClose}>
<Text variant={TextVariant.headingMd} textAlign={TextAlign.Center}>
<Text variant={TextVariant.bodyMdBold} textAlign={TextAlign.Center}>
{t('srpDetailsTitle')}
</Text>
</ModalHeader>
Expand Down
3 changes: 2 additions & 1 deletion ui/components/app/srp-input-import/srp-input-import.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,12 @@ export default function SrpInputImport({ onChange }: SrpInputImportProps) {
<Box
display={Display.Grid}
className="srp-input-import__words-list"
gap={2}
gap={3}
>
{draftSrp.map((word, index) => {
return (
<TextField
backgroundColor={BackgroundColor.backgroundMuted}
inputProps={{
ref: (el) => {
if (el) {
Expand Down
79 changes: 45 additions & 34 deletions ui/pages/onboarding-flow/create-password/create-password.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,10 @@ export default function CreatePassword({
href={ZENDESK_URLS.PASSWORD_ARTICLE}
target="_blank"
rel="noopener noreferrer"
style={{ paddingLeft: '4px' }}
>
<span className="create-password__link-text">
{t('learnMoreUpperCaseWithDot')}
{t('learnMoreUpperCase')}
</span>
</a>
);
Expand All @@ -363,84 +364,94 @@ export default function CreatePassword({
<Box>
<Box
justifyContent={JustifyContent.flexStart}
marginBottom={4}
marginBottom={6}
width={BlockSize.Full}
style={{ paddingInline: '6px' }}
>
<ButtonIcon
iconName={IconName.ArrowLeft}
color={IconColor.iconDefault}
size={ButtonIconSize.Md}
size={ButtonIconSize.Sm}
data-testid="create-password-back-button"
type="button"
onClick={handleBackClick}
ariaLabel={t('back')}
/>
</Box>
<Box
paddingInline={3}
justifyContent={JustifyContent.flexStart}
marginBottom={4}
width={BlockSize.Full}
>
<Text variant={TextVariant.headingLg} as="h2">
<Text variant={TextVariant.headingMd} as="h2" marginBottom={1}>
{t('createPassword')}
</Text>
{isSocialLoginFlow ? (
<Text
variant={TextVariant.bodyMd}
color={TextColor.textAlternative}
as="h2"
>
{t('createPasswordDetailsSocial')}
<Box marginBottom={7}>
{isSocialLoginFlow ? (
<Text
variant={TextVariant.bodyMd}
color={TextColor.textAlternative}
as="h2"
>
{t('createPasswordDetailsSocial')}
<Text
variant={TextVariant.bodyMd}
color={TextColor.warningDefault}
as="span"
>
{t('createPasswordDetailsSocialReset')}
</Text>
</Text>
) : (
<Text
variant={TextVariant.bodyMd}
color={TextColor.warningDefault}
as="span"
color={TextColor.textAlternative}
as="h2"
>
{t('createPasswordDetailsSocialReset')}
{t('createPasswordDetails')}
</Text>
</Text>
) : (
<Text
variant={TextVariant.bodyMd}
color={TextColor.textAlternative}
as="h2"
>
{t('createPasswordDetails')}
</Text>
)}
)}
</Box>
</Box>
<PasswordForm onChange={(newPassword) => setPassword(newPassword)} />

{/* Terms Container - 24px from password form */}
<Box
marginInline={3}
className="create-password__terms-container"
alignItems={AlignItems.center}
justifyContent={JustifyContent.spaceBetween}
justifyContent={JustifyContent.flexStart}
marginTop={6}
backgroundColor={BackgroundColor.backgroundMuted}
padding={3}
borderRadius={BorderRadius.LG}
>
<Checkbox
inputProps={{ 'data-testid': 'create-password-terms' }}
inputProps={{
'data-testid': 'create-password-terms',
}}
alignItems={AlignItems.flexStart}
isChecked={termsChecked}
onChange={() => {
setTermsChecked(!termsChecked);
}}
label={
<Text variant={TextVariant.bodySm} color={TextColor.textDefault}>
<Text
variant={TextVariant.bodySm}
color={TextColor.textDefault}
style={{ whiteSpace: 'normal' }}
>
{checkboxLabel}
{!isSocialLoginFlow && (
<>
<br />
{createPasswordLink}
</>
)}
{!isSocialLoginFlow && <>{createPasswordLink}</>}
</Text>
}
/>
</Box>
</Box>
<Box>

{/* Button pinned to bottom */}
<Box paddingInline={3}>
<Button
data-testid="create-password-submit"
variant={ButtonVariant.Primary}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export default function CreationSuccessful() {
alignItems={AlignItems.flexStart}
>
<Text
variant={TextVariant.headingLg}
variant={TextVariant.headingMd}
as="h2"
justifyContent={JustifyContent.center}
style={{
Expand Down
83 changes: 46 additions & 37 deletions ui/pages/onboarding-flow/import-srp/import-srp.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,53 +133,62 @@
<SRPDetailsModal onClose={() => setShowSrpDetailsModal(false)} />
)}
<Box>
<Box marginBottom={4}>
{/* Back Button - Isolated */}
<Box marginBottom={6} style={{ paddingInline: '6px' }}>
<ButtonIcon
iconName={IconName.ArrowLeft}
color={IconColor.iconDefault}
size={ButtonIconSize.Md}
size={ButtonIconSize.Sm}
data-testid="import-srp-back-button"
onClick={onBack}
ariaLabel={t('back')}
/>
</Box>
<Box textAlign={TextAlign.Left} marginBottom={2}>
<Text variant={TextVariant.headingLg}>{t('importAWallet')}</Text>
</Box>
<Box
display={Display.Flex}
alignItems={AlignItems.center}
marginBottom={4}
>
<Text variant={TextVariant.bodyMd} color={TextColor.textAlternative}>
{t('typeYourSRP')}
</Text>
<ButtonIcon
iconName={IconName.Info}
size={ButtonIconSize.Sm}
color={IconColor.iconAlternative}
onClick={onShowSrpDetailsModal}
ariaLabel="info"
/>
</Box>
<Box width={BlockSize.Full}>
<form onSubmit={(e) => e.preventDefault()}>
<SrpInputImport onChange={setSecretRecoveryPhrase} />
{srpError && (
<Box marginTop={2}>
<Text
data-testid="import-srp-error"
variant={TextVariant.bodySm}
color={TextColor.errorDefault}
>
{srpError}
</Text>
</Box>
)}
</form>

{/* All Content with Consistent Padding */}
<Box paddingInline={3}>
<Box textAlign={TextAlign.Left} marginBottom={1}>
<Text variant={TextVariant.headingMd}>{t('importAWallet')}</Text>
</Box>
<Box
display={Display.Flex}
alignItems={AlignItems.center}
marginBottom={7}
>
<Text
variant={TextVariant.bodyMd}
color={TextColor.textAlternative}
>
{t('typeYourSRP')}
</Text>
<ButtonIcon
iconName={IconName.Info}
size={ButtonIconSize.Sm}
color={IconColor.iconAlternative}
onClick={onShowSrpDetailsModal}
ariaLabel="info"
/>
</Box>

<Box width={BlockSize.Full}>
<form onSubmit={(e) => e.preventDefault()}>
<SrpInputImport onChange={setSecretRecoveryPhrase} />
{srpError && (
<Box marginTop={2}>
<Text
data-testid="import-srp-error"
variant={TextVariant.bodySm}
color={TextColor.errorDefault}
>
{srpError}
</Text>
</Box>
)}
</form>
</Box>
</Box>
</Box>
<Box
<Box paddingInline={3}

Check failure on line 191 in ui/pages/onboarding-flow/import-srp/import-srp.js

View workflow job for this annotation

GitHub Actions / test-lint / Test lint

Insert `⏎·······`
display={Display.Flex}
flexDirection={FlexDirection.Column}
justifyContent={JustifyContent.center}
Expand Down
2 changes: 1 addition & 1 deletion ui/pages/onboarding-flow/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
padding-inline: 24px;
padding-top: 32px;
padding-bottom: 32px;
max-width: 446px;
max-width: 504px;
min-height: 627px;
height: auto;

Expand Down
Loading
Loading