Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions frontends/web/src/routes/device/bitbox02/wizard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const Wizard = ({ deviceID }: TProps) => {
verifyAttestation(deviceID).then(cb);
})
);
const [appStatus, setAppStatus] = useState<'' | TWalletSetupChoices>('');
const [setupChoice, setSetupChoice] = useState<'' | TWalletSetupChoices>('');
const [createOptions, setCreateOptions] = useState<TWalletCreateOptions>();
const [showWizard, setShowWizard] = useState<boolean>(false);
// If true, we just pair and unlock, so we can hide some steps.
Expand All @@ -68,7 +68,7 @@ export const Wizard = ({ deviceID }: TProps) => {
}, [status, showWizard, unlockOnly]);

const handleAbort = () => {
setAppStatus('');
setSetupChoice('');
setCreateOptions(undefined);
};
if (status === undefined) {
Expand All @@ -91,7 +91,7 @@ export const Wizard = ({ deviceID }: TProps) => {
return null;
}
// fixes empty main element, happens when after unlocking the device, reason wizard is now always mounted in app.tsx
if (appStatus === '' && status === 'initialized') {
if (setupChoice === '' && status === 'initialized') {
return null;
}
return (
Expand All @@ -110,20 +110,20 @@ export const Wizard = ({ deviceID }: TProps) => {
pairingFailed={status === 'pairingFailed'} />
)}

{ (!unlockOnly && appStatus === '') && (
{ (!unlockOnly && setupChoice === '') && (
<SetupOptions
key="choose-setup"
versionInfo={versionInfo}
onSelectSetup={(
type: TWalletSetupChoices,
createOptions?: TWalletCreateOptions,
) => {
setAppStatus(type);
setSetupChoice(type);
setCreateOptions(createOptions);
}} />
)}

{ (!unlockOnly && appStatus === 'create-wallet') && (
{ (!unlockOnly && setupChoice === 'create-wallet') && (
<CreateWallet
backupType={(createOptions?.withMnemonic ? 'mnemonic' : 'sdcard')}
backupSeedLength={createOptions?.with12Words ? 16 : 32}
Expand All @@ -133,30 +133,30 @@ export const Wizard = ({ deviceID }: TProps) => {
)}

{/* keeping the backups mounted even restoreBackupStatus === 'restore' is not true so it catches potential errors */}
{ (!unlockOnly && appStatus === 'restore-sdcard' && status !== 'initialized') && (
{ (!unlockOnly && setupChoice === 'restore-sdcard' && status !== 'initialized') && (
<RestoreFromSDCard
key="restore-sdcard"
deviceID={deviceID}
onAbort={handleAbort} />
)}

{ (!unlockOnly && appStatus === 'restore-mnemonic' && status !== 'initialized') && (
{ (!unlockOnly && setupChoice === 'restore-mnemonic' && status !== 'initialized') && (
<RestoreFromMnemonic
key="restore-mnemonic"
deviceID={deviceID}
onAbort={handleAbort} />
)}

{ (appStatus === 'create-wallet' && status === 'initialized') && (
{ (setupChoice === 'create-wallet' && status === 'initialized') && (
<CreateWalletSuccess
key="success"
backupType={(createOptions?.withMnemonic ? 'mnemonic' : 'sdcard')}
onContinue={handleGetStarted} />
)}
{ (appStatus === 'restore-sdcard' && status === 'initialized') && (
{ (setupChoice === 'restore-sdcard' && status === 'initialized') && (
<RestoreFromSDCardSuccess key="backup-success" onContinue={handleGetStarted} />
)}
{ (appStatus === 'restore-mnemonic' && status === 'initialized') && (
{ (setupChoice === 'restore-mnemonic' && status === 'initialized') && (
<RestoreFromMnemonicSuccess key="backup-mnemonic-success" onContinue={handleGetStarted} />
)}
</Main>
Expand Down