feat(connect): emit pin request only in thp handshake with interactions

Author: marekrjpolak

packages/connect/src/device/Device.ts

@@ -580,11 +580,9 @@ export class Device extends TypedEmitter<DeviceEvents> {
 
                 if (this.protocol.name === 'v2') {
                     const withInteraction = !!fn;
-                    await getThpChannel(this, withInteraction);
-                    if (this.getThpState()?.isAutoconnectPaired || withInteraction) {
+                    this.busy = await getThpChannel(this, withInteraction);
+                    if (!this.busy) {
                         await this.getFeatures();
-                    } else {
-                        this.busy = 'thp-locked';
                     }
                 } else if (fn) {
                     await this.initialize(!!options.useCardanoDerivation);

packages/connect/src/device/thp/index.ts

@@ -1,3 +1,4 @@
+import { DEVICE } from '../../events/device';
 import type { Device } from '../Device';
 import { createThpChannel, thpHandshake } from './handshake';
 import { thpPairing } from './pairing';
@@ -9,26 +10,40 @@ export { createThpSession } from './session';
 export const getThpChannel = async (device: Device, withInteraction?: boolean) => {
     const thpState = device.getThpState();
 
+    if (!thpState) return;
+
     try {
-        if (thpState?.phase === 'handshake') {
+        if (thpState.phase === 'handshake') {
             await createThpChannel(device);
             try {
                 await thpHandshake(device);
             } catch (error) {
                 if (error.code === 'ThpDeviceLocked') {
-                    // Device is pin-locked, retry handshake with tryToUnlock param
                     thpState.resetState();
+                    if (!withInteraction) {
+                        return 'pin-locked';
+                    }
+
+                    // Device is pin-locked and interactions enabled, retry handshake with tryToUnlock param
+                    device.emit(DEVICE.BUTTON, {
+                        device,
+                        payload: { code: 'ButtonRequest_PinEntry' },
+                    });
                     await createThpChannel(device);
                     await thpHandshake(device, true);
                 } else {
                     throw error;
                 }
             }
         }
-        if (thpState?.phase === 'pairing' && withInteraction) {
+        if (thpState.phase === 'pairing' && withInteraction) {
             // start pairing with UI interaction
             await thpPairing(device);
         }
+
+        if (thpState.phase !== 'paired') {
+            return 'thp-locked';
+        }
     } catch (error) {
         thpState?.resetState();