LIVE-2641 Prevent emitting an event when device descriptor is null (#…

…1070) * LIVE-2641 Prevent emitting an event when device descriptor is null * LIVE-2641 Add changeset * LIVE-2641 fix linting * LIVE-2641 Fix linting
LedgerHQ · Aug 29, 2022 · 533e658 · 533e658
1 parent 10916fa
commit 533e658
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.changeset/rotten-seals-mix.md b/.changeset/rotten-seals-mix.md
@@ -0,0 +1,6 @@
+---
+"live-mobile": patch
+"@ledgerhq/react-native-hw-transport-ble": patch
+---
+
+Fix crash when scanning for bluetooth devices
diff --git a/apps/ledger-live-mobile/src/react-native-hw-transport-ble/makeMock.ts b/apps/ledger-live-mobile/src/react-native-hw-transport-ble/makeMock.ts
@@ -1,6 +1,11 @@
 import Transport from "@ledgerhq/hw-transport";
 import { from } from "rxjs";
 import { take, first, filter } from "rxjs/operators";
+import type { Device } from "@ledgerhq/react-native-hw-transport-ble/lib/types";
+import type {
+  Observer as TransportObserver,
+  DescriptorEvent,
+} from "@ledgerhq/hw-transport";
 import type { ApduMock } from "../logic/createAPDUMock";
 import { hookRejections } from "../logic/debugReject";
 import { e2eBridgeSubject } from "../../e2e/bridge/client";
@@ -36,7 +41,7 @@ export default (opts: Opts) => {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     static setLogLevel = (_param: string) => {};
 
-    static listen(observer: any) {
+    static listen(observer: TransportObserver<DescriptorEvent<Device>>) {
       return e2eBridgeSubject
         .pipe(
           filter(msg => msg.type === "add"),

diff --git a/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx b/apps/ledger-live-mobile/src/screens/PairDevices/Scanning.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { Observable } from "rxjs";
 import { InfiniteLoader } from "@ledgerhq/native-ui";
 import { getInfosForServiceUuid, DeviceModelId } from "@ledgerhq/devices";
+import { DescriptorEvent } from "@ledgerhq/hw-transport";
 import logger from "../../logger";
 import { BLE_SCANNING_NOTHING_TIMEOUT } from "../../constants";
 import { knownDevicesSelector } from "../../reducers/ble";
@@ -61,7 +62,7 @@ export default function Scanning({ onTimeout, onError, onSelect }: Props) {
     }, BLE_SCANNING_NOTHING_TIMEOUT);
 
     const sub = Observable.create(TransportBLE.listen).subscribe({
-      next: (e: { type: string; descriptor: any }) => {
+      next: (e: DescriptorEvent<Device>) => {
         if (e.type === "add") {
           clearTimeout(timeout);
           const device = e.descriptor;

diff --git a/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts b/libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts
@@ -339,7 +339,7 @@ export default class BluetoothTransport extends Transport {
    * Scan for bluetooth Ledger devices
    */
   static listen(
-    observer: TransportObserver<DescriptorEvent<Device | null>>
+    observer: TransportObserver<DescriptorEvent<Device>>
   ): TransportSubscription {
     log("ble-verbose", "listen...");
     let unsubscribed;
@@ -369,11 +369,14 @@ export default class BluetoothTransport extends Transport {
 
             const res = retrieveInfos(device);
             const deviceModel = res && res.deviceModel;
-            observer.next({
-              type: "add",
-              descriptor: device,
-              deviceModel,
-            });
+
+            if (device) {
+              observer.next({
+                type: "add",
+                descriptor: device,
+                deviceModel,
+              });
+            }
           }
         );
       }