From e45961232b35d9c8aef2103bedad9e60d60f7504 Mon Sep 17 00:00:00 2001 From: Ivan Belyakov Date: Mon, 8 Jul 2024 10:28:04 +0200 Subject: [PATCH] fix(wallet): cross chain send transaction is detected now as send not bridge --- ui/app/AppLayouts/Wallet/stores/RootStore.qml | 16 +++++++ .../Wallet/views/TransactionDetailView.qml | 2 +- .../shared/controls/TransactionDelegate.qml | 47 ++++++++++++++----- 3 files changed, 52 insertions(+), 13 deletions(-) diff --git a/ui/app/AppLayouts/Wallet/stores/RootStore.qml b/ui/app/AppLayouts/Wallet/stores/RootStore.qml index 8b19f249bf..93921cf0af 100644 --- a/ui/app/AppLayouts/Wallet/stores/RootStore.qml +++ b/ui/app/AppLayouts/Wallet/stores/RootStore.qml @@ -557,4 +557,20 @@ QtObject { const prefix = Constants.socialLinkPrefixesByType[Constants.socialLinkType.twitter] return prefix + twitterHandle } + + function transactionType(transaction) { + // Cross chain Send to another recipient is not a bridge, though involves bridging + if (transaction.txType == Constants.TransactionType.Bridge && transaction.sender !== transaction.recipient) { + if (root.showAllAccounts) { + const addresses = root.addressFilters + if (addresses.indexOf(transaction.sender) > -1) + return Constants.TransactionType.Send + + return Constants.TransactionType.Receive + } + return addressesEqual(root.selectedAddress, transaction.sender) ? Constants.TransactionType.Send : Constants.TransactionType.Receive + } + + return transaction.txType + } } diff --git a/ui/app/AppLayouts/Wallet/views/TransactionDetailView.qml b/ui/app/AppLayouts/Wallet/views/TransactionDetailView.qml index adc4d2bef4..bb4998349e 100644 --- a/ui/app/AppLayouts/Wallet/views/TransactionDetailView.qml +++ b/ui/app/AppLayouts/Wallet/views/TransactionDetailView.qml @@ -102,7 +102,7 @@ Item { } readonly property real feeEthValue: d.details ? RootStore.getFeeEthValue(d.details.totalFees) : 0 readonly property real feeFiatValue: d.isTransactionValid ? RootStore.getFiatValue(d.feeEthValue, Constants.ethToken) : 0 - readonly property int transactionType: d.isTransactionValid ? transaction.txType : Constants.TransactionType.Send + readonly property int transactionType: d.isTransactionValid ? WalletStores.RootStore.transactionType(transaction) : Constants.TransactionType.Send readonly property bool isBridge: d.transactionType === Constants.TransactionType.Bridge property string decodedInputData: "" diff --git a/ui/imports/shared/controls/TransactionDelegate.qml b/ui/imports/shared/controls/TransactionDelegate.qml index b4768fbc7b..34f1027630 100644 --- a/ui/imports/shared/controls/TransactionDelegate.qml +++ b/ui/imports/shared/controls/TransactionDelegate.qml @@ -70,7 +70,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 && !!communityId && modelData.txType === Constants.TransactionType.Mint + readonly property bool isCommunityAssetViaAirdrop: isModelDataValid && !!communityId && d.txType === Constants.TransactionType.Mint readonly property string communityId: isModelDataValid && modelData.communityId ? modelData.communityId : "" property var community: null readonly property bool isCommunityToken: !!community && Object.keys(community).length > 0 @@ -106,7 +106,7 @@ StatusListItem { } readonly property string tokenImage: { - if (!isModelDataValid || modelData.txType === Constants.TransactionType.ContractDeployment) + if (!isModelDataValid || d.txType === Constants.TransactionType.ContractDeployment) return "" if (root.isNFT) { return modelData.nftImageUrl ? modelData.nftImageUrl : "" @@ -178,13 +178,18 @@ StatusListItem { readonly property bool isLightTheme: Style.current.name === Constants.lightThemeName property color animatedBgColor + property int txType: walletRootStore.transactionType(modelData) + + function addressesEqual(address1, address2) { + return address1.toUpperCase() == address2.toUpperCase() + } } function getDetailsString(detailsObj) { let details = "" const endl = "\n" const endl2 = endl + endl - const type = modelData.txType + const type = d.txType const feeEthValue = rootStore.getGasEthValue(detailsObj.totalFees.amount, 1) // TITLE @@ -224,7 +229,7 @@ StatusListItem { } details += qsTr("Summary") + endl - switch(modelData.txType) { + switch(type) { case Constants.TransactionType.Buy: case Constants.TransactionType.Sell: case Constants.TransactionType.Destroy: @@ -235,7 +240,11 @@ StatusListItem { details += getSubtitle(true, true) + endl2 break default: - details += qsTr("%1 from %2 to %3 via %4").arg(transactionValue).arg(fromAddress).arg(toAddress).arg(networkName) + endl2 + if (networkNameIn != networkNameOut) { // cross chain Send/Receive that involves bridging + details += getSubtitle(true, true) + endl2 + } + else + details += qsTr("%1 from %2 to %3 via %4").arg(transactionValue).arg(fromAddress).arg(toAddress).arg(networkName) + endl2 break } @@ -495,8 +504,15 @@ StatusListItem { return qsTr("%1 (community asset) from %2 via %3").arg(root.transactionValue).arg(communityInfo).arg(root.networkName) } - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Receive: + // Cross chain receive. Use bridge pattern + if (root.networkNameIn != root.networkNameOut) { + if (allAccounts) + return qsTr("%1 from %2 to %3 via %4 and %5").arg(inTransactionValue).arg(fromAddress).arg(toAddress).arg(networkNameOut).arg(networkNameIn) + return qsTr("%1 from %2 via %3 and %4").arg(inTransactionValue).arg(toAddress).arg(networkNameOut).arg(networkNameIn) + } + if (allAccounts) return qsTr("%1 from %2 to %3 via %4").arg(transactionValue).arg(fromAddress).arg(toAddress).arg(networkName) return qsTr("%1 from %2 via %3").arg(transactionValue).arg(fromAddress).arg(networkName) @@ -525,6 +541,13 @@ StatusListItem { return qsTr("%1 via %2 in %3").arg(transactionValue).arg(networkName).arg(toAddress) return qsTr("%1 via %2").arg(transactionValue).arg(networkName) default: + // Cross chain send. Use bridge pattern + if (root.networkNameIn != root.networkNameOut) { + if (allAccounts) + return qsTr("%1 from %2 to %3 via %4 and %5").arg(inTransactionValue).arg(fromAddress).arg(toAddress).arg(networkNameOut).arg(networkNameIn) + return qsTr("%1 to %2 via %3 and %4").arg(inTransactionValue).arg(toAddress).arg(networkNameOut).arg(networkNameIn) + } + if (allAccounts) return qsTr("%1 from %2 to %3 via %4").arg(transactionValue).arg(fromAddress).arg(toAddress).arg(networkName) return qsTr("%1 to %2 via %3").arg(transactionValue).arg(toAddress).arg(networkName) @@ -552,7 +575,7 @@ StatusListItem { if (!root.isModelDataValid) return "" - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Send: return "send" case Constants.TransactionType.Receive: @@ -601,7 +624,7 @@ StatusListItem { const isPending = root.transactionStatus === Constants.TransactionStatus.Pending const failed = root.transactionStatus === Constants.TransactionStatus.Failed - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Send: return failed ? qsTr("Send failed") : (isPending ? qsTr("Sending") : qsTr("Sent")) case Constants.TransactionType.Receive: @@ -644,7 +667,7 @@ StatusListItem { } StatusRoundIcon { id: secondTokenImage - visible: root.isModelDataValid && !root.isNFT && !!root.inTokenImage && modelData.txType === Constants.TransactionType.Swap + visible: root.isModelDataValid && !root.isNFT && !!root.inTokenImage && d.txType === Constants.TransactionType.Swap anchors.verticalCenter: parent.verticalCenter asset: StatusAssetSettings { width: root.tokenIconAsset.width @@ -705,7 +728,7 @@ StatusListItem { return "" } - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Send: case Constants.TransactionType.Sell: return "−" + root.transactionValue @@ -736,7 +759,7 @@ StatusListItem { if (!root.isModelDataValid) return "" - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Receive: case Constants.TransactionType.Buy: case Constants.TransactionType.Swap: @@ -758,7 +781,7 @@ StatusListItem { return "" } - switch(modelData.txType) { + switch(d.txType) { case Constants.TransactionType.Send: case Constants.TransactionType.Sell: case Constants.TransactionType.Buy: