From 40ed061402cc1c16f076fbb197511f742234b8f6 Mon Sep 17 00:00:00 2001
From: Sale Djenic <aleksandardjenic@status.im>
Date: Wed, 10 Jan 2024 09:40:15 +0100
Subject: [PATCH] bug(savedaddresses): the send modal should be run clicking on
 the send button of a saved address item

Fixes #13172
---
 test/ui-test/src/screens/StatusWalletScreen.py      |  2 ++
 .../Wallet/controls/SavedAddressesDelegate.qml      | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/ui-test/src/screens/StatusWalletScreen.py b/test/ui-test/src/screens/StatusWalletScreen.py
index 4256eb5e15..cf3fe4b001 100644
--- a/test/ui-test/src/screens/StatusWalletScreen.py
+++ b/test/ui-test/src/screens/StatusWalletScreen.py
@@ -228,6 +228,7 @@ class AddressesView(BaseElement):
 
     def open_edit_address_popup(self, address_name: str) -> 'EditSavedAddressPopup':
         address = self._get_saved_address_by_name(address_name)
+        address.hover()
         address.open_context_menu()
         self._edit_saved_address_menu_item.wait_until_appears()
         self._edit_saved_address_menu_item.click()
@@ -236,6 +237,7 @@ class AddressesView(BaseElement):
 
     def delete_saved_address(self, address_name):
         address = self._get_saved_address_by_name(address_name)
+        address.hover()
         address.open_context_menu()
         self._delete_saved_address_menu_item.wait_until_appears()
         self._delete_saved_address_menu_item.click()
diff --git a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
index d632d1e6b8..e93a8365b5 100644
--- a/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
+++ b/ui/app/AppLayouts/Wallet/controls/SavedAddressesDelegate.qml
@@ -63,10 +63,6 @@ StatusListItem {
 
     statusListItemIcon.hoverEnabled: true
 
-    onClicked: {
-        root.openSendModal(d.visibleAddress)
-    }
-
     statusListItemComponentsSlot.spacing: 0
     property bool showButtons: sensor.containsMouse
 
@@ -78,10 +74,17 @@ StatusListItem {
     }
 
     components: [
+        StatusRoundButton {
+            visible: !!root.name && root.showButtons
+            type: StatusRoundButton.Type.Quinary
+            radius: 8
+            icon.name: "send"
+            onClicked: root.openSendModal(d.visibleAddress)
+        },
         StatusRoundButton {
             objectName: "savedAddressView_Delegate_menuButton_" + root.name
             visible: !!root.name
-            icon.color: root.showButtons ? Theme.palette.directColor1 : Theme.palette.baseColor1
+            enabled: root.showButtons
             type: StatusRoundButton.Type.Quinary
             radius: 8
             icon.name: "more"