fixup! fix(connect): ignore disposed error in devicelist

trezor · Dec 3, 2024 · bde5bd8 · bde5bd8
1 parent 6877cc0
commit bde5bd8
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/packages/connect/src/device/DeviceList.ts b/packages/connect/src/device/DeviceList.ts
@@ -270,12 +270,7 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
 
         return promise
             .then(this.createInitPromise.bind(this))
-            .catch(error => {
-                if (error.message === 'Disposed') {
-                    return;
-                }
-                throw error;
-            })
+            .catch(() => {})
             .finally(() => {
                 this.rejectPending = undefined;
             });
@@ -359,19 +354,12 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
         this.on(DEVICE.CONNECT, onDeviceConnect);
         this.on(DEVICE.CONNECT_UNACQUIRED, onDeviceConnect);
 
-        return promise
-            .catch(error => {
-                if (error.message === 'Disposed') {
-                    return;
-                }
-                throw error;
-            })
-            .finally(() => {
-                this.rejectPending = undefined;
-                clearTimeout(autoResolveTransportEventTimeout);
-                this.off(DEVICE.CONNECT, onDeviceConnect);
-                this.off(DEVICE.CONNECT_UNACQUIRED, onDeviceConnect);
-            });
+        return promise.finally(() => {
+            this.rejectPending = undefined;
+            clearTimeout(autoResolveTransportEventTimeout);
+            this.off(DEVICE.CONNECT, onDeviceConnect);
+            this.off(DEVICE.CONNECT_UNACQUIRED, onDeviceConnect);
+        });
     }
 
     getDeviceCount() {