fix(efp): Refactor following addresses UI and logic

Extracted FollowingAddressMenu into a separate QML component and updated FollowingAddressesDelegate to use a menuRequested signal for menu actions. Improved property requirements and data flow in FollowingAddresses and FollowingAddressesView, and updated connections for refreshing and updating following addresses. Minor UI text adjustment in WalletFollowingAddressesHeader and code cleanup in RootStore. This refactor improves modularity, maintainability, and clarity of the following addresses feature.

Author: caveman-eth

src/app/modules/main/module.nim

@@ -102,7 +102,6 @@ type
     walletAccountService: wallet_account_service.Service
     savedAddressService: saved_address_service.Service
     followingAddressService: following_address_service.Service
-    keychainService: keychain_service.Service
     networkConnectionService: network_connection_service.Service
     stickersService: stickers_service.Service
     communityTokensService: community_tokens_service.Service
@@ -217,7 +216,6 @@ proc newModule*[T](
   result.walletAccountService = walletAccountService
   result.savedAddressService = savedAddressService
   result.followingAddressService = followingAddressService
-  result.keychainService = keychainService
   result.stickersService = stickersService
   result.communityTokensService = communityTokensService
 

src/app/modules/main/wallet_section/following_addresses/model.nim

@@ -35,7 +35,6 @@ QtObject:
       result &= fmt"""[{i}]:({$self.items[i]})"""
 
   proc countChanged(self: Model) {.signal.}
-  proc itemChanged(self: Model, address: string) {.signal.}
 
   proc getCount*(self: Model): int {.slot.} =
     self.items.len
@@ -82,10 +81,6 @@ QtObject:
     self.beginResetModel()
     self.items = items
     self.endResetModel()
-    self.countChanged()
-
-    for item in items:
-        self.itemChanged(item.getAddress())
 
   proc getItemByAddress*(self: Model, address: string): Item =
     if address.len == 0:

src/app/modules/main/wallet_section/following_addresses/module.nim

@@ -47,6 +47,7 @@ method loadFollowingAddresses*(self: Module, userAddress: string) =
     ))
   )
   self.view.totalFollowingCountChanged()
+  self.view.followingAddressesUpdated(userAddress)
 
 method load*(self: Module) =
   try:

ui/app/AppLayouts/Wallet/WalletLayout.qml

@@ -249,6 +249,7 @@ Item {
         id: cmpSavedAddresses
 
         SavedAddressesView {
+            rootStore: RootStore
             networkConnectionStore: root.networkConnectionStore
             networksStore: root.networksStore
 
@@ -261,7 +262,8 @@ Item {
     Component {
         id: cmpFollowingAddresses
         FollowingAddressesView {
-            rootStore: root.store
+            rootStore: RootStore
+            contactsStore: root.contactsStore
             networkConnectionStore: root.networkConnectionStore
             networksStore: root.networksStore
 

ui/app/AppLayouts/Wallet/controls/FollowingAddressMenu.qml

@@ -0,0 +1,140 @@
+import QtQuick
+import QtQuick.Controls
+
+import utils
+
+import StatusQ
+import StatusQ.Controls
+import StatusQ.Components
+import StatusQ.Core
+import StatusQ.Core.Theme
+import StatusQ.Core.Utils as StatusQUtils
+import StatusQ.Popups
+
+import shared.controls
+import shared.popups
+import shared.stores as SharedStores
+
+import "../popups"
+import "../controls"
+import "../stores"
+import ".."
+
+import AppLayouts.Wallet.stores as WalletStores
+
+StatusMenu {
+    id: root
+
+    property string name
+    property string address
+    property string ensName
+    property var tags
+    property var activeNetworks
+
+    readonly property int maxHeight: 341
+    height: implicitHeight > maxHeight ? maxHeight : implicitHeight
+
+    QtObject {
+        id: d
+        readonly property string visibleAddress: !!root.ensName ? root.ensName : root.address
+    }
+
+    function openMenu(parent, x, y, model) {
+        root.name = model.name;
+        root.address = model.address;
+        root.ensName = model.ensName;
+        root.tags = model.tags;
+        popup(parent, x, y);
+    }
+
+    onClosed: {
+        root.name = "";
+        root.address = "";
+        root.ensName = ""
+        root.tags = []
+    }
+
+    StatusSuccessAction {
+        id: copyAddressAction
+        objectName: "copyFollowingAddressAction"
+        successText: qsTr("Address copied")
+        text: qsTr("Copy address")
+        icon.name: "copy"
+        timeout: 1500
+        autoDismissMenu: true
+        onTriggered: ClipboardUtils.setText(d.visibleAddress)
+    }
+
+    StatusAction {
+        text: qsTr("Show address QR")
+        objectName: "showQrFollowingAddressAction"
+        assetSettings.name: "qr"
+        onTriggered: {
+            Global.openShowQRPopup({
+                                       showSingleAccount: true,
+                                       showForSavedAddress: false,
+                                       switchingAccounsEnabled: false,
+                                       hasFloatingButtons: false,
+                                       name: root.name,
+                                       address: root.address
+                                   })
+        }
+    }
+
+    StatusAction {
+        text: qsTr("View activity")
+        objectName: "viewActivityFollowingAddressAction"
+        assetSettings.name: "wallet"
+        onTriggered: {
+            Global.changeAppSectionBySectionType(Constants.appSection.wallet,
+                                                 WalletLayout.LeftPanelSelection.AllAddresses,
+                                                 WalletLayout.RightPanelSelection.Activity,
+                                                 {savedAddress: root.address})
+        }
+    }
+
+    StatusMenuSeparator {}
+
+    BlockchainExplorersMenu {
+        id: blockchainExplorersMenu
+        flatNetworks: root.activeNetworks
+        onNetworkClicked: {
+            let link = Utils.getUrlForAddressOnNetwork(shortname, isTestnet, d.visibleAddress ? d.visibleAddress : root.ensName);
+            Global.openLinkWithConfirmation(link, StatusQUtils.StringUtils.extractDomainFromLink(link));
+        }
+    }
+
+    StatusMenuSeparator { }
+
+    StatusAction {
+        text: {
+            var savedAddr = WalletStores.RootStore.getSavedAddress(root.address)
+            var isSaved = savedAddr && savedAddr.address !== ""
+            return isSaved ? qsTr("Already in saved addresses") : qsTr("Add to saved addresses")
+        }
+        assetSettings.name: {
+            var savedAddr = WalletStores.RootStore.getSavedAddress(root.address)
+            var isSaved = savedAddr && savedAddr.address !== ""
+            return isSaved ? "star-icon" : "star-icon-outline"
+        }
+        objectName: "addToSavedAddressesAction"
+        enabled: {
+            var savedAddr = WalletStores.RootStore.getSavedAddress(root.address)
+            return !(savedAddr && savedAddr.address !== "")
+        }
+        onTriggered: {
+            var nameToUse = root.ensName || root.address
+            if (root.ensName && root.ensName.includes(".")) {
+                nameToUse = root.ensName.split(".")[0]
+            }
+            
+            Global.openAddEditSavedAddressesPopup({
+                addAddress: true,
+                address: root.address,
+                name: nameToUse,
+                ens: root.ensName
+            })
+        }
+    }
+}
+

ui/app/AppLayouts/Wallet/controls/FollowingAddressesDelegate.qml

@@ -39,16 +39,14 @@ StatusListItem {
     property alias sendButton: sendButton
     property alias starButton: starButton
 
-    signal aboutToOpenPopup()
     signal openSendModal(string recipient)
+    signal menuRequested(var menuModel)
 
     enum Usage {
         Delegate,
         Item
     }
 
-    implicitWidth: ListView.view ? ListView.view.width : 0
-
     title: name
     objectName: name || "followingAddressDelegate"
     subTitle: WalletUtils.addressToDisplay(root.address, false, sensor.containsMouse)
@@ -151,134 +149,14 @@ StatusListItem {
             radius: 8
             icon.name: "more"
             onClicked: {
-                menu.openMenu(this, x + width - menu.width - statusListItemComponentsSlot.spacing, y + height + Theme.halfPadding,
-                    {
-                        name: root.name,
-                        address: root.address,
-                        ensName: root.ensName,
-                        tags: root.tags,
-                    }
-                );
+                root.menuRequested({
+                    name: root.name,
+                    address: root.address,
+                    ensName: root.ensName,
+                    tags: root.tags,
+                })
             }
 
         }
     ]
-
-    StatusMenu {
-        id: menu
-        property string name
-        property string address
-        property string ensName
-        property var tags
-
-        readonly property int maxHeight: 341
-        height: implicitHeight > maxHeight ? maxHeight : implicitHeight
-
-        function openMenu(parent, x, y, model) {
-            menu.name = model.name;
-            menu.address = model.address;
-            menu.ensName = model.ensName;
-            menu.tags = model.tags;
-            popup(parent, x, y);
-        }
-        onClosed: {
-            menu.name = "";
-            menu.address = "";
-            menu.ensName = ""
-            menu.tags = []
-        }
-
-        StatusSuccessAction {
-            id: copyAddressAction
-            objectName: "copyFollowingAddressAction"
-            successText: qsTr("Address copied")
-            text: qsTr("Copy address")
-            icon.name: "copy"
-            timeout: 1500
-            autoDismissMenu: true
-            onTriggered: ClipboardUtils.setText(d.visibleAddress)
-        }
-
-        StatusAction {
-            text: qsTr("Show address QR")
-            objectName: "showQrFollowingAddressAction"
-            assetSettings.name: "qr"
-            onTriggered: {
-                if (root.usage === FollowingAddressesDelegate.Usage.Item) {
-                    root.aboutToOpenPopup()
-                }
-                Global.openShowQRPopup({
-                                           showSingleAccount: true,
-                                           showForSavedAddress: false,
-                                           switchingAccounsEnabled: false,
-                                           hasFloatingButtons: false,
-                                           name: menu.name,
-                                           address: menu.address
-                                       })
-            }
-        }
-
-        StatusAction {
-            text: qsTr("View activity")
-            objectName: "viewActivityFollowingAddressAction"
-            assetSettings.name: "wallet"
-            onTriggered: {
-                if (root.usage === FollowingAddressesDelegate.Usage.Item) {
-                    root.aboutToOpenPopup()
-                }
-                Global.changeAppSectionBySectionType(Constants.appSection.wallet,
-                                                     WalletLayout.LeftPanelSelection.AllAddresses,
-                                                     WalletLayout.RightPanelSelection.Activity,
-                                                     {savedAddress: menu.address})
-            }
-        }
-
-        StatusMenuSeparator {}
-
-        BlockchainExplorersMenu {
-            id: blockchainExplorersMenu
-            flatNetworks: root.activeNetworks
-            onNetworkClicked: {
-                let link = Utils.getUrlForAddressOnNetwork(shortname, isTestnet, d.visibleAddress ? d.visibleAddress : root.ensName);
-                Global.openLinkWithConfirmation(link, StatusQUtils.StringUtils.extractDomainFromLink(link));
-            }
-        }
-
-        StatusMenuSeparator { }
-
-        StatusAction {
-            text: {
-                var savedAddr = WalletStores.RootStore.getSavedAddress(menu.address)
-                var isSaved = savedAddr && savedAddr.address !== ""
-                return isSaved ? qsTr("Already in saved addresses") : qsTr("Add to saved addresses")
-            }
-            assetSettings.name: {
-                var savedAddr = WalletStores.RootStore.getSavedAddress(menu.address)
-                var isSaved = savedAddr && savedAddr.address !== ""
-                return isSaved ? "star-icon" : "star-icon-outline"
-            }
-            objectName: "addToSavedAddressesAction"
-            enabled: {
-                var savedAddr = WalletStores.RootStore.getSavedAddress(menu.address)
-                return !(savedAddr && savedAddr.address !== "")
-            }
-            onTriggered: {
-                if (root.usage === FollowingAddressesDelegate.Usage.Item) {
-                    root.aboutToOpenPopup()
-                }
-                
-                var nameToUse = menu.ensName || menu.address
-                if (menu.ensName && menu.ensName.includes(".")) {
-                    nameToUse = menu.ensName.split(".")[0]
-                }
-                
-                Global.openAddEditSavedAddressesPopup({
-                    addAddress: true,
-                    address: menu.address,
-                    name: nameToUse,
-                    ens: menu.ensName
-                })
-            }
-        }
-    }
 }

ui/app/AppLayouts/Wallet/controls/qmldir

@@ -11,6 +11,7 @@ DappsComboBox 1.0 DappsComboBox.qml
 EditSlippagePanel 1.0 EditSlippagePanel.qml
 FilterComboBox 1.0 FilterComboBox.qml
 FollowingAddressesDelegate 1.0 FollowingAddressesDelegate.qml
+FollowingAddressMenu 1.0 FollowingAddressMenu.qml
 InformationTileAssetDetails 1.0 InformationTileAssetDetails.qml
 ManageTokenMenuButton 1.0 ManageTokenMenuButton.qml
 ManageTokensCommunityTag 1.0 ManageTokensCommunityTag.qml

ui/app/AppLayouts/Wallet/panels/WalletFollowingAddressesHeader.qml

@@ -46,7 +46,7 @@ Control {
 
         Layout.preferredHeight: 38
 
-        text: qsTr("+Add via EFP")
+        text: qsTr("Add via EFP")
         size: StatusBaseButton.Size.Small
         normalColor: Theme.palette.primaryColor3
         hoverColor: Theme.palette.primaryColor2

ui/app/AppLayouts/Wallet/stores/RootStore.qml

@@ -78,10 +78,7 @@ QtObject {
     }
 
     function getPrimaryAccountAddress() {
-        var firstAccount = SQUtils.ModelUtils.getFirstModelEntryIf(root.accounts, (account) => {
-            return true  // Get the first account
-        })
-        return firstAccount ? firstAccount.address : ""
+        return SQUtils.ModelUtils.get(root.accounts, 0, "address") || ""
     }
 
     property var nonWatchAccounts: SortFilterProxyModel {