bugfix: LIVE-11803 - rename device broken if an app is open

LedgerHQ · Apr 30, 2024 · cdb2fc9 · cdb2fc9
1 parent de5de2d
commit cdb2fc9
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/.changeset/sharp-rabbits-accept.md b/.changeset/sharp-rabbits-accept.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Add a quitApp before launching the renameDevice device flow
diff --git a/libs/ledger-live-common/src/hw/actions/implementations.ts b/libs/ledger-live-common/src/hw/actions/implementations.ts
@@ -46,7 +46,11 @@ type PollingImplementationConfig = {
 
 type PollingImplementationParams<Request, EmittedEvents> = {
   deviceSubject: ReplaySubject<Device | null | undefined>;
-  task: (params: { deviceId: string; request: Request }) => Observable<EmittedEvents>;
+  task: (params: {
+    deviceId: string;
+    request: Request;
+    wired: boolean;
+  }) => Observable<EmittedEvents>;
   request: Request;
   config?: PollingImplementationConfig;
   // retryableWithDelayDisconnectedErrors has default value of [DisconnectedDevice, DisconnectedDeviceDuringOperation]
@@ -120,7 +124,7 @@ const pollingImplementation: Implementation = <SpecificType, GenericRequestType>
             device: currentDevice,
             replaceable: !firstRound,
           }),
-          task({ deviceId: currentDevice.deviceId, request }),
+          task({ deviceId: currentDevice.deviceId, request, wired: currentDevice.wired }),
         )
           .pipe(
             // Any event should clear the initialTimeout.
@@ -230,7 +234,7 @@ const eventImplementation: Implementation = <SpecificType, GenericRequestType>(
 
             return concat(
               initialEvent,
-              !device ? EMPTY : task({ deviceId: device.deviceId, request }),
+              !device ? EMPTY : task({ deviceId: device.deviceId, request, wired: device.wired }),
             );
           }),
           catchError((error: Error) =>

diff --git a/libs/ledger-live-common/src/hw/renameDevice.ts b/libs/ledger-live-common/src/hw/renameDevice.ts
@@ -1,9 +1,11 @@
 import { Observable, concat, from, of } from "rxjs";
-import { map, catchError } from "rxjs/operators";
+import { map, catchError, switchMap, delay } from "rxjs/operators";
 import { withDevice } from "./deviceAccess";
 import editDeviceName from "./editDeviceName";
+import quitApp from "./quitApp";
 
 export type RenameDeviceEvent =
+  | { type: "quitApp" }
   | {
       type: "unresponsiveDevice";
     }
@@ -19,15 +21,29 @@ export type RenameDeviceRequest = { name: string };
 export type Input = {
   deviceId: string;
   request: RenameDeviceRequest;
+  wired: boolean;
 };
 
-export default function renameDevice({ deviceId, request }: Input): Observable<RenameDeviceEvent> {
+export default function renameDevice({
+  deviceId,
+  request,
+  wired,
+}: Input): Observable<RenameDeviceEvent> {
   const { name } = request;
 
-  const sub = withDevice(deviceId)(
+  const quitAppFlow = withDevice(deviceId)(transport =>
+    concat(
+      from(quitApp(transport)).pipe(delay(wired ? 100 : 3000)),
+      of(<RenameDeviceEvent>{
+        type: "quitApp",
+      }),
+    ),
+  );
+
+  const renameAppFlow = withDevice(deviceId)(
     transport =>
       new Observable(o => {
-        const sub = concat(
+        const innerSub = concat(
           of(<RenameDeviceEvent>{
             type: "permission-requested",
           }),
@@ -45,10 +61,12 @@ export default function renameDevice({ deviceId, request }: Input): Observable<R
           .subscribe(e => o.next(e));
 
         return () => {
-          sub.unsubscribe();
+          innerSub.unsubscribe();
         };
       }),
   );
 
+  const sub = quitAppFlow.pipe(switchMap(_ => concat(renameAppFlow)));
+
   return sub as Observable<RenameDeviceEvent>;
 }