From b0d535b72d9c6ac7e474de2b598bc4964a515d93 Mon Sep 17 00:00:00 2001
From: Louis Paquet <louis.paquet@ledger.fr>
Date: Tue, 8 Oct 2024 13:41:01 +0200
Subject: [PATCH] Fix/live 14403 (#8040)

* feat(LIVE-14367): Add operation id for thorswap history

* feat(LIVE-14367): changeset

* fix(LIVE-14403): Fix crash demo 0

* fix(LIVE-14403): changeset
---
 .changeset/eighty-sheep-join.md                              | 5 +++++
 .changeset/popular-flies-perform.md                          | 5 +++++
 libs/ledger-live-common/src/exchange/swap/types.ts           | 1 +
 .../src/exchange/swap/updateAccountSwapStatus.ts             | 4 ++--
 libs/ledger-live-common/src/exchange/swap/utils/index.ts     | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/eighty-sheep-join.md
 create mode 100644 .changeset/popular-flies-perform.md

diff --git a/.changeset/eighty-sheep-join.md b/.changeset/eighty-sheep-join.md
new file mode 100644
index 000000000000..030dcbdb3eae
--- /dev/null
+++ b/.changeset/eighty-sheep-join.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Add operationID for thorswap history
diff --git a/.changeset/popular-flies-perform.md b/.changeset/popular-flies-perform.md
new file mode 100644
index 000000000000..ac5a99f7886d
--- /dev/null
+++ b/.changeset/popular-flies-perform.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+fix crash demo 0
diff --git a/libs/ledger-live-common/src/exchange/swap/types.ts b/libs/ledger-live-common/src/exchange/swap/types.ts
index 1b093fae5350..88ee733bdfee 100644
--- a/libs/ledger-live-common/src/exchange/swap/types.ts
+++ b/libs/ledger-live-common/src/exchange/swap/types.ts
@@ -173,6 +173,7 @@ type ValidSwapStatus = "pending" | "onhold" | "expired" | "finished" | "refunded
 export type SwapStatusRequest = {
   provider: string;
   swapId: string;
+  operationId?: string;
 };
 export type SwapStatus = {
   provider: string;
diff --git a/libs/ledger-live-common/src/exchange/swap/updateAccountSwapStatus.ts b/libs/ledger-live-common/src/exchange/swap/updateAccountSwapStatus.ts
index f341ce7d20fc..ceece6e8e36e 100644
--- a/libs/ledger-live-common/src/exchange/swap/updateAccountSwapStatus.ts
+++ b/libs/ledger-live-common/src/exchange/swap/updateAccountSwapStatus.ts
@@ -10,13 +10,13 @@ const maybeGetUpdatedSwapHistory = async (
   const pendingSwapIds: SwapStatusRequest[] = [];
   let accountNeedsUpdating = false;
   let consolidatedSwapHistory: SwapOperation[] = [];
-
   if (swapHistory) {
-    for (const { provider, swapId, status } of swapHistory) {
+    for (const { provider, swapId, status, operationId } of swapHistory) {
       if (isSwapOperationPending(status)) {
         pendingSwapIds.push({
           provider,
           swapId,
+          ...(provider === "thorswap" && { operationId }),
         });
       }
     }
diff --git a/libs/ledger-live-common/src/exchange/swap/utils/index.ts b/libs/ledger-live-common/src/exchange/swap/utils/index.ts
index b54857425329..7543a845154d 100644
--- a/libs/ledger-live-common/src/exchange/swap/utils/index.ts
+++ b/libs/ledger-live-common/src/exchange/swap/utils/index.ts
@@ -61,7 +61,7 @@ export const isRegistrationRequired = async (provider: string): Promise<boolean>
 };
 
 export const getProviderName = (provider: string): string => {
-  const { displayName } = SWAP_DATA_CDN[provider];
+  const { displayName } = provider ? SWAP_DATA_CDN[provider] : { displayName: "" };
   return displayName;
 };