diff --git a/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx b/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx index 8cd3973c265d..f2e73c0fb4bb 100644 --- a/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx +++ b/ui/components/app/identity/backup-and-sync-features-toggles/backup-and-sync-features-toggles.tsx @@ -1,6 +1,18 @@ import React, { useCallback, useContext, useEffect } from 'react'; import { useSelector } from 'react-redux'; import { BACKUPANDSYNC_FEATURES } from '@metamask/profile-sync-controller/user-storage'; +import { + Box, + BoxAlignItems, + BoxFlexDirection, + BoxJustifyContent, + FontWeight, + Icon, + IconName, + Text, + TextColor, + TextVariant, +} from '@metamask/design-system-react'; import { useI18nContext } from '../../../../hooks/useI18nContext'; import { selectIsAccountSyncingEnabled, @@ -8,15 +20,7 @@ import { selectIsBackupAndSyncEnabled, selectIsBackupAndSyncUpdateLoading, } from '../../../../selectors/identity/backup-and-sync'; -import { Box, Icon, IconName, Text } from '../../../component-library'; import ToggleButton from '../../../ui/toggle-button'; -import { - AlignItems, - Display, - JustifyContent, - TextColor, - TextVariant, -} from '../../../../helpers/constants/design-system'; import Preloader from '../../../ui/icon/preloader/preloader-icon.component'; import { useBackupAndSync } from '../../../../hooks/identity/useBackupAndSync/useBackupAndSync'; import { MetaMetricsContext } from '../../../../contexts/metametrics'; @@ -107,15 +111,15 @@ const FeatureToggle = ({ return ( - + - + {t(section.titleI18NKey)} @@ -191,17 +195,18 @@ export const BackupAndSyncFeaturesToggles = () => { className="privacy-settings__setting__wrapper" data-testid={backupAndSyncFeaturesTogglesTestIds.container} > - + {t('backupAndSyncManageWhatYouSync')} - - {t('backupAndSyncManageWhatYouSyncDescription')} - + + +
{t('backupAndSyncManageWhatYouSyncDescription')}
+
+
{backupAndSyncFeaturesTogglesSections.map((section) => ( { data-testid={backupAndSyncToggleTestIds.container} > - + {t('backupAndSyncEnable')} @@ -227,32 +229,33 @@ export const BackupAndSyncToggle = () => {
- {t('backupAndSyncEnableDescription', [ - - {t('backupAndSyncPrivacyLink')} - , - ])} +
+ {t('backupAndSyncEnableDescription', [ + + + {t('backupAndSyncPrivacyLink')} + + , + ])} +
{error && ( - + {t('notificationsSettingsBoxError')} diff --git a/ui/components/app/modals/identity/confirm-turn-on-backup-and-sync-modal/confirm-turn-on-backup-and-sync-modal.tsx b/ui/components/app/modals/identity/confirm-turn-on-backup-and-sync-modal/confirm-turn-on-backup-and-sync-modal.tsx index 52382f7c46ab..97310593fd88 100644 --- a/ui/components/app/modals/identity/confirm-turn-on-backup-and-sync-modal/confirm-turn-on-backup-and-sync-modal.tsx +++ b/ui/components/app/modals/identity/confirm-turn-on-backup-and-sync-modal/confirm-turn-on-backup-and-sync-modal.tsx @@ -1,26 +1,25 @@ import React from 'react'; import { useDispatch } from 'react-redux'; -import { useModalProps } from '../../../../../hooks/useModalProps'; import { + Box, + BoxAlignItems, + BoxFlexDirection, + BoxJustifyContent, + Button, ButtonSize, + ButtonVariant, + FontWeight, + Text, + TextVariant, +} from '@metamask/design-system-react'; +import { useModalProps } from '../../../../../hooks/useModalProps'; +import { Modal, ModalOverlay, ModalContent, ModalHeader, - Box, - Text, ModalFooter, - Button, - ButtonVariant, } from '../../../../component-library'; -import { - AlignItems, - BlockSize, - Display, - FlexDirection, - JustifyContent, - TextVariant, -} from '../../../../../helpers/constants/design-system'; import { useI18nContext } from '../../../../../hooks/useI18nContext'; import { toggleExternalServices } from '../../../../../store/actions'; import { onboardingToggleBasicFunctionalityOn } from '../../../../../ducks/app/app'; @@ -65,12 +64,7 @@ export function ConfirmTurnOnBackupAndSyncModal() { data-testid={confirmTurnOnBackupAndSyncModalTestIds.modal} > - + - + {t('backupAndSyncEnable')} @@ -94,32 +87,27 @@ export function ConfirmTurnOnBackupAndSyncModal() { marginLeft={4} marginRight={4} marginBottom={4} - display={Display.Flex} + flexDirection={BoxFlexDirection.Column} gap={4} - flexDirection={FlexDirection.Column} > - + {t('backupAndSyncEnableConfirmation', [ - {t('backupAndSyncBasicFunctionalityNameMention')} + {t('backupAndSyncBasicFunctionalityNameMention')} , ])} - - + +