fix(SendModal): Fixing "Repeat transaction" action in Activity view and Activity details view
This commit is contained in:
parent
6e93935298
commit
417a74d4b1
ui
|
@ -328,7 +328,7 @@ QtObject {
|
||||||
return false
|
return false
|
||||||
|
|
||||||
let res = SQUtils.ModelUtils.getByKey(root.accounts, "address", tx.sender)
|
let res = SQUtils.ModelUtils.getByKey(root.accounts, "address", tx.sender)
|
||||||
if (!res || res.object.walletType === Constants.watchWalletType)
|
if (!res || res.walletType === Constants.watchWalletType)
|
||||||
return false
|
return false
|
||||||
|
|
||||||
if (tx.isNFT) {
|
if (tx.isNFT) {
|
||||||
|
|
|
@ -230,7 +230,6 @@ StatusDialog {
|
||||||
holdingSelector.currentTab = TokenSelectorPanel.Tabs.Collectibles
|
holdingSelector.currentTab = TokenSelectorPanel.Tabs.Collectibles
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!!popup.preDefinedAmountToSend) {
|
if(!!popup.preDefinedAmountToSend) {
|
||||||
// TODO: At this stage the number should not be localized. However
|
// TODO: At this stage the number should not be localized. However
|
||||||
// in many places when initializing popup the number is provided
|
// in many places when initializing popup the number is provided
|
||||||
|
|
|
@ -311,7 +311,7 @@ ColumnLayout {
|
||||||
if (!overview.isWatchOnlyAccount && !tx)
|
if (!overview.isWatchOnlyAccount && !tx)
|
||||||
return false
|
return false
|
||||||
return WalletStores.RootStore.isTxRepeatable(tx)
|
return WalletStores.RootStore.isTxRepeatable(tx)
|
||||||
}
|
}
|
||||||
|
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
if (!tx)
|
if (!tx)
|
||||||
|
@ -326,11 +326,10 @@ ColumnLayout {
|
||||||
tx.isNFT,
|
tx.isNFT,
|
||||||
tx.amount)
|
tx.amount)
|
||||||
|
|
||||||
root.sendModal.preSelectedAccount = req.preSelectedAccount
|
root.sendModal.preSelectedAccountAddress = req.preSelectedAccount.address
|
||||||
root.sendModal.preSelectedRecipient = req.preSelectedRecipient
|
root.sendModal.preSelectedRecipient = req.preSelectedRecipient
|
||||||
root.sendModal.preSelectedRecipientType = req.preSelectedRecipientType
|
root.sendModal.preSelectedRecipientType = req.preSelectedRecipientType
|
||||||
root.sendModal.preSelectedHolding = req.preSelectedHolding
|
root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID ?? req.preSelectedHolding.uid
|
||||||
root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID
|
|
||||||
root.sendModal.preSelectedHoldingType = req.preSelectedHoldingType
|
root.sendModal.preSelectedHoldingType = req.preSelectedHoldingType
|
||||||
root.sendModal.preSelectedSendType = req.preSelectedSendType
|
root.sendModal.preSelectedSendType = req.preSelectedSendType
|
||||||
root.sendModal.preDefinedAmountToSend = req.preDefinedAmountToSend
|
root.sendModal.preDefinedAmountToSend = req.preDefinedAmountToSend
|
||||||
|
|
Loading…
Reference in New Issue