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(warnings): Fixed qml warnings 

Fixed qml warnings
This commit is contained in:
Noelia 2023-06-09 11:54:47 +02:00 committed by Noelia
parent f227a92cf1
commit 02baf36070
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml
View File

@ -31,7 +31,8 @@ StatusComboBox {
property string selectedChainName: "" property string selectedChainName: ""
property string selectedIconUrl: "" property string selectedIconUrl: ""
readonly property bool allSelected: root.enabledNetworks.count === root.allNetworks.count readonly property bool allSelected: (!!root.enabledNetworks && !!root.allNetworks) ? root.enabledNetworks.count === root.allNetworks.count :
false
// Persist selection between selectPopupLoader reloads // Persist selection between selectPopupLoader reloads
property var currentModel: layer1Networks property var currentModel: layer1Networks

60
ui/imports/utils/Utils.qml
View File

@ -765,35 +765,37 @@ QtObject {
} }
function getColorForId(colorId) { function getColorForId(colorId) {
switch(colorId.toUpperCase()) { if(colorId) {
case Constants.walletAccountColors.primary.toUpperCase(): switch(colorId.toUpperCase()) {
return Theme.palette.customisationColors.blue case Constants.walletAccountColors.primary.toUpperCase():
case Constants.walletAccountColors.purple.toUpperCase(): return Theme.palette.customisationColors.blue
return Theme.palette.customisationColors.purple case Constants.walletAccountColors.purple.toUpperCase():
case Constants.walletAccountColors.orange.toUpperCase(): return Theme.palette.customisationColors.purple
return Theme.palette.customisationColors.orange case Constants.walletAccountColors.orange.toUpperCase():
case Constants.walletAccountColors.army.toUpperCase(): return Theme.palette.customisationColors.orange
return Theme.palette.customisationColors.army case Constants.walletAccountColors.army.toUpperCase():
case Constants.walletAccountColors.turquoise.toUpperCase(): return Theme.palette.customisationColors.army
return Theme.palette.customisationColors.turquoise case Constants.walletAccountColors.turquoise.toUpperCase():
case Constants.walletAccountColors.sky.toUpperCase(): return Theme.palette.customisationColors.turquoise
return Theme.palette.customisationColors.sky case Constants.walletAccountColors.sky.toUpperCase():
case Constants.walletAccountColors.yellow.toUpperCase(): return Theme.palette.customisationColors.sky
return Theme.palette.customisationColors.yellow case Constants.walletAccountColors.yellow.toUpperCase():
case Constants.walletAccountColors.pink.toUpperCase(): return Theme.palette.customisationColors.yellow
return Theme.palette.customisationColors.pink case Constants.walletAccountColors.pink.toUpperCase():
case Constants.walletAccountColors.copper.toUpperCase(): return Theme.palette.customisationColors.pink
return Theme.palette.customisationColors.copper case Constants.walletAccountColors.copper.toUpperCase():
case Constants.walletAccountColors.camel.toUpperCase(): return Theme.palette.customisationColors.copper
return Theme.palette.customisationColors.camel case Constants.walletAccountColors.camel.toUpperCase():
case Constants.walletAccountColors.magenta.toUpperCase(): return Theme.palette.customisationColors.camel
return Theme.palette.customisationColors.magenta case Constants.walletAccountColors.magenta.toUpperCase():
case Constants.walletAccountColors.yinYang.toUpperCase(): return Theme.palette.customisationColors.magenta
return Theme.palette.customisationColors.yinYang case Constants.walletAccountColors.yinYang.toUpperCase():
case Constants.walletAccountColors.undefinedAccount.toUpperCase(): return Theme.palette.customisationColors.yinYang
return Theme.palette.baseColor1 case Constants.walletAccountColors.undefinedAccount.toUpperCase():
default: return Theme.palette.baseColor1
return Theme.palette.customisationColors.blue default:
return Theme.palette.customisationColors.blue
}
} }
} }