@onekeyfe/hwk-trezor-adapter 1.2.8-alpha.117 → 1.2.8-alpha.119

package/dist/index.d.mts

@@ -124,8 +124,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private _getTrezorDeviceId;
     cancel(connectId?: string): void;
     /**
-     * Operation owning the running job: its queue key when pinned, else the live
-     * operation of its connectId, so a mid-call UI request can name it.
+     * Only the operation explicitly supplied to the running job owns its UI requests.
      */
     private _activeOperationId;
     /**

package/dist/index.d.ts

@@ -124,8 +124,7 @@ declare class TrezorAdapter implements IHardwareWallet {
     private _getTrezorDeviceId;
     cancel(connectId?: string): void;
     /**
-     * Operation owning the running job: its queue key when pinned, else the live
-     * operation of its connectId, so a mid-call UI request can name it.
+     * Only the operation explicitly supplied to the running job owns its UI requests.
      */
     private _activeOperationId;
     /**

package/dist/index.js

@@ -913,7 +913,8 @@ var _TrezorAdapter = class _TrezorAdapter {
       this._emitter.emit(data.type, { ...data, payload });
     };
     this._onUiEvent = (data) => {
-      this._emitter.emit("ui-event", data);
+      const operationId = this._activeOperationId();
+      this._emitter.emit("ui-event", operationId ? { ...data, operationId } : data);
     };
     this._onThpCredentialsChanged = (data) => {
       this._emitter.emit(_hwkadaptercore.DEVICE.TREZOR_THP_CREDENTIALS_CHANGED, {
@@ -1732,7 +1733,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       for (const key of queueKeys) {
         this._jobQueue.cancelActiveAndPending(key, userAbortReason);
       }
-      if (resolvedConnectId) {
+      if (resolvedConnectId && (activeJobId === void 0 || ownsConnectorInteraction)) {
         void this._connector.cancel(_nullishCoalesce(this._sessions.get(resolvedConnectId), () => ( resolvedConnectId)));
       }
       return;
@@ -1745,8 +1746,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
   }
   /**
-   * Operation owning the running job: its queue key when pinned, else the live
-   * operation of its connectId, so a mid-call UI request can name it.
+   * Only the operation explicitly supplied to the running job owns its UI requests.
    */
   _activeOperationId() {
     return this._operations.findOperationIdByJobKey(_optionalChain([this, 'access', _76 => _76._jobQueue, 'access', _77 => _77.getActiveJob, 'call', _78 => _78(), 'optionalAccess', _79 => _79.deviceId]));