Skip to content

Commit fb85631

Browse files
committed
Merge branch 'frontend-revamp-manage-backups-view'
2 parents 1cbbf5b + f700473 commit fb85631

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

frontends/web/src/locales/en/app.json

+1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@
288288
},
289289
"stepInsertSD": {
290290
"insertSDCard": "Please insert a microSD card into your BitBox02 to continue.",
291+
"insertSDCardToSeeBackups": "Please insert the microSD card into your BitBox02 to see your backups.",
291292
"insertSDcardTitle": "Insert microSD card"
292293
},
293294
"stepPassword": {

frontends/web/src/routes/device/bitbox02/sdcardcheck.tsx

+13-13
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
import { ReactNode, useCallback, useEffect, useState } from 'react';
1818
import { useTranslation } from 'react-i18next';
1919
import { checkSDCard } from '@/api/bitbox02';
20-
import { Dialog, DialogButtons } from '@/components/dialog/dialog';
2120
import { Button } from '@/components/forms';
21+
import { PointToBitBox02 } from '@/components/icon';
22+
import { View, ViewButtons, ViewContent, ViewHeader } from '@/components/view/view';
2223
import { BackButton } from '@/components/backbutton/backbutton';
2324
import { HorizontallyCenteredSpinner } from '@/components/spinner/SpinnerAnimation';
2425

@@ -44,25 +45,24 @@ const SDCardCheck = ({ deviceID, children }: TProps) => {
4445
return (
4546
<div>
4647
{!sdCardInserted ? (
47-
<Dialog open={!sdCardInserted} title="Check your device" small>
48-
<div className="columnsContainer half">
49-
<div className="columns">
50-
<div className="column">
51-
<p>{t('backup.insert')}</p>
52-
</div>
53-
</div>
54-
</div>
55-
<DialogButtons>
48+
<View textCenter>
49+
<ViewHeader title={t('bitbox02Wizard.stepInsertSD.insertSDcardTitle')}>
50+
{t('bitbox02Wizard.stepInsertSD.insertSDCardToSeeBackups')}
51+
</ViewHeader>
52+
<ViewContent minHeight="280px">
53+
<PointToBitBox02 />
54+
</ViewContent>
55+
<ViewButtons>
5656
<Button
5757
primary
5858
onClick={check}>
5959
{t('button.ok')}
6060
</Button>
61-
<BackButton>
61+
<BackButton enableEsc>
6262
{t('button.back')}
6363
</BackButton>
64-
</DialogButtons>
65-
</Dialog>
64+
</ViewButtons>
65+
</View>
6666
) : children}
6767
</div>
6868
);

frontends/web/src/routes/device/manage-backups/manage-backups.tsx

+13-9
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import { useTranslation } from 'react-i18next';
1919
import { TDevices } from '@/api/devices';
20+
import { SubTitle } from '@/components/title';
2021
import { BackButton } from '@/components/backbutton/backbutton';
2122
import { Guide } from '@/components/guide/guide';
2223
import { Entry } from '@/components/guide/entry';
@@ -48,7 +49,6 @@ export const ManageBackups = ({
4849
title={<h2>{t('backup.title')}</h2>}
4950
/>
5051
<div className="content padded">
51-
<h3 className="subTitle">{t('backup.list')}</h3>
5252
<BackupsList
5353
deviceID={deviceID}
5454
devices={devices}
@@ -74,15 +74,19 @@ const BackupsList = ({
7474
}
7575
switch (devices[deviceID]) {
7676
case 'bitbox':
77+
7778
return (
78-
<Backups
79-
deviceID={deviceID}
80-
showCreate={true}
81-
showRestore={false}>
82-
<BackButton>
83-
{t('button.back')}
84-
</BackButton>
85-
</Backups>
79+
<>
80+
<SubTitle>{t('backup.list')}</SubTitle>
81+
<Backups
82+
deviceID={deviceID}
83+
showCreate={true}
84+
showRestore={false}>
85+
<BackButton>
86+
{t('button.back')}
87+
</BackButton>
88+
</Backups>
89+
</>
8690
);
8791
case 'bitbox02':
8892
return (

0 commit comments

Comments
 (0)