feat(LIVE-11102): add rate expired error message (#6592)

* feat(LIVE-11102): add rate expired error message * feat(LIVE-11102): add changeset * feat(LIVE-11102): typo * feat(LIVE-11102): typo and check keyMessage not status * feat(LIVE-11102): add messageKey to error
LedgerHQ · Apr 11, 2024 · 21f9d07 · 21f9d07
1 parent 9729140
commit 21f9d07
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/.changeset/itchy-tools-visit.md b/.changeset/itchy-tools-visit.md
@@ -0,0 +1,6 @@
+---
+"ledger-live-desktop": patch
+"@ledgerhq/live-common": patch
+---
+
+Add expired message error
diff --git a/apps/ledger-live-desktop/static/i18n/en/app.json b/apps/ledger-live-desktop/static/i18n/en/app.json
@@ -5469,6 +5469,10 @@
       "title": "Account not scanned by full node",
       "description": "Please configure your full node to scan for the accounts associated with this device. Your full node must first scan the blockchain for this account before you can add it to your portfolio."
     },
+    "SwapRateExpiredError": {
+      "title": "Rate Expired",
+      "description": "The exchange transaction could not be completed as the rate has expired. Please refresh the rates and try your swap again."
+    },
     "SwapGenericAPIError": {
       "title": "Something went wrong",
       "description": "The exchange transaction did not go through. Please try again or contact support."

diff --git a/libs/ledger-live-common/src/errors.ts b/libs/ledger-live-common/src/errors.ts
@@ -104,6 +104,7 @@ export const SwapExchangeRateAmountTooLowOrTooHigh = createCustomErrorClass(
 );
 
 export const SwapGenericAPIError = createCustomErrorClass("SwapGenericAPIError");
+export const SwapRateExpiredError = createCustomErrorClass("SwapRateExpiredError");
 
 export const JSONRPCResponseError = createCustomErrorClass("JSONRPCResponseError");
 export const JSONDecodeError = createCustomErrorClass("JSONDecodeError");

diff --git a/libs/ledger-live-common/src/exchange/swap/initSwap.ts b/libs/ledger-live-common/src/exchange/swap/initSwap.ts
@@ -15,7 +15,11 @@ import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getAccountUnit, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
 import { getEnv } from "@ledgerhq/live-env";
-import { SwapGenericAPIError, TransactionRefusedOnDevice } from "../../errors";
+import {
+  SwapGenericAPIError,
+  SwapRateExpiredError,
+  TransactionRefusedOnDevice,
+} from "../../errors";
 import perFamily from "../../generated/exchange";
 import { withDevice } from "../../hw/deviceAccess";
 import { delay } from "../../promise";
@@ -98,7 +102,14 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
           });
 
           if (unsubscribed || !res || !res.data) return;
-        } catch (e) {
+        } catch (e: any) {
+          if (e.msg.messageKey == "WRONG_OR_EXPIRED_RATE_ID") {
+            o.next({
+              type: "init-swap-error",
+              error: new SwapRateExpiredError(),
+              swapId,
+            });
+          }
           o.next({
             type: "init-swap-error",
             error: new SwapGenericAPIError(),

diff --git a/libs/live-network/src/network.ts b/libs/live-network/src/network.ts
@@ -118,6 +118,7 @@ const makeError = (msg: string, status: number, url: string | undefined, method:
     status,
     url,
     method,
+    msg,
   };
   return (status || "").toString().startsWith("4")
     ? new LedgerAPI4xx(msg, obj)