From 91dbe2b7f67cf233a812e4a73b34d01ae719b8fb Mon Sep 17 00:00:00 2001
From: cpl121 <100352899+cpl121@users.noreply.github.com>
Date: Mon, 20 Nov 2023 11:00:34 +0100
Subject: [PATCH] fix: error when a transaction is rejected with ledger (#7531)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: error when a transaction is rejected with ledger

* fix: close send popup for ledger devices

---------

Co-authored-by: Begoña Alvarez <balvarez@boxfish.studio>
---
 .../popups/send/SendConfirmationPopup.svelte  | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
index 2cfb3f3fcb6..6d1e94b05d0 100644
--- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -1,7 +1,23 @@
 <script lang="ts">
-    import { onMount } from 'svelte'
-    import { get } from 'svelte/store'
-    import { FontWeight, Tab, TextHintVariant, TextType } from 'shared/components/enums'
+    import { PopupId, closePopup, openPopup, updatePopupProps } from '@auxiliary/popup'
+    import { prepareOutput, selectedAccount } from '@core/account'
+    import { handleError } from '@core/error/handlers/handleError'
+    import { localize } from '@core/i18n'
+    import { ledgerPreparedOutput } from '@core/ledger'
+    import { checkActiveProfileAuth, isActiveLedgerProfile } from '@core/profile'
+    import { TimePeriod } from '@core/utils'
+    import { sendOutput } from '@core/wallet/actions'
+    import { TokenStandard } from '@core/wallet/enums'
+    import { NewTransactionType, newTransactionDetails, updateNewTransactionDetails } from '@core/wallet/stores'
+    import { NewTokenTransactionDetails, NftActivity, TransactionActivity, VestingActivity } from '@core/wallet/types'
+    import {
+        getDefaultTransactionOptions,
+        getOutputParameters,
+        getStorageDepositFromOutput,
+        validateSendConfirmation,
+    } from '@core/wallet/utils'
+    import { getInitialExpirationDate, rebuildActivity } from '@core/wallet/utils/send/sendUtils'
+    import { CommonOutput, Output } from '@iota/sdk/out/types'
     import {
         ActivityInformation,
         BasicActivityDetails,
@@ -13,26 +29,10 @@
         TextHint,
         Toggle,
     } from '@ui'
-    import { prepareOutput, selectedAccount } from '@core/account'
-    import { localize } from '@core/i18n'
-    import { checkActiveProfileAuth, isActiveLedgerProfile } from '@core/profile'
-    import { TimePeriod } from '@core/utils'
-    import { TokenStandard } from '@core/wallet/enums'
-    import { newTransactionDetails, NewTransactionType, updateNewTransactionDetails } from '@core/wallet/stores'
-    import { sendOutput } from '@core/wallet/actions'
-    import {
-        validateSendConfirmation,
-        getStorageDepositFromOutput,
-        getOutputParameters,
-        getDefaultTransactionOptions,
-    } from '@core/wallet/utils'
-    import { closePopup, openPopup, PopupId, updatePopupProps } from '@auxiliary/popup'
-    import { NewTokenTransactionDetails, NftActivity, TransactionActivity, VestingActivity } from '@core/wallet/types'
-    import { CommonOutput, Output } from '@iota/sdk/out/types'
-    import { ledgerPreparedOutput } from '@core/ledger'
-    import { handleError } from '@core/error/handlers/handleError'
     import { ToggleColor } from '@ui/inputs/Toggle.svelte'
-    import { getInitialExpirationDate, rebuildActivity } from '@core/wallet/utils/send/sendUtils'
+    import { FontWeight, Tab, TextHintVariant, TextType } from 'shared/components/enums'
+    import { onMount } from 'svelte'
+    import { get } from 'svelte/store'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
     export let isSendAndClosePopup: boolean = false
@@ -164,8 +164,17 @@
     }
 
     async function sendOutputAndClosePopup(): Promise<void> {
-        await sendOutput(preparedOutput)
-        closePopup()
+        try {
+            await sendOutput(preparedOutput)
+            closePopup()
+        } catch (err) {
+            handleError(err)
+        } finally {
+            // make sure to close the popup if the user is using a ledger device
+            if ($isActiveLedgerProfile) {
+                closePopup(true)
+            }
+        }
     }
 
     async function onConfirmClick(): Promise<void> {