From bc1aa3b93422652f5c23d25099337afe2d7eb464 Mon Sep 17 00:00:00 2001 From: Khushboo Mehta Date: Mon, 6 May 2024 11:58:12 +0200 Subject: [PATCH] fix(@desktop/wallet): Send tag in SendModal doesn't show correct value fixes #14448 --- ui/imports/shared/popups/send/SendModal.qml | 2 +- ui/imports/shared/popups/send/views/NetworkSelector.qml | 5 ++--- .../popups/send/views/NetworksAdvancedCustomRoutingView.qml | 6 +++--- .../shared/popups/send/views/NetworksSimpleRoutingView.qml | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/imports/shared/popups/send/SendModal.qml b/ui/imports/shared/popups/send/SendModal.qml index 3c33a5cf1c..3a274f876e 100644 --- a/ui/imports/shared/popups/send/SendModal.qml +++ b/ui/imports/shared/popups/send/SendModal.qml @@ -466,7 +466,7 @@ StatusDialog { store: popup.store interactive: popup.interactive - selectedAccount: popup.preSelectedAccount + selectedRecipient: recipientLoader.selectedRecipient ensAddressOrEmpty: recipientLoader.resolvedENSAddress amountToSend: amountToSendInput.cryptoValueToSendFloat minSendCryptoDecimals: amountToSendInput.minSendCryptoDecimals diff --git a/ui/imports/shared/popups/send/views/NetworkSelector.qml b/ui/imports/shared/popups/send/views/NetworkSelector.qml index ae7b2506c7..057abbac72 100644 --- a/ui/imports/shared/popups/send/views/NetworkSelector.qml +++ b/ui/imports/shared/popups/send/views/NetworkSelector.qml @@ -17,7 +17,7 @@ Item { property var store property var currencyStore : store.currencyStore - property var selectedAccount + property var selectedRecipient property string ensAddressOrEmpty: "" property var selectedAsset property double amountToSend @@ -84,7 +84,6 @@ Item { minReceiveCryptoDecimals: root.minReceiveCryptoDecimals isLoading: root.isLoading store: root.store - selectedAccount: root.selectedAccount errorMode: root.errorMode errorType: root.errorType toNetworksList: root.toNetworksList @@ -113,7 +112,7 @@ Item { anchors.margins: Style.current.padding store: root.store customMode: tabBar.currentIndex === 2 - selectedAccount: root.selectedAccount + selectedRecipient: root.selectedRecipient ensAddressOrEmpty: root.ensAddressOrEmpty amountToSend: root.amountToSend minSendCryptoDecimals: root.minSendCryptoDecimals diff --git a/ui/imports/shared/popups/send/views/NetworksAdvancedCustomRoutingView.qml b/ui/imports/shared/popups/send/views/NetworksAdvancedCustomRoutingView.qml index 5bf581d882..fc142a16a7 100644 --- a/ui/imports/shared/popups/send/views/NetworksAdvancedCustomRoutingView.qml +++ b/ui/imports/shared/popups/send/views/NetworksAdvancedCustomRoutingView.qml @@ -16,7 +16,7 @@ ColumnLayout { id: root property var store - property var selectedAccount + property var selectedRecipient property string ensAddressOrEmpty: "" property double amountToSend property int minSendCryptoDecimals: 0 @@ -89,8 +89,8 @@ ColumnLayout { sourceComponent: NetworkCardsComponent { store: root.store receiverIdentityText: root.ensAddressOrEmpty.length > 0 ? - root.ensAddressOrEmpty : !!root.selectedAccount ? - StatusQUtils.Utils.elideText(root.selectedAccount.address, 6, 4).toUpperCase() : "" + root.ensAddressOrEmpty : !!root.selectedRecipient ? + StatusQUtils.Utils.elideText(root.selectedRecipient.address, 6, 4).toUpperCase() : "" amountToSend: root.amountToSend minSendCryptoDecimals: root.minSendCryptoDecimals minReceiveCryptoDecimals: root.minReceiveCryptoDecimals diff --git a/ui/imports/shared/popups/send/views/NetworksSimpleRoutingView.qml b/ui/imports/shared/popups/send/views/NetworksSimpleRoutingView.qml index e202d25b17..172cc09bd1 100644 --- a/ui/imports/shared/popups/send/views/NetworksSimpleRoutingView.qml +++ b/ui/imports/shared/popups/send/views/NetworksSimpleRoutingView.qml @@ -20,7 +20,6 @@ RowLayout { property bool isLoading: false property bool isBridgeTx: false property bool isCollectiblesTransfer: false - property var selectedAccount property var toNetworksList property var weiToEth: function(wei) {} property var formatCurrencyAmount: function () {}