status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Lukáš Tinkl 2024-09-25 19:15:13 +02:00 committed by Lukáš Tinkl
parent d09448e406
commit 2e249f9941
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Wallet/panels/DAppsWorkflow.qml
View File

@ -163,7 +163,8 @@ DappsComboBox {
name: "", name: "",
address: "", address: "",
emoji: "", emoji: "",
colorId: 0 colorId: 0,
migratedToKeycard: false
} }
readonly property var network: networkEntry.available ? networkEntry.item : { readonly property var network: networkEntry.available ? networkEntry.item : {
@ -171,7 +172,7 @@ DappsComboBox {
iconUrl: "" 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) formatBigNumber: (number, symbol, noSymbolOption) => root.wcService.walletRootStore.currencyStore.formatBigNumber(number, symbol, noSymbolOption)
visible: true visible: true

3
ui/app/AppLayouts/Wallet/panels/WalletHeader.qml
View File

@ -30,6 +30,7 @@ Item {
property WalletStores.RootStore walletStore property WalletStores.RootStore walletStore
property bool dappsEnabled property bool dappsEnabled
property int loginType // RootStore.loginType -> Constants.LoginType enum
property alias headerButton: headerButton property alias headerButton: headerButton
property alias networkFilter: networkFilter property alias networkFilter: networkFilter
@ -145,7 +146,7 @@ Item {
wcService: Global.walletConnectService wcService: Global.walletConnectService
loginType: root.store.loginType loginType: root.loginType
selectedAccountAddress: root.walletStore.selectedAddress selectedAccountAddress: root.walletStore.selectedAddress
} }

5
ui/app/AppLayouts/Wallet/views/LeftTabView.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.13 import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.13 import QtGraphicalEffects 1.15
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import StatusQ.Core 0.1 import StatusQ.Core 0.1
@ -461,6 +461,5 @@ Rectangle {
} }
} }
} }
} }
} }

5
ui/app/AppLayouts/Wallet/views/RightTabBaseView.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.14 import QtQuick 2.15
import QtQuick.Layouts 1.14 import QtQuick.Layouts 1.15
import StatusQ.Core 0.1 import StatusQ.Core 0.1
@ -41,6 +41,7 @@ FocusScope {
walletStore: WalletStores.RootStore walletStore: WalletStores.RootStore
networkConnectionStore: root.networkConnectionStore networkConnectionStore: root.networkConnectionStore
dappsEnabled: root.dappsEnabled dappsEnabled: root.dappsEnabled
loginType: root.store.loginType
} }
Item { Item {