From 2e249f99412f4309d51bcfddc4bf57f6ce6e0a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukast@status.im>
Date: Wed, 25 Sep 2024 19:15:13 +0200
Subject: [PATCH] fix[WalletConnect] Incorrect authentication method icon on
 sign modal

- `loginType` was not propagated correctly, also due to a wrong
RootStore
- plus an evil typo: `account.migragedToKeycard` :)

Fixes #16089
---
 ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml   | 5 +++--
 ui/app/AppLayouts/Wallet/panels/WalletHeader.qml    | 3 ++-
 ui/app/AppLayouts/Wallet/views/LeftTabView.qml      | 5 ++---
 ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml b/ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml
index 8e9309caf4..e24ad135d2 100644
--- a/ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml
+++ b/ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml
@@ -163,7 +163,8 @@ DappsComboBox {
                 name: "",
                 address: "",
                 emoji: "",
-                colorId: 0
+                colorId: 0,
+                migratedToKeycard: false
             }
 
             readonly property var network: networkEntry.available ? networkEntry.item : {
@@ -171,7 +172,7 @@ DappsComboBox {
                 iconUrl: ""
             }
 
-            loginType: account.migragedToKeycard ? Constants.LoginType.Keycard : root.loginType
+            loginType: account.migratedToKeycard ? Constants.LoginType.Keycard : root.loginType
             formatBigNumber: (number, symbol, noSymbolOption) => root.wcService.walletRootStore.currencyStore.formatBigNumber(number, symbol, noSymbolOption)
             visible: true
 
diff --git a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
index 887e29da09..27c3b0687c 100644
--- a/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
@@ -30,6 +30,7 @@ Item {
     property WalletStores.RootStore walletStore
 
     property bool dappsEnabled
+    property int loginType // RootStore.loginType -> Constants.LoginType enum
 
     property alias headerButton: headerButton
     property alias networkFilter: networkFilter
@@ -145,7 +146,7 @@ Item {
 
 
                 wcService: Global.walletConnectService
-                loginType: root.store.loginType
+                loginType: root.loginType
                 selectedAccountAddress: root.walletStore.selectedAddress
             }
 
diff --git a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
index 1f432a5afa..2a105baae7 100644
--- a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
+++ b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.13
-import QtGraphicalEffects 1.13
+import QtQuick.Layouts 1.15
+import QtGraphicalEffects 1.15
 import SortFilterProxyModel 0.2
 
 import StatusQ.Core 0.1
@@ -461,6 +461,5 @@ Rectangle {
                 }
             }
         }
-
     }
 }
diff --git a/ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml b/ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml
index 82c14ff890..01f4882e89 100644
--- a/ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml
+++ b/ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.14
-import QtQuick.Layouts 1.14
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
 
 import StatusQ.Core 0.1
 
@@ -41,6 +41,7 @@ FocusScope {
             walletStore: WalletStores.RootStore
             networkConnectionStore: root.networkConnectionStore
             dappsEnabled: root.dappsEnabled
+            loginType: root.store.loginType
         }
 
         Item {