mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Remove unnecessary functions (#9458)
Removes unnecessary functions with minor code changes to support extraction
This commit is contained in:
parent
48e2880731
commit
b3d3518bc0
@ -7,23 +7,11 @@ import {
|
|||||||
TRANSACTION_TYPE_CANCEL,
|
TRANSACTION_TYPE_CANCEL,
|
||||||
TRANSACTION_STATUS_CONFIRMED,
|
TRANSACTION_STATUS_CONFIRMED,
|
||||||
} from '../../../../app/scripts/controllers/transactions/enums'
|
} from '../../../../app/scripts/controllers/transactions/enums'
|
||||||
import { MESSAGE_TYPE } from '../../../../app/scripts/lib/enums'
|
|
||||||
import { getEtherscanNetworkPrefix } from '../../../lib/etherscan-prefix-for-network'
|
import { getEtherscanNetworkPrefix } from '../../../lib/etherscan-prefix-for-network'
|
||||||
import {
|
import {
|
||||||
TOKEN_METHOD_TRANSFER,
|
TOKEN_METHOD_TRANSFER,
|
||||||
TOKEN_METHOD_APPROVE,
|
TOKEN_METHOD_APPROVE,
|
||||||
TOKEN_METHOD_TRANSFER_FROM,
|
TOKEN_METHOD_TRANSFER_FROM,
|
||||||
SEND_ETHER_ACTION_KEY,
|
|
||||||
DEPLOY_CONTRACT_ACTION_KEY,
|
|
||||||
APPROVE_ACTION_KEY,
|
|
||||||
SEND_TOKEN_ACTION_KEY,
|
|
||||||
TRANSFER_FROM_ACTION_KEY,
|
|
||||||
SIGNATURE_REQUEST_KEY,
|
|
||||||
DECRYPT_REQUEST_KEY,
|
|
||||||
ENCRYPTION_PUBLIC_KEY_REQUEST_KEY,
|
|
||||||
CONTRACT_INTERACTION_KEY,
|
|
||||||
CANCEL_ATTEMPT_ACTION_KEY,
|
|
||||||
DEPOSIT_TRANSACTION_KEY,
|
|
||||||
} from '../constants/transactions'
|
} from '../constants/transactions'
|
||||||
import fetchWithCache from './fetch-with-cache'
|
import fetchWithCache from './fetch-with-cache'
|
||||||
|
|
||||||
@ -109,11 +97,6 @@ export async function getMethodDataAsync (fourBytePrefix) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isConfirmDeployContract (txData = {}) {
|
|
||||||
const { txParams = {} } = txData
|
|
||||||
return !txParams.to
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns four-byte method signature from data
|
* Returns four-byte method signature from data
|
||||||
*
|
*
|
||||||
@ -140,56 +123,6 @@ export function isTokenMethodAction (transactionCategory) {
|
|||||||
].includes(transactionCategory)
|
].includes(transactionCategory)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the action of a transaction as a key to be passed into the translator.
|
|
||||||
* @param {Object} transaction - txData object
|
|
||||||
* @returns {string|undefined}
|
|
||||||
*/
|
|
||||||
export function getTransactionActionKey (transaction) {
|
|
||||||
const { msgParams, type, transactionCategory } = transaction
|
|
||||||
|
|
||||||
if (transactionCategory === 'incoming') {
|
|
||||||
return DEPOSIT_TRANSACTION_KEY
|
|
||||||
}
|
|
||||||
|
|
||||||
if (type === 'cancel') {
|
|
||||||
return CANCEL_ATTEMPT_ACTION_KEY
|
|
||||||
}
|
|
||||||
|
|
||||||
if (msgParams) {
|
|
||||||
if (type === MESSAGE_TYPE.ETH_DECRYPT) {
|
|
||||||
return DECRYPT_REQUEST_KEY
|
|
||||||
} else if (type === MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY) {
|
|
||||||
return ENCRYPTION_PUBLIC_KEY_REQUEST_KEY
|
|
||||||
}
|
|
||||||
return SIGNATURE_REQUEST_KEY
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isConfirmDeployContract(transaction)) {
|
|
||||||
return DEPLOY_CONTRACT_ACTION_KEY
|
|
||||||
}
|
|
||||||
|
|
||||||
const isTokenAction = isTokenMethodAction(transactionCategory)
|
|
||||||
const isNonTokenSmartContract = transactionCategory === CONTRACT_INTERACTION_KEY
|
|
||||||
|
|
||||||
if (isTokenAction || isNonTokenSmartContract) {
|
|
||||||
switch (transactionCategory) {
|
|
||||||
case TOKEN_METHOD_TRANSFER:
|
|
||||||
return SEND_TOKEN_ACTION_KEY
|
|
||||||
case TOKEN_METHOD_APPROVE:
|
|
||||||
return APPROVE_ACTION_KEY
|
|
||||||
case TOKEN_METHOD_TRANSFER_FROM:
|
|
||||||
return TRANSFER_FROM_ACTION_KEY
|
|
||||||
case CONTRACT_INTERACTION_KEY:
|
|
||||||
return CONTRACT_INTERACTION_KEY
|
|
||||||
default:
|
|
||||||
return undefined
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return SEND_ETHER_ACTION_KEY
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getLatestSubmittedTxWithNonce (transactions = [], nonce = '0x0') {
|
export function getLatestSubmittedTxWithNonce (transactions = [], nonce = '0x0') {
|
||||||
if (!transactions.length) {
|
if (!transactions.length) {
|
||||||
return {}
|
return {}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { useSelector } from 'react-redux'
|
import { useSelector } from 'react-redux'
|
||||||
import { getKnownMethodData } from '../selectors/selectors'
|
import { getKnownMethodData } from '../selectors/selectors'
|
||||||
import { getTransactionActionKey, getStatusKey } from '../helpers/utils/transactions.util'
|
import { getStatusKey } from '../helpers/utils/transactions.util'
|
||||||
import { camelCaseToCapitalize } from '../helpers/utils/common.util'
|
import { camelCaseToCapitalize } from '../helpers/utils/common.util'
|
||||||
import { PRIMARY, SECONDARY } from '../helpers/constants/common'
|
import { PRIMARY, SECONDARY } from '../helpers/constants/common'
|
||||||
import { getTokenAddressParam } from '../helpers/utils/token-util'
|
import { getTokenAddressParam } from '../helpers/utils/token-util'
|
||||||
@ -64,7 +64,6 @@ export function useTransactionDisplayData (transactionGroup) {
|
|||||||
// for smart contract interactions, methodData can be used to derive the name of the action being taken
|
// for smart contract interactions, methodData can be used to derive the name of the action being taken
|
||||||
const methodData = useSelector((state) => getKnownMethodData(state, initialTransaction?.txParams?.data)) || {}
|
const methodData = useSelector((state) => getKnownMethodData(state, initialTransaction?.txParams?.data)) || {}
|
||||||
|
|
||||||
const actionKey = getTransactionActionKey(initialTransaction)
|
|
||||||
const status = getStatusKey(primaryTransaction)
|
const status = getStatusKey(primaryTransaction)
|
||||||
|
|
||||||
const primaryValue = primaryTransaction.txParams?.value
|
const primaryValue = primaryTransaction.txParams?.value
|
||||||
@ -111,7 +110,7 @@ export function useTransactionDisplayData (transactionGroup) {
|
|||||||
subtitleContainsOrigin = true
|
subtitleContainsOrigin = true
|
||||||
} else if (transactionCategory === DEPLOY_CONTRACT_ACTION_KEY || transactionCategory === CONTRACT_INTERACTION_KEY) {
|
} else if (transactionCategory === DEPLOY_CONTRACT_ACTION_KEY || transactionCategory === CONTRACT_INTERACTION_KEY) {
|
||||||
category = TRANSACTION_CATEGORY_INTERACTION
|
category = TRANSACTION_CATEGORY_INTERACTION
|
||||||
title = (methodData?.name && camelCaseToCapitalize(methodData.name)) || (actionKey && t(actionKey)) || ''
|
title = (methodData?.name && camelCaseToCapitalize(methodData.name)) || t(transactionCategory)
|
||||||
subtitle = origin
|
subtitle = origin
|
||||||
subtitleContainsOrigin = true
|
subtitleContainsOrigin = true
|
||||||
} else if (transactionCategory === INCOMING_TRANSACTION) {
|
} else if (transactionCategory === INCOMING_TRANSACTION) {
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
export function isConfirmDeployContract (txData = {}) {
|
|
||||||
const { txParams = {} } = txData
|
|
||||||
return !txParams.to
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user