From 61f2bb8a74f91d2ad4117f54b4d642fdeb413eb1 Mon Sep 17 00:00:00 2001
From: Michal Iskierko <michaliskierko@gmail.com>
Date: Mon, 22 Aug 2022 17:35:39 +0200
Subject: [PATCH] fix(@desktop/onboarding): Hide current account from accounts
 list

Fix #7045
---
 .../panels/AccountMenuItemPanel.qml           | 11 ++-
 .../AppLayouts/Onboarding/views/LoginView.qml | 70 ++++++++++++-------
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml b/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
index 0ecb879939..656fae5696 100644
--- a/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
+++ b/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
@@ -10,7 +10,7 @@ import StatusQ.Popups 0.1
 import shared.controls.chat 1.0
 import utils 1.0
 
-MenuItem {
+Item {
     id: root
 
     property string label: ""
@@ -25,12 +25,17 @@ MenuItem {
 
     width: parent.width
     height: 64
-    background: Rectangle {
-        color: root.hovered ? Theme.palette.statusSelect.menuItemHoverBackgroundColor : Theme.palette.statusSelect.menuItemBackgroundColor
+    Rectangle {
+        anchors.fill: root
+        color: sensor.containsMouse ? Theme.palette.statusSelect.menuItemHoverBackgroundColor : Theme.palette.statusSelect.menuItemBackgroundColor
     }
+
     MouseArea {
+        id: sensor
         cursorShape: Qt.PointingHandCursor
         anchors.fill: root
+        hoverEnabled: true
+
         onClicked: {
             root.clicked()
         }
diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
index eb8761f657..eaf72f4fd6 100644
--- a/ui/app/AppLayouts/Onboarding/views/LoginView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
@@ -11,6 +11,8 @@ import StatusQ.Controls 0.1
 import StatusQ.Controls.Validators 0.1
 import StatusQ.Popups 0.1
 
+import SortFilterProxyModel 0.2
+
 import shared.panels 1.0
 import shared.popups 1.0
 import shared.status 1.0
@@ -263,37 +265,53 @@ Item {
                 closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
                 width: parent.width + Style.current.bigPadding
                 dim: false
-                Repeater {
-                    id: accounts
-                    model: root.startupStore.startupModuleInst.loginAccountsModel
-                    delegate: AccountMenuItemPanel {
-                        label: model.username
-                        image: model.thumbnailImage
-                        colorId: model.colorId
-                        colorHash: model.colorHash
-                        keycardCreatedAccount: model.keycardCreatedAccount
-                        onClicked: {
-                            root.startupStore.setSelectedLoginAccountByIndex(index)
-                            d.resetLogin()
-                            accountsPopup.close()
+
+                SortFilterProxyModel {
+                    id: proxyModel
+                    sourceModel: root.startupStore.startupModuleInst.loginAccountsModel
+                    filters: ValueFilter {
+                        roleName: "keyUid"
+                        value: root.startupStore.selectedLoginAccount.keyUid
+                        inverted: true
+                    }
+                }
+
+                Column {
+                    width: parent.width
+
+                    Repeater {
+                        model: proxyModel
+
+                        delegate: AccountMenuItemPanel {
+                            label: model.username
+                            image: model.thumbnailImage
+                            colorId: model.colorId
+                            colorHash: model.colorHash
+                            keycardCreatedAccount: model.keycardCreatedAccount
+                            onClicked: {
+                                d.resetLogin()
+                                accountsPopup.close()
+                                const realIndex = proxyModel.mapToSource(index)
+                                root.startupStore.setSelectedLoginAccountByIndex(realIndex)
+                            }
                         }
                     }
-                }
 
-                AccountMenuItemPanel {
-                    label: qsTr("Add new user")
-                    onClicked: {
-                        accountsPopup.close()
-                        root.startupStore.doSecondaryAction()
+                    AccountMenuItemPanel {
+                        label: qsTr("Add new user")
+                        onClicked: {
+                            accountsPopup.close()
+                            root.startupStore.doSecondaryAction()
+                        }
                     }
-                }
 
-                AccountMenuItemPanel {
-                    label: qsTr("Add existing Status user")
-                    iconSettings.name: "wallet"
-                    onClicked: {
-                        accountsPopup.close()
-                        root.startupStore.doTertiaryAction()
+                    AccountMenuItemPanel {
+                        label: qsTr("Add existing Status user")
+                        iconSettings.name: "wallet"
+                        onClicked: {
+                            accountsPopup.close()
+                            root.startupStore.doTertiaryAction()
+                        }
                     }
                 }
             }