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(shared-addresses): wrong account color and type 

- rename `watchOnlyAccounts` to `nonWatchAccounts` to reflect what the
property returns
- some warning fixes

Fixes #12023
This commit is contained in:
Lukáš Tinkl 2023-08-29 17:28:41 +02:00 committed by Lukáš Tinkl
parent 0405ea0b89
commit a42ac076ca
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storybook/src/Models/WalletAccountsModel.qml
View File

@ -94,7 +94,7 @@ ListModel {
{
name: "Tag Heuer (watch)",
emoji: "⌚",
colorId: Constants.walletAccountColors.cooper,
colorId: Constants.walletAccountColors.copper,
color: "#CB6256",
address: "0x7F47C2e98a4BBf5487E6fb082eC2D9Ab0E6d8883",
walletType: Constants.watchWalletType,

5
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -158,7 +158,7 @@ StackLayout {
sourceComponent: CommunitySettingsView {
id: communitySettingsView
rootStore: root.rootStore
walletAccountsModel: WalletStore.RootStore.watchOnlyAccounts
walletAccountsModel: WalletStore.RootStore.nonWatchAccounts
chatCommunitySectionModule: root.rootStore.chatCommunitySectionModule
community: sectionItemModel
@ -185,7 +185,7 @@ StackLayout {
property string communityId
loginType: root.rootStore.loginType
walletAccountsModel: WalletStore.RootStore.watchOnlyAccounts
walletAccountsModel: WalletStore.RootStore.nonWatchAccounts
permissionsModel: {
root.rootStore.prepareTokenModelForCommunity(communityIntroDialog.communityId)
return root.rootStore.permissionsModel
@ -221,5 +221,4 @@ StackLayout {
}
}
}
}

2
ui/app/AppLayouts/Communities/views/CommunityColumnView.qml
View File

@ -125,7 +125,7 @@ Item {
imageSrc: communityData.image
accessType: communityData.access
loginType: root.store.loginType
walletAccountsModel: WalletStore.RootStore.watchOnlyAccounts
walletAccountsModel: WalletStore.RootStore.nonWatchAccounts
permissionsModel: {
root.store.prepareTokenModelForCommunity(communityData.id)
return root.store.permissionsModel

2
ui/app/AppLayouts/Communities/views/HoldingsSelectionModel.qml
View File

@ -33,7 +33,7 @@ SortFilterProxyModel {
: collectiblesModel
const item = PermissionsHelpers.getTokenByKey(model, key)
return item ? item.shortName || item.name : ""
return item ? item.symbol || item.shortName || item.name : ""
}
function getText(type, key, amount) {

1
ui/app/AppLayouts/Profile/stores/WalletStore.qml
View File

@ -11,6 +11,7 @@ QtObject {
property var collectibles: root.walletModule.collectiblesModel
property var accountSensitiveSettings: Global.appIsReady? localAccountSensitiveSettings : null
property var dappList: Global.appIsReady? dappPermissionsModule.dapps : null
readonly property bool areTestNetworksEnabled: networksModule.areTestNetworksEnabled
readonly property var networks: networksModule.networks

2
ui/app/AppLayouts/Profile/views/CommunitiesView.qml
View File

@ -233,7 +233,7 @@ SettingsContentBase {
}
loginType: chatStore.loginType
walletAccountsModel: WalletStore.RootStore.watchOnlyAccounts
walletAccountsModel: WalletStore.RootStore.nonWatchAccounts
permissionsModel: {
root.rootStore.prepareTokenModelForCommunity(communityIntroDialog.communityId)
return root.rootStore.permissionsModel

2
ui/app/AppLayouts/Wallet/stores/RootStore.qml
View File

@ -44,7 +44,7 @@ QtObject {
]
}
property var watchOnlyAccounts: SortFilterProxyModel {
property var nonWatchAccounts: SortFilterProxyModel {
sourceModel: receiveAccounts
proxyRoles: [
ExpressionRole {

2
ui/app/AppLayouts/Wallet/views/TransactionDetailView.qml
View File

@ -356,7 +356,7 @@ Item {
// Used for Bridge to display 'To' network Protocol contract address
address: "" // TODO fill protocol contract address for 'to' network for Bridge
symbol: "" // TODO fill protocol name for Bridge
networkName: transactionHeader.networknameOut
networkName: transactionHeader.networkNameOut
shortNetworkName: d.networkShortNameOut
visible: !!subTitle && d.transactionType === Constants.TransactionType.Bridge
}

2
ui/app/AppLayouts/stores/RootStore.qml
View File

@ -42,7 +42,7 @@ QtObject {
readonly property var permissionsModel: !!root.communitiesModuleInst.spectatedCommunityPermissionModel ?
root.communitiesModuleInst.spectatedCommunityPermissionModel : null
property var walletAccountsModel: WalletStore.RootStore.watchOnlyAccounts
property var walletAccountsModel: WalletStore.RootStore.nonWatchAccounts
property var assetsModel: SortFilterProxyModel {
sourceModel: communitiesModuleInst.tokenList
proxyRoles: ExpressionRole {

2
ui/app/mainui/Popups.qml
View File

@ -712,7 +712,7 @@ QtObject {
//selectedSharedAddresses: [???]
//selectedAirdropAddress: "???"
loginType: chatStore.loginType
walletAccountsModel: WalletStore.RootStore.receiveAccounts
walletAccountsModel: root.rootStore.walletAccountsModel
permissionsModel: {
root.rootStore.prepareTokenModelForCommunity(editSharedAddressesPopup.communityId)
return root.rootStore.permissionsModel