wip

trezor · Oct 14, 2024 · a969d8a · a969d8a
1 parent 08bbef3
commit a969d8a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/packages/connect/src/device/Device.ts b/packages/connect/src/device/Device.ts
@@ -974,6 +974,7 @@ export class Device extends TypedEmitter<DeviceEvents> {
         const base = {
             path,
             name,
+            descriptor: this.originalDescriptor,
         };
         if (this.unreadableError) {
             return {

diff --git a/packages/connect/src/types/device.ts b/packages/connect/src/types/device.ts
@@ -1,3 +1,4 @@
+import { Descriptor } from '@trezor/transport';
 import type { PROTO } from '../constants';
 import type { ReleaseInfo } from './firmware';
 
@@ -68,6 +69,7 @@ export type FirmwareHashCheckResult =
 type BaseDevice = {
     path: string;
     name: string;
+    descriptor: Descriptor;
 };
 
 export type KnownDevice = BaseDevice & {

diff --git a/packages/suite/src/components/suite/ConnectDevicePrompt.tsx b/packages/suite/src/components/suite/ConnectDevicePrompt.tsx
@@ -76,6 +76,8 @@ const getMessageId = ({
             return isDesktop() ? 'TR_NO_TRANSPORT_DESKTOP' : 'TR_NO_TRANSPORT';
         case 'device-bootloader':
             return 'TR_DEVICE_CONNECTED_BOOTLOADER';
+        case 'device-unacquired':
+            return 'TR_DEVICE_CONNECTED_UNACQUIRED';
         default: {
             if (connected) {
                 return !showWarning ? 'TR_DEVICE_CONNECTED' : 'TR_DEVICE_CONNECTED_WRONG_STATE';

diff --git a/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx b/packages/suite/src/components/suite/PrerequisitesGuide/DeviceAcquire.tsx
@@ -27,9 +27,15 @@ export const DeviceAcquire = () => {
     const tips = [
         {
             key: 'device-meow',
-            heading: 'Device used elsewhere',
-            // @ts-expect-error
-            description: device.sessionOwner,
+            heading: <Translation id="TR_DEVICE_CONNECTED_UNACQUIRED" />,
+            description: (
+                <Translation
+                    id="TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION"
+                    values={{
+                        sessionOwner: device!.descriptor.sessionOwner,
+                    }}
+                />
+            ),
         },
         {
             key: 'device-acquire',

diff --git a/packages/suite/src/support/messages.ts b/packages/suite/src/support/messages.ts
@@ -6771,6 +6771,15 @@ export default defineMessages({
         id: 'TR_DEVICE_CONNECTED_BOOTLOADER_RECONNECT_IN_NORMAL_NO_TOUCH',
         defaultMessage: 'Reconnect the device without touching the screen.',
     },
+    TR_DEVICE_CONNECTED_UNACQUIRED: {
+        id: 'TR_DEVICE_CONNECTED_UNACQUIRED',
+        defaultMessage: 'Device used elsewhere',
+    },
+    TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION: {
+        id: 'TR_DEVICE_CONNECTED_UNACQUIRED_DESCRIPTION',
+        defaultMessage:
+            'App {sessionOwner} might be using the device right now. You may take the device for yourself.',
+    },
     TR_WIPE_OR_UPDATE: {
         id: 'TR_WIPE_OR_UPDATE',
         defaultMessage: 'Reset device or update firmware',