fix(wallet): Fill bridge tx type (#16162)
This commit is contained in:
parent
f3a33f414d
commit
67cf522f0a
|
@ -383,6 +383,8 @@ QtObject:
|
||||||
return transactions.MultiTransactionType.MultiTransactionSwap
|
return transactions.MultiTransactionType.MultiTransactionSwap
|
||||||
of SendType.Approve:
|
of SendType.Approve:
|
||||||
return transactions.MultiTransactionType.MultiTransactionApprove
|
return transactions.MultiTransactionType.MultiTransactionApprove
|
||||||
|
of SendType.Bridge:
|
||||||
|
return transactions.MultiTransactionType.MultiTransactionBridge
|
||||||
else:
|
else:
|
||||||
return transactions.MultiTransactionType.MultiTransactionSend
|
return transactions.MultiTransactionType.MultiTransactionSend
|
||||||
|
|
||||||
|
|
|
@ -345,7 +345,6 @@ StatusMenu {
|
||||||
StatusAction {
|
StatusAction {
|
||||||
id: sendToAddressAction
|
id: sendToAddressAction
|
||||||
enabled: false
|
enabled: false
|
||||||
visibleOnDisabled: true
|
|
||||||
text: {
|
text: {
|
||||||
switch(d.addressType) {
|
switch(d.addressType) {
|
||||||
case TransactionAddressMenu.AddressType.Sender:
|
case TransactionAddressMenu.AddressType.Sender:
|
||||||
|
|
|
@ -101,7 +101,7 @@ Item {
|
||||||
return outSymbol || !transaction.tokenOutAddress ? formatted : "%1 (%2)".arg(formatted).arg(Utils.compactAddress(transaction.tokenOutAddress, 4))
|
return outSymbol || !transaction.tokenOutAddress ? formatted : "%1 (%2)".arg(formatted).arg(Utils.compactAddress(transaction.tokenOutAddress, 4))
|
||||||
}
|
}
|
||||||
readonly property real feeEthValue: d.details ? RootStore.getFeeEthValue(d.details.totalFees) : 0
|
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 real feeFiatValue: RootStore.getFiatValue(d.feeEthValue, Constants.ethToken)
|
||||||
readonly property int transactionType: d.isTransactionValid ? WalletStores.RootStore.transactionType(transaction) : 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
|
readonly property bool isBridge: d.transactionType === Constants.TransactionType.Bridge
|
||||||
|
|
||||||
|
@ -289,7 +289,7 @@ Item {
|
||||||
case Constants.TransactionType.Swap:
|
case Constants.TransactionType.Swap:
|
||||||
return Constants.tokenIcon(d.inSymbol)
|
return Constants.tokenIcon(d.inSymbol)
|
||||||
case Constants.TransactionType.Bridge:
|
case Constants.TransactionType.Bridge:
|
||||||
return Style.svg(RootStore.Icon(d.transaction.chainIdIn)) ?? Style.svg("network/Network=Custom")
|
return Style.svg(ModelUtils.getByKey(RootStore.flatNetworks, "chainId", d.transaction.chainIdIn, "iconUrl")) ?? Style.svg("network/Network=Custom")
|
||||||
default:
|
default:
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,8 +61,6 @@ StatusListItem {
|
||||||
readonly property double inFiatValue: isModelDataValid && isMultiTransaction ? rootStore.getFiatValue(inCryptoValue, modelData.inSymbol): 0.0
|
readonly property double inFiatValue: isModelDataValid && isMultiTransaction ? rootStore.getFiatValue(inCryptoValue, modelData.inSymbol): 0.0
|
||||||
readonly property double outCryptoValue: isModelDataValid ? modelData.outAmount : 0.0
|
readonly property double outCryptoValue: isModelDataValid ? modelData.outAmount : 0.0
|
||||||
readonly property double outFiatValue: isModelDataValid && isMultiTransaction ? rootStore.getFiatValue(outCryptoValue, modelData.outSymbol): 0.0
|
readonly property double outFiatValue: isModelDataValid && isMultiTransaction ? rootStore.getFiatValue(outCryptoValue, modelData.outSymbol): 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 networkColor: isModelDataValid ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainId, "chainColor") : ""
|
readonly property string networkColor: isModelDataValid ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainId, "chainColor") : ""
|
||||||
readonly property string networkName: isModelDataValid ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainId, "chainName") : ""
|
readonly property string networkName: isModelDataValid ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainId, "chainName") : ""
|
||||||
readonly property string networkNameIn: isMultiTransaction ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainIdIn, "chainName") : ""
|
readonly property string networkNameIn: isMultiTransaction ? SQUtils.ModelUtils.getByKey(rootStore.flatNetworks, "chainId", modelData.chainIdIn, "chainName") : ""
|
||||||
|
@ -589,8 +587,8 @@ StatusListItem {
|
||||||
return qsTr("%1 to %2 on %3").arg(outTransactionValue).arg(inTransactionValue).arg(networkName)
|
return qsTr("%1 to %2 on %3").arg(outTransactionValue).arg(inTransactionValue).arg(networkName)
|
||||||
case Constants.TransactionType.Bridge:
|
case Constants.TransactionType.Bridge:
|
||||||
if (allAccounts)
|
if (allAccounts)
|
||||||
return qsTr("%1 from %2 to %3 in %4").arg(inTransactionValue).arg(networkNameOut).arg(networkNameIn).arg(fromAddress)
|
return qsTr("%1 from %2 to %3 in %4").arg(outTransactionValue).arg(networkNameOut).arg(networkNameIn).arg(fromAddress)
|
||||||
return qsTr("%1 from %2 to %3").arg(inTransactionValue).arg(networkNameOut).arg(networkNameIn)
|
return qsTr("%1 from %2 to %3").arg(outTransactionValue).arg(networkNameOut).arg(networkNameIn)
|
||||||
case Constants.TransactionType.ContractDeployment:
|
case Constants.TransactionType.ContractDeployment:
|
||||||
const name = addressNameTo || addressNameFrom
|
const name = addressNameTo || addressNameFrom
|
||||||
return qsTr("Via %1 on %2").arg(name).arg(networkName)
|
return qsTr("Via %1 on %2").arg(name).arg(networkName)
|
||||||
|
@ -807,7 +805,6 @@ StatusListItem {
|
||||||
.arg(Theme.palette.successColor1)
|
.arg(Theme.palette.successColor1)
|
||||||
.arg(inValue)
|
.arg(inValue)
|
||||||
case Constants.TransactionType.Bridge:
|
case Constants.TransactionType.Bridge:
|
||||||
return "−" + root.rootStore.formatCurrencyAmount(feeCryptoValue, modelData.symbol)
|
|
||||||
case Constants.TransactionType.Approve:
|
case Constants.TransactionType.Approve:
|
||||||
default:
|
default:
|
||||||
return ""
|
return ""
|
||||||
|
@ -853,7 +850,6 @@ StatusListItem {
|
||||||
return "-%1 / +%2".arg(root.rootStore.formatCurrencyAmount(root.outFiatValue, root.currentCurrency))
|
return "-%1 / +%2".arg(root.rootStore.formatCurrencyAmount(root.outFiatValue, root.currentCurrency))
|
||||||
.arg(root.rootStore.formatCurrencyAmount(root.inFiatValue, root.currentCurrency))
|
.arg(root.rootStore.formatCurrencyAmount(root.inFiatValue, root.currentCurrency))
|
||||||
case Constants.TransactionType.Bridge:
|
case Constants.TransactionType.Bridge:
|
||||||
return "−" + root.rootStore.formatCurrencyAmount(root.feeFiatValue, root.currentCurrency)
|
|
||||||
case Constants.TransactionType.Approve:
|
case Constants.TransactionType.Approve:
|
||||||
default:
|
default:
|
||||||
return ""
|
return ""
|
||||||
|
|
Loading…
Reference in New Issue