From 9a2ce483a5da2cd4b34f9413588ebb26a1595d25 Mon Sep 17 00:00:00 2001
From: Kieran Allen <132384348+kallen-ledger@users.noreply.github.com>
Date: Wed, 29 May 2024 11:36:27 +0100
Subject: [PATCH] [Fix/LIVE-12702]: Use targetAccountCurrency name if
 accountNameSelector returns null or undefined (#6960)

* fix: use targetAccountCurrency name if accountNameSelector returns null or undefined

* chore: changeset

* fix: if token account, then include parent account name

* Revert "fix: if token account, then include parent account name"

This reverts commit fc43907a973d322fd94494d5f63f143c431e9c8b.
---
 .changeset/clever-elephants-add.md                    |  5 +++++
 .../renderer/components/DeviceAction/rendering.tsx    | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/clever-elephants-add.md

diff --git a/.changeset/clever-elephants-add.md b/.changeset/clever-elephants-add.md
new file mode 100644
index 00000000000..574e1cecd9b
--- /dev/null
+++ b/.changeset/clever-elephants-add.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Use targetAccountCurrency name if accountNameSelector returns null or undefined.
diff --git a/apps/ledger-live-desktop/src/renderer/components/DeviceAction/rendering.tsx b/apps/ledger-live-desktop/src/renderer/components/DeviceAction/rendering.tsx
index c5bb0391a31..2a470cd4c88 100644
--- a/apps/ledger-live-desktop/src/renderer/components/DeviceAction/rendering.tsx
+++ b/apps/ledger-live-desktop/src/renderer/components/DeviceAction/rendering.tsx
@@ -964,9 +964,14 @@ export const renderSwapDeviceConfirmation = ({
   const sourceAccountName = accountNameSelector(walletState, {
     accountId: exchange.fromAccount.id,
   });
-  const targetAccountName = accountNameSelector(walletState, {
-    accountId: exchange.toAccount.id,
-  });
+
+  // If account exists already then grab the name set.
+  // However if account has not yet been set then use the
+  // crypto/token currency name as the target account.
+  const targetAccountName =
+    accountNameSelector(walletState, {
+      accountId: exchange.toAccount.id,
+    }) ?? targetAccountCurrency.name;
 
   const providerName = getProviderName(exchangeRate.provider);
   const noticeType = getNoticeType(exchangeRate.provider);