changes after go-api change

Author: NicolaLS

backend/devices/bitbox02/device.go

@@ -77,7 +77,7 @@ func NewDevice(
 		switch ev {
 		case firmware.EventStatusChanged:
 			switch device.Device.Status() {
-			case firmware.StatusInitialized:
+			case firmware.StatusUnlocked:
 				device.fireEvent(event.EventKeystoreAvailable)
 			}
 		}
@@ -111,7 +111,7 @@ func (device *Device) Identifier() string {
 
 // Keystore implements device.Device.
 func (device *Device) Keystore() keystoreInterface.Keystore {
-	if device.Status() != firmware.StatusInitialized {
+	if device.Status() != firmware.StatusUnlocked {
 		return nil
 	}
 	return &keystore{

frontends/web/src/api/bitbox02.ts

@@ -137,7 +137,7 @@ export const restoreFromMnemonic = (
 };
 
 export type TStatus = 'connected'
-  | 'initialized'
+  | 'unlocked'
   | 'pairingFailed'
   | 'require_firmware_upgrade'
   | 'require_app_upgrade'
@@ -184,4 +184,4 @@ export const invokeBIP85 = (deviceID: string): Promise<SuccessResponse | FailRes
 
 export const gotoStartupSettings = (deviceID: string) => {
   return apiPost(`devices/bitbox02/${deviceID}/goto-startup-settings`);
-};
+};

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

@@ -34,7 +34,7 @@ export const BitBox02 = ({ deviceID, deviceIDs, hasAccounts }: TProps) => {
     })
   );
 
-  if (status !== 'initialized') {
+  if (status !== 'unlocked') {
     return null;
   }
   return <BB02Settings deviceID={deviceID} deviceIDs={deviceIDs} hasAccounts={hasAccounts} />;

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

@@ -95,7 +95,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 (appStatus === '' && status === 'unlocked') {
     return null;
   }
   return (
@@ -106,14 +106,6 @@ export const Wizard = ({ deviceID }: TProps) => {
           attestation={attestation} />
       ) : null }
 
-      { (status === 'unpaired' || status === 'pairingFailed') && (
-        <Pairing
-          key="pairing"
-          deviceID={deviceID}
-          attestation={attestation}
-          pairingFailed={status === 'pairingFailed'} />
-      )}
-
       { (!unlockOnly && appStatus === '') && (
         <SetupOptions
           key="choose-setup"
@@ -137,32 +129,40 @@ 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 && appStatus === 'restore-sdcard' && status !== 'unlocked') && (
         <RestoreFromSDCard
           key="restore-sdcard"
           deviceID={deviceID}
           onAbort={handleAbort} />
       )}
 
-      { (!unlockOnly && appStatus === 'restore-mnemonic' && status !== 'initialized') && (
+      { (!unlockOnly && appStatus === 'restore-mnemonic' && status !== 'unlocked') && (
         <RestoreFromMnemonic
           key="restore-mnemonic"
           deviceID={deviceID}
           onAbort={handleAbort} />
       )}
 
-      { (appStatus === 'create-wallet' && status === 'initialized') && (
+      { (appStatus === 'create-wallet' && status === 'unlocked') && (
         <CreateWalletSuccess
           key="success"
           backupType={(createOptions?.withMnemonic ? 'mnemonic' : 'sdcard')}
           onContinue={handleGetStarted} />
       )}
-      { (appStatus === 'restore-sdcard' && status === 'initialized') && (
+      { (appStatus === 'restore-sdcard' && status === 'unlocked') && (
         <RestoreFromSDCardSuccess key="backup-success" onContinue={handleGetStarted} />
       )}
-      { (appStatus === 'restore-mnemonic' && status === 'initialized') && (
+      { (appStatus === 'restore-mnemonic' && status === 'unlocked') && (
         <RestoreFromMnemonicSuccess key="backup-mnemonic-success" onContinue={handleGetStarted} />
       )}
+
+      { (status === 'unpaired' || status === 'pairingFailed') && (
+        <Pairing
+          key="pairing"
+          deviceID={deviceID}
+          attestation={attestation}
+          pairingFailed={status === 'pairingFailed'} />
+      )}
     </Main>
   );
 };