Merge pull request #7979 from LedgerHQ/LIVE-13084-LLM-Flex-Stax-Error…

…-loading-too-long-when-user-power-off-his-Flex-during-CLS-uploading

fix(llm): triggering proper error on CLS mobile disconnection

.changeset/tame-brooms-breathe.md

@@ -0,0 +1,6 @@
+---
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+---
+
+Triggering proper errors on CLS

apps/ledger-live-mobile/src/components/CustomLockScreenDeviceAction/index.tsx

@@ -88,7 +88,19 @@ const CustomImageDeviceAction: React.FC<Props & { remountMe: () => void }> = ({
     [dispatch, onResult],
   );
 
-  const { error, imageCommitRequested, imageLoadRequested, loadingImage, progress } = status;
+  const {
+    error: CLSError,
+    imageCommitRequested,
+    imageLoadRequested,
+    loadingImage,
+    progress,
+  } = status;
+  const [error, setError] = useState<null | Error>(null);
+  useEffect(() => {
+    if (CLSError) {
+      setError(CLSError);
+    }
+  }, [CLSError]);
   const isError = !!error;
   const isRefusedOnStaxError =
     (error as unknown) instanceof ImageLoadRefusedOnDevice ||

libs/ledger-live-common/src/hw/customLockScreenLoad.ts

@@ -1,11 +1,12 @@
 import { Observable, from, of, throwError } from "rxjs";
-import { catchError, concatMap, delay, mergeMap } from "rxjs/operators";
+import { catchError, concatMap, delay, mergeMap, timeout } from "rxjs/operators";
 import {
   DeviceOnDashboardExpected,
   ManagerNotEnoughSpaceError,
   StatusCodes,
   TransportError,
   TransportStatusError,
+  DisconnectedDevice,
 } from "@ledgerhq/errors";
 import { getDeviceModel } from "@ledgerhq/devices";
 
@@ -74,9 +75,7 @@ export default function loadImage({ deviceId, request }: Input): Observable<Load
   const sub = withDevice(deviceId)(
     transport =>
       new Observable(subscriber => {
-        const timeoutSub = of<LoadImageEvent>({
-          type: "unresponsiveDevice",
-        })
+        const timeoutSub = of<LoadImageEvent>({ type: "unresponsiveDevice" })
           .pipe(delay(1000))
           .subscribe(e => subscriber.next(e));
 
@@ -213,6 +212,14 @@ export default function loadImage({ deviceId, request }: Input): Observable<Load
           sub.unsubscribe();
         };
       }),
+  ).pipe(
+    timeout(5000),
+    catchError(err => {
+      if (err.name === "TimeoutError") {
+        return throwError(() => new DisconnectedDevice());
+      }
+      return throwError(() => err);
+    }),
   );
 
   return sub as Observable<LoadImageEvent>;