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(wallet): fix qml warnings and errors in Wallet

This commit is contained in:
Ivan Belyakov 2024-01-31 16:45:23 +01:00 committed by IvanBelyakoff
parent c995ff20b0
commit 49adcd9b59
6 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Wallet/WalletLayout.qml
View File

@ -69,7 +69,7 @@ Item {
d.displayAllAddresses()
if (!!rightPanelStackView.currentItem.resetView) {
if (rightPanelStackView.currentItem && !!rightPanelStackView.currentItem.resetView) {
rightPanelStackView.currentItem.resetView()
}

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

@ -198,7 +198,7 @@ QtObject {
// Collectibles Filters
property var collectiblesList: activityController.collectiblesModel
property var collectiblesFilter: []
property bool loadingCollectibles: activityController.status.loadingCollectibles
readonly property bool loadingCollectibles: activityController.status.loadingCollectibles ? activityController.status.loadingCollectibles : false
function updateCollectiblesModel() {
activityController.updateCollectiblesModel()
}

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

@ -34,7 +34,7 @@ FocusScope {
networkConnectionStore: root.networkConnectionStore
}
Column {
Item {
id: contentWrapper
Layout.fillWidth: true
Layout.fillHeight: true

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

@ -70,8 +70,6 @@ RightTabBaseView {
}
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 0
ImportKeypairInfo {

36
ui/app/AppLayouts/Wallet/views/walletconnect/WalletConnectSDK.qml
View File

@ -183,29 +183,33 @@ Item {
function getPairings(callback) {
console.debug(`WC WalletConnectSDK.wcCall.getPairings;`)
d.engine.runJavaScript(`wc.getPairings()`, function(result) {
console.debug(`WC WalletConnectSDK.wcCall.getPairings; result: ${JSON.stringify(result, null, 2)}`)
if (d.engine) {
d.engine.runJavaScript(`wc.getPairings()`, function(result) {
console.debug(`WC WalletConnectSDK.wcCall.getPairings; result: ${JSON.stringify(result, null, 2)}`)
if (callback && result) {
callback(result)
}
})
if (callback && result) {
callback(result)
}
})
}
}
function getActiveSessions(callback) {
console.debug(`WC WalletConnectSDK.wcCall.getActiveSessions;`)
d.engine.runJavaScript(`wc.getActiveSessions()`, function(result) {
let allSessions = ""
for (var key of Object.keys(result)) {
allSessions += `\nsessionTopic: ${key} relatedPairingTopic: ${result[key].pairingTopic}`;
}
console.debug(`WC WalletConnectSDK.wcCall.getActiveSessions; result: ${allSessions}`)
if (d.engine) {
d.engine.runJavaScript(`wc.getActiveSessions()`, function(result) {
let allSessions = ""
for (var key of Object.keys(result)) {
allSessions += `\nsessionTopic: ${key} relatedPairingTopic: ${result[key].pairingTopic}`;
}
console.debug(`WC WalletConnectSDK.wcCall.getActiveSessions; result: ${allSessions}`)
if (callback && result) {
callback(result)
}
})
if (callback && result) {
callback(result)
}
})
}
}
function pair(pairLink) {

4
ui/imports/shared/controls/TransactionDelegate.qml
View File

@ -60,7 +60,7 @@ StatusListItem {
readonly property double outFiatValue: isModelDataValid && isMultiTransaction ? rootStore.getFiatValue(outCryptoValue, modelData.outSymbol, currentCurrency): 0.0
readonly property double feeCryptoValue: 0.0 // TODO fill when bridge data is implemented
readonly property double feeFiatValue: 0.0 // TODO fill when bridge data is implemented
readonly property string communityName: isModelDataValid ? modelData.communityName : ""
readonly property string communityName: isModelDataValid && modelData.communityName ? modelData.communityName : ""
readonly property string networkColor: isModelDataValid ? rootStore.getNetworkColor(modelData.chainId) : ""
readonly property string networkName: isModelDataValid ? rootStore.getNetworkFullName(modelData.chainId) : ""
readonly property string networkNameIn: isMultiTransaction ? rootStore.getNetworkFullName(modelData.chainIdIn) : ""
@ -68,7 +68,7 @@ StatusListItem {
readonly property string addressNameTo: isModelDataValid ? walletRootStore.getNameForAddress(modelData.recipient) : ""
readonly property string addressNameFrom: isModelDataValid ? walletRootStore.getNameForAddress(modelData.sender) : ""
readonly property bool isNFT: isModelDataValid && modelData.isNFT
readonly property bool isCommunityAssetViaAirdrop: isModelDataValid && modelData.isCommunityAssetViaAirdrop
readonly property bool isCommunityAssetViaAirdrop: isModelDataValid && modelData.isCommunityAssetViaAirdrop ? modelData.isCommunityAssetViaAirdrop : false
readonly property string transactionValue: {
if (!isModelDataValid) {