status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(activity): reworked activity context menu

This commit is contained in:
Dario Gabriel Lipicar 2024-11-15 02:04:00 -03:00
parent 0d0ff1532e
commit dc0c527e41
No known key found for this signature in database
GPG Key ID: 9625E9494309D203
6 changed files with 83 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/AppLayouts/Wallet/panels/ContractInfoButtonWithMenu.qml
View File

@ -28,13 +28,7 @@ StatusFlatButton {
onClicked: moreMenu.popup(-moreMenu.width + width, height + 4)
function getExplorerName() {
if (root.networkShortName === Constants.networkShortChainNames.arbitrum) {
return qsTr("Arbiscan")
}
if (root.networkShortName === Constants.networkShortChainNames.optimism) {
return qsTr("Optimistic")
}
return qsTr("Etherscan")
return Utils.getChainExplorerName(root.networkShortName)
}
StatusMenu {

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

@ -429,7 +429,6 @@ RightTabBaseView {
communitiesStore: root.communitiesStore
currencyStore: root.sharedRootStore.currencyStore
showAllAccounts: RootStore.showAllAccounts
sendModal: root.sendModal
filterVisible: filterButton.checked
}
}

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

@ -37,7 +37,6 @@ ColumnLayout {
property CurrenciesStore currencyStore
property bool showAllAccounts: false
property bool displayValues: true
property var sendModal
property bool filterVisible
property bool disableShadowOnScroll: false
property bool hideVerticalScrollbar: false
@ -279,125 +278,32 @@ ColumnLayout {
}
}
StatusMenu {
id: delegateMenu
Component {
id: txContextMenu
hideDisabledItems: true
TransactionContextMenu {
required property var modelData
property var transaction
property var transactionDelegate
readonly property var firstTx: SQUtils.ModelUtils.get(modelData.transactions, 0)
readonly property int firstTxChainId: !!firstTx ? firstTx.chainId : 0
readonly property string firstTxHash: !!firstTx ? firstTx.txHash : ""
function openMenu(delegate, mouse, data) {
if (!delegate || !data)
return
readonly property string networkShortName: Utils.getNetworkShortName(firstTxChainId)
readonly property bool isNetworkTestnet: Utils.isChainIDTestnet(firstTxChainId)
delegateMenu.transactionDelegate = delegate
delegateMenu.transaction = data
popup(delegate, mouse.x, mouse.y)
}
hideDisabledItems: true
onClosed: {
delegateMenu.transaction = null
delegateMenu.transactionDelegate = null
}
networkExplorerName: Utils.getChainExplorerName(networkShortName)
StatusAction {
id: repeatTransactionAction
onClosed: destroy()
text: qsTr("Repeat transaction")
icon.name: "rotate"
property alias tx: delegateMenu.transaction
enabled: {
if (!overview.isWatchOnlyAccount && !tx)
return false
return root.walletRootStore.isTxRepeatable(tx)
onCopyTxHashRequested: {
ClipboardUtils.setText(firstTxHash)
}
onTriggered: {
if (!tx)
return
let asset = root.walletRootStore.getAssetForSendTx(tx)
const req = Helpers.lookupAddressesForSendModal(root.walletRootStore.accounts,
root.walletRootStore.savedAddresses,
tx.sender,
tx.recipient,
asset,
tx.isNFT,
tx.amount,
tx.chainId)
root.sendModal.preSelectedAccountAddress = req.preSelectedAccount.address
root.sendModal.preSelectedRecipient = req.preSelectedRecipient
root.sendModal.preSelectedRecipientType = req.preSelectedRecipientType
root.sendModal.preSelectedHoldingID = req.preSelectedHoldingID
root.sendModal.preSelectedHoldingType = req.preSelectedHoldingType
root.sendModal.preSelectedSendType = req.preSelectedSendType
root.sendModal.preDefinedAmountToSend = req.preDefinedAmountToSend
root.sendModal.preSelectedChainId = req.preSelectedChainId
root.sendModal.onlyAssets = false
root.sendModal.open()
}
}
StatusSuccessAction {
text: qsTr("Copy details")
successText: qsTr("Details copied")
icon.name: "copy"
onTriggered: {
if (!delegateMenu.transactionDelegate)
return
root.walletRootStore.addressWasShown(delegateMenu.transaction.sender)
if (delegateMenu.transaction.sender !== delegateMenu.transaction.recipient) {
root.walletRootStore.addressWasShown(delegateMenu.transaction.recipient)
}
root.walletRootStore.fetchTxDetails(delegateMenu.transaction.id)
let detailsObj = root.walletRootStore.getTxDetails()
let detailsString = delegateMenu.transactionDelegate.getDetailsString(detailsObj)
ClipboardUtils.setText(detailsString)
}
}
StatusMenuSeparator {
visible: filterAction.enabled
}
StatusAction {
id: filterAction
text: qsTr("Filter by similar")
icon.name: "filter"
onTriggered: {
const store = root.walletRootStore.currentActivityFiltersStore
const tx = delegateMenu.transaction
store.autoUpdateFilter = false
store.resetAllFilters()
const currentAddress = overview.mixedcaseAddress.toUpperCase()
store.toggleType(tx.txType)
// Contract deployment has always ETH symbol. Symbol doesn't affect this type
if (tx.txType !== Constants.TransactionType.ContractDeployment) {
const symbol = tx.symbol
if (!!symbol)
store.toggleToken(symbol)
const inSymbol = tx.inSymbol
if (!!inSymbol && inSymbol !== symbol)
store.toggleToken(inSymbol)
}
if (showAllAccounts || tx.txType !== Constants.TransactionType.Bridge) {
const recipient = tx.recipient.toUpperCase()
if (!!recipient && recipient !== currentAddress && !/0X0+$/.test(recipient))
store.toggleRecents(recipient)
}
if (tx.isNFT) {
const uid = store.collectiblesList.getUidForData(tx.tokenID, tx.tokenAddress, tx.chainId)
if (!!uid)
store.toggleCollectibles(uid)
}
store.autoUpdateFilter = true
store.applyAllFilters()
onViewTxOnExplorerRequested: {
let link = Utils.getUrlForTxOnNetwork(networkShortName, isNetworkTestnet, firstTxHash)
Global.openLink(link)
}
}
}
@ -460,7 +366,7 @@ ColumnLayout {
community: isModelDataValid && !!communityId && !!root.communitiesStore ? root.communitiesStore.getCommunityDetailsAsJson(communityId) : null
onClicked: {
if (mouse.button === Qt.RightButton) {
delegateMenu.openMenu(this, mouse, modelData)
txContextMenu.createObject(this, { modelData }).popup(mouse)
}
}
}

25
ui/imports/shared/views/TransactionContextMenu.qml Normal file
View File

@ -0,0 +1,25 @@
import QtQuick 2.15
import StatusQ.Popups 0.1
StatusMenu {
id: root
required property string networkExplorerName
signal viewTxOnExplorerRequested
signal copyTxHashRequested
StatusAction {
objectName: "viewTxOnExplorerItem"
text: qsTr("View on ") + networkExplorerName
icon.name: "link"
onTriggered: root.viewTxOnExplorerRequested()
}
StatusAction {
objectName: "copyTxHashItem"
text: qsTr("Copy transaction hash")
icon.name: "copy"
onTriggered: root.copyTxHashRequested()
}
}

38
ui/imports/utils/Utils.qml
View File

@ -644,6 +644,44 @@ QtObject {
return getEtherscanUrl(networkShortName, testnetMode, tx, false /* is TX */)
}
// Get Chain Explorer name
function getChainExplorerName(networkShortName) {
if (networkShortName === Constants.networkShortChainNames.arbitrum) {
return qsTr("Arbiscan")
}
if (networkShortName === Constants.networkShortChainNames.optimism) {
return qsTr("Optimistic")
}
return qsTr("Etherscan")
}
// Get ShortName for ChainID
function getNetworkShortName(chainID) {
switch (chainID) {
case Constants.chains.mainnetChainId:
case Constants.chains.sepoliaChainId:
return Constants.networkShortChainNames.mainnet
case Constants.chains.arbitrumChainId:
case Constants.chains.arbitrumSepoliaChainId:
return Constants.networkShortChainNames.arbitrum
case Constants.chains.optimismChainId:
case Constants.chains.optimismSepoliaChainId:
return Constants.networkShortChainNames.optimism
}
return ""
}
// Is given ChainID a testnet
function isChainIDTestnet(chainID) {
switch (chainID) {
case Constants.chains.mainnetChainId:
case Constants.chains.arbitrumChainId:
case Constants.chains.optimismChainId:
return false
}
return true
}
// Leave this function at the bottom of the file as QT Creator messes up the code color after this
function isPunct(c) {
return /(!|\@|#|\$|%|\^|&|\*|\(|\)|\+|\||-|=|\\|{|}|[|]|"|;|'|<|>|\?|,|\.|\/)/.test(c)

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 7ee45bab1cc6ef6da24ade1826f11152153d4783
Subproject commit b2e83c39a64f8301463b8479bbe766ebe5edf963