diff --git a/.changeset/clever-elephants-add.md b/.changeset/clever-elephants-add.md new file mode 100644 index 000000000000..574e1cecd9ba --- /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 c5bb0391a315..2a470cd4c881 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);