feat(connect): dispatch call in progress event - needed for immediate…

… feedback in suite when called from outside
trezor · Oct 2, 2024 · 10a19b9 · 10a19b9
1 parent dbdfa54
commit 10a19b9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/packages/connect/src/core/index.ts b/packages/connect/src/core/index.ts
@@ -518,7 +518,12 @@ const onCall = async (context: CoreContext, message: IFrameCallMessage) => {
         return Promise.resolve();
     }
 
-    return await onCallDevice(context, message, method);
+    // it totally does not belong here. todo: discuss with marek
+    sendCoreMessage(createUiMessage(UI.CALL_IN_PROGRESS, true));
+
+    return await onCallDevice(context, message, method).finally(() => {
+        sendCoreMessage(createUiMessage(UI.CALL_IN_PROGRESS, false));
+    });
 };
 
 const onCallDevice = async (
@@ -570,7 +575,6 @@ const onCallDevice = async (
     const device = tempDevice;
 
     method.setDevice(device);
-
     // find pending calls to this device
     const previousCall = callMethods.filter(
         call => call && call !== method && call.devicePath === method.devicePath,

diff --git a/packages/connect/src/events/ui-request.ts b/packages/connect/src/events/ui-request.ts
@@ -24,6 +24,7 @@ export const UI_REQUEST = {
     FIRMWARE_NOT_COMPATIBLE: 'ui-device_firmware_not_compatible',
     FIRMWARE_NOT_INSTALLED: 'ui-device_firmware_not_installed',
     FIRMWARE_PROGRESS: 'ui-firmware-progress',
+    CALL_IN_PROGRESS: 'ui-call_in_progress',
 
     /** connect is waiting for device to be automatically reconnected */
     FIRMWARE_RECONNECT: 'ui-firmware_reconnect',
@@ -157,6 +158,12 @@ export interface UiRequestSetOperation {
     payload: string;
 }
 
+// todo: is it request? not really. at least naming, ( if not category) is misleading here
+export interface UiRequestCallInProgress {
+    type: typeof UI_REQUEST.CALL_IN_PROGRESS;
+    payload: boolean;
+}
+
 export interface UiRequestPermission {
     type: typeof UI_REQUEST.REQUEST_PERMISSION;
     payload: {
@@ -292,7 +299,8 @@ export type UiEvent =
     | FirmwareException
     | FirmwareReconnect
     | UiRequestAddressValidation
-    | UiRequestSetOperation;
+    | UiRequestSetOperation
+    | UiRequestCallInProgress;
 
 export type UiEventMessage = UiEvent & { event: typeof UI_EVENT };
 

diff --git a/suite-common/connect-init/src/connectInitThunks.ts b/suite-common/connect-init/src/connectInitThunks.ts
@@ -47,6 +47,10 @@ export const connectInitThunk = createThunk(
         TrezorConnect.on(UI_EVENT, ({ event: _, ...action }) => {
             // dispatch event as action
             dispatch(action);
+
+            if (action.type === 'ui-call_in_progress') {
+                dispatch(lockDevice(action.payload));
+            }
         });
 
         TrezorConnect.on(TRANSPORT_EVENT, ({ event: _, ...action }) => {
@@ -100,9 +104,7 @@ export const connectInitThunk = createThunk(
             const original: any = TrezorConnect[key];
             if (!original) return;
             (TrezorConnect[key] as any) = async (params: any) => {
-                dispatch(lockDevice(true));
                 const result = await synchronize(() => original(params));
-                dispatch(lockDevice(false));
 
                 return result;
             };