Skip to content

Commit eecba5d

Browse files
committed
changes after go-api change
1 parent 96a72ba commit eecba5d

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

backend/devices/bitbox02/device.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func NewDevice(
7777
switch ev {
7878
case firmware.EventStatusChanged:
7979
switch device.Device.Status() {
80-
case firmware.StatusInitialized:
80+
case firmware.StatusUnlocked:
8181
device.fireEvent(event.EventKeystoreAvailable)
8282
}
8383
}
@@ -111,7 +111,7 @@ func (device *Device) Identifier() string {
111111

112112
// Keystore implements device.Device.
113113
func (device *Device) Keystore() keystoreInterface.Keystore {
114-
if device.Status() != firmware.StatusInitialized {
114+
if device.Status() != firmware.StatusUnlocked {
115115
return nil
116116
}
117117
return &keystore{

frontends/web/src/api/bitbox02.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export const restoreFromMnemonic = (
137137
};
138138

139139
export type TStatus = 'connected'
140-
| 'initialized'
140+
| 'unlocked'
141141
| 'pairingFailed'
142142
| 'require_firmware_upgrade'
143143
| 'require_app_upgrade'
@@ -184,4 +184,4 @@ export const invokeBIP85 = (deviceID: string): Promise<SuccessResponse | FailRes
184184

185185
export const gotoStartupSettings = (deviceID: string) => {
186186
return apiPost(`devices/bitbox02/${deviceID}/goto-startup-settings`);
187-
};
187+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const BitBox02 = ({ deviceID, deviceIDs, hasAccounts }: TProps) => {
3434
})
3535
);
3636

37-
if (status !== 'initialized') {
37+
if (status !== 'unlocked') {
3838
return null;
3939
}
4040
return <BB02Settings deviceID={deviceID} deviceIDs={deviceIDs} hasAccounts={hasAccounts} />;

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export const Wizard = ({ deviceID }: TProps) => {
9595
return null;
9696
}
9797
// fixes empty main element, happens when after unlocking the device, reason wizard is now always mounted in app.tsx
98-
if (appStatus === '' && status === 'initialized') {
98+
if (appStatus === '' && status === 'unlocked') {
9999
return null;
100100
}
101101
return (
@@ -106,14 +106,6 @@ export const Wizard = ({ deviceID }: TProps) => {
106106
attestation={attestation} />
107107
) : null }
108108

109-
{ (status === 'unpaired' || status === 'pairingFailed') && (
110-
<Pairing
111-
key="pairing"
112-
deviceID={deviceID}
113-
attestation={attestation}
114-
pairingFailed={status === 'pairingFailed'} />
115-
)}
116-
117109
{ (!unlockOnly && appStatus === '') && (
118110
<SetupOptions
119111
key="choose-setup"
@@ -137,32 +129,40 @@ export const Wizard = ({ deviceID }: TProps) => {
137129
)}
138130

139131
{/* keeping the backups mounted even restoreBackupStatus === 'restore' is not true so it catches potential errors */}
140-
{ (!unlockOnly && appStatus === 'restore-sdcard' && status !== 'initialized') && (
132+
{ (!unlockOnly && appStatus === 'restore-sdcard' && status !== 'unlocked') && (
141133
<RestoreFromSDCard
142134
key="restore-sdcard"
143135
deviceID={deviceID}
144136
onAbort={handleAbort} />
145137
)}
146138

147-
{ (!unlockOnly && appStatus === 'restore-mnemonic' && status !== 'initialized') && (
139+
{ (!unlockOnly && appStatus === 'restore-mnemonic' && status !== 'unlocked') && (
148140
<RestoreFromMnemonic
149141
key="restore-mnemonic"
150142
deviceID={deviceID}
151143
onAbort={handleAbort} />
152144
)}
153145

154-
{ (appStatus === 'create-wallet' && status === 'initialized') && (
146+
{ (appStatus === 'create-wallet' && status === 'unlocked') && (
155147
<CreateWalletSuccess
156148
key="success"
157149
backupType={(createOptions?.withMnemonic ? 'mnemonic' : 'sdcard')}
158150
onContinue={handleGetStarted} />
159151
)}
160-
{ (appStatus === 'restore-sdcard' && status === 'initialized') && (
152+
{ (appStatus === 'restore-sdcard' && status === 'unlocked') && (
161153
<RestoreFromSDCardSuccess key="backup-success" onContinue={handleGetStarted} />
162154
)}
163-
{ (appStatus === 'restore-mnemonic' && status === 'initialized') && (
155+
{ (appStatus === 'restore-mnemonic' && status === 'unlocked') && (
164156
<RestoreFromMnemonicSuccess key="backup-mnemonic-success" onContinue={handleGetStarted} />
165157
)}
158+
159+
{ (status === 'unpaired' || status === 'pairingFailed') && (
160+
<Pairing
161+
key="pairing"
162+
deviceID={deviceID}
163+
attestation={attestation}
164+
pairingFailed={status === 'pairingFailed'} />
165+
)}
166166
</Main>
167167
);
168168
};

0 commit comments

Comments
 (0)