move Device.Features.device_id to Device.id

trezor · Mar 6, 2020 · aa62a43 · aa62a43
1 parent 2beca25
commit aa62a43
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/src/js/types/trezor/device.js b/src/js/types/trezor/device.js
@@ -43,20 +43,20 @@ export type FirmwareRelease = {
 }
 
 export type Features = {
-    bootloader_hash?: string | null;
-    bootloader_mode?: boolean | null;
-    device_id: string | null;
-    firmware_present?: boolean | null;
+    bootloader_hash?: string;
+    bootloader_mode?: boolean;
+    device_id?: string;
+    firmware_present?: boolean;
     flags: number;
-    fw_major?: number | null;
-    fw_minor?: number | null;
-    fw_patch?: number | null;
-    fw_vendor?: string | null;
-    fw_vendor_keys?: string | null;
-    imported?: boolean | null;
+    fw_major?: number;
+    fw_minor?: number;
+    fw_patch?: number;
+    fw_vendor?: string;
+    fw_vendor_keys?: string;
+    imported?: boolean;
     initialized: boolean;
-    label: string | null;
-    language?: string | null;
+    label: string;
+    language?: string;
     major_version: number;
     minor_version: number;
     model: string;
@@ -79,6 +79,7 @@ export type Features = {
 export type Device =
         | {
               type: 'acquired';
+              id?: string;
               path: string;
               label: string;
               firmware: DeviceFirmwareStatus;

diff --git a/src/ts/types/trezor/device.d.ts b/src/ts/types/trezor/device.d.ts
@@ -42,20 +42,20 @@ export interface FirmwareRelease {
 }
 
 export interface Features {
-    bootloader_hash?: string | null;
-    bootloader_mode?: boolean | null;
-    device_id: string | null;
-    firmware_present?: boolean | null;
+    bootloader_hash?: string;
+    bootloader_mode?: boolean;
+    device_id?: string;
+    firmware_present?: boolean;
     flags: number;
-    fw_major?: number | null;
-    fw_minor?: number | null;
-    fw_patch?: number | null;
-    fw_vendor?: string | null;
-    fw_vendor_keys?: string | null;
-    imported?: boolean | null;
+    fw_major?: number;
+    fw_minor?: number;
+    fw_patch?: number;
+    fw_vendor?: string;
+    fw_vendor_keys?: string;
+    imported?: boolean;
     initialized: boolean;
-    label: string | null;
-    language?: string | null;
+    label: string;
+    language?: string;
     major_version: number;
     minor_version: number;
     model: string;
@@ -78,6 +78,7 @@ export interface Features {
 export type Device =
     | {
           type: 'acquired';
+          id?: string;
           path: string;
           label: string;
           firmware: DeviceFirmwareStatus;