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(SendModal): Fixing "Repeat transaction" action in Activity view and Activity details view

This commit is contained in:
Alex Jbanca 2024-07-17 20:53:11 +03:00 committed by Alex Jbanca
parent 6e93935298
commit 417a74d4b1
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,7 +328,7 @@ QtObject {
return false
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
if (tx.isNFT) {

1
ui/imports/shared/popups/send/SendModal.qml
View File

@ -230,7 +230,6 @@ StatusDialog {
holdingSelector.currentTab = TokenSelectorPanel.Tabs.Collectibles
}
}
if(!!popup.preDefinedAmountToSend) {
// TODO: At this stage the number should not be localized. However
// in many places when initializing popup the number is provided

7
ui/imports/shared/views/HistoryView.qml
View File

@ -311,7 +311,7 @@ ColumnLayout {
if (!overview.isWatchOnlyAccount && !tx)
return false
return WalletStores.RootStore.isTxRepeatable(tx)
}
}
onTriggered: {
if (!tx)
@ -326,11 +326,10 @@ ColumnLayout {
tx.isNFT,
tx.amount)
root.sendModal.preSelectedAccount = req.preSelectedAccount
root.sendModal.preSelectedAccountAddress = req.preSelectedAccount.address
root.sendModal.preSelectedRecipient = req.preSelectedRecipient
root.sendModal.preSelectedRecipientType = req.preSelectedRecipientType
root.sendModal.preSelectedHolding = req.preSelectedHolding
root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID
root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID ?? req.preSelectedHolding.uid
root.sendModal.preSelectedHoldingType = req.preSelectedHoldingType
root.sendModal.preSelectedSendType = req.preSelectedSendType
root.sendModal.preDefinedAmountToSend = req.preDefinedAmountToSend