From 55d39aa7c74a41240b8bfa5eeb2778994b9dfd3e Mon Sep 17 00:00:00 2001 From: Anthony Laibe Date: Mon, 23 Jan 2023 10:09:43 +0100 Subject: [PATCH] fix(@wallet): preview button instead of enter password/pin fixes #9119 --- ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml | 6 +----- ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml | 1 - ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml b/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml index d65f41959f..7917d57b8d 100644 --- a/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml +++ b/ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml @@ -22,7 +22,6 @@ Item { property string pathSubFix: "" property bool isLoading: RootStore.derivedAddressesLoading property bool pathError: Utils.isInvalidPath(RootStore.derivedAddressesError) - property string enterPasswordIcon: "" property alias selectedAddress: selectedDerivedAddress.title property alias selectedAddressAvailable: selectedDerivedAddress.enabled @@ -141,10 +140,7 @@ Item { StatusButton { visible: _internal.showEnterPinPassButton - text: derivedAddresses.selectedKeyUidMigratedToKeycard || userProfile.isKeycardUser? - qsTr("Enter PIN") : - qsTr("Enter password") - icon.name: derivedAddresses.enterPasswordIcon + text: qsTr("Preview address") highlighted: focus onClicked: _internal.runAction() diff --git a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml index 674cea68eb..5b0e37b2e3 100644 --- a/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml +++ b/ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml @@ -278,7 +278,6 @@ StatusModal { expandable: true expandableComponent: AdvancedAddAccountView { width: parent.width - enterPasswordIcon: d.addAccountIcon onCalculateDerivedPath: { if (d.selectedKeyUidMigratedToKeycard) { d.password = "" diff --git a/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml b/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml index f331578223..a8b8c76049 100644 --- a/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml +++ b/ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml @@ -167,7 +167,6 @@ ColumnLayout { selectedKeyUid: advancedSection.selectedKeyUid selectedKeyUidMigratedToKeycard: advancedSection.selectedKeyUidMigratedToKeycard selectedPath: advancedSection.path - enterPasswordIcon: advancedSection.enterPasswordIcon Component.onCompleted: { advancedSection.selectedAddress = Qt.binding(function() { return derivedAddressesPanel.selectedAddress})