feat: error handling llm

LedgerHQ · Sep 17, 2024 · 9713e05 · 9713e05
1 parent a2f08e9
commit 9713e05
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/apps/ledger-live-mobile/src/components/RootNavigator/types/CustomErrorNavigator.ts b/apps/ledger-live-mobile/src/components/RootNavigator/types/CustomErrorNavigator.ts
@@ -3,6 +3,6 @@ import { ScreenName } from "~/const";
 
 export type CustomErrorNavigatorParamList = {
   [ScreenName.CustomErrorScreen]: {
-    error?: SwapLiveError;
+    error?: SwapLiveError | Error;
   };
 };
diff --git a/apps/ledger-live-mobile/src/components/WebPTXPlayer/CustomHandlers.ts b/apps/ledger-live-mobile/src/components/WebPTXPlayer/CustomHandlers.ts
@@ -88,12 +88,19 @@ export function usePTXCustomHandlers(manifest: WebviewProps["manifest"]) {
                 onResult: result => {
                   if (result.error) {
                     onCancel(result.error);
+                    navigation.pop();
+                    navigation.navigate(NavigatorName.CustomError, {
+                      screen: ScreenName.CustomErrorScreen,
+                      params: {
+                        error: result.error,
+                      },
+                    });
                   }
                   if (result.operation) {
                     onSuccess(result.operation.id);
                   }
                   setDevice(undefined);
-                  navigation.pop();
+                  !result.error && navigation.pop();
                 },
               },
             });

diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json
@@ -947,7 +947,8 @@
     "CustomError": {
       "title": "Sorry, try again.",
       "description": "The server could not handle your request. Please try again later or contact Ledger Support.",
-      "errorCode": "Code: {{errorCode}}"
+      "errorCode": "Code: {{errorCode}}",
+      "errorMessage": "{{errorMessage}}"
     },
     "TrustchainEjected": {
       "title": "Not Synced anymore"
@@ -6955,4 +6956,4 @@
       }
     }
   }
-}
+}
diff --git a/apps/ledger-live-mobile/src/screens/CustomError/index.tsx b/apps/ledger-live-mobile/src/screens/CustomError/index.tsx
@@ -28,10 +28,19 @@ export default function CustomError({ route }: CustomErrorPropsProps) {
         <Text variant="body" textAlign={"center"}>
           {t("errors.CustomError.description")}
 
-          <Trans
-            i18nKey="errors.CustomError.errorCode"
-            values={{ errorCode: error?.cause.swapCode }}
-          />
+          {error && "cause" in error && error.cause?.swapCode && (
+            <Trans
+              i18nKey="errors.CustomError.errorCode"
+              values={{ errorCode: error?.cause.swapCode }}
+            />
+          )}
+
+          {error && "message" in error && error?.message && (
+            <Trans
+              i18nKey="errors.CustomError.errorMessage"
+              values={{ errorMessage: error?.message }}
+            />
+          )}
         </Text>
       </Flex>
     </SafeAreaView>