From d441d110b2bf0af511c71d02673539574822b1ca Mon Sep 17 00:00:00 2001 From: Uxio Fuentefria Date: Mon, 30 Sep 2019 13:33:04 +0200 Subject: [PATCH] Remove executed txHash from confirmations --- src/routes/safe/store/actions/fetchTransactions.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/routes/safe/store/actions/fetchTransactions.js b/src/routes/safe/store/actions/fetchTransactions.js index 1f662d2a..c1354d63 100644 --- a/src/routes/safe/store/actions/fetchTransactions.js +++ b/src/routes/safe/store/actions/fetchTransactions.js @@ -14,7 +14,6 @@ import { EMPTY_DATA } from '~/logic/wallets/ethTransactions' import { addTransactions } from './addTransactions' import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens' import { isTokenTransfer } from '~/logic/tokens/utils/tokenHelpers' -import { TX_TYPE_EXECUTION } from '~/logic/safe/transactions' import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds' import { ALTERNATIVE_TOKEN_ABI } from '~/logic/tokens/utils/alternativeAbi' @@ -38,6 +37,7 @@ type TxServiceModel = { executionDate: string, confirmations: ConfirmationServiceModel[], isExecuted: boolean, + transactionHash: string, } export const buildTransactionFrom = async ( @@ -63,13 +63,6 @@ export const buildTransactionFrom = async ( const isSendTokenTx = await isTokenTransfer(tx.data, tx.value) const customTx = tx.to !== safeAddress && !!tx.data && !isSendTokenTx - let executionTxHash - const executionTx = confirmations.find((conf) => conf.type === TX_TYPE_EXECUTION) - - if (executionTx) { - executionTxHash = executionTx.hash - } - let symbol = 'ETH' let decimals = 18 let decodedParams @@ -112,7 +105,7 @@ export const buildTransactionFrom = async ( isExecuted: tx.isExecuted, submissionDate: tx.submissionDate, executionDate: tx.executionDate, - executionTxHash, + executionTxHash: tx.transactionHash, safeTxHash: tx.safeTxHash, isTokenTransfer: isSendTokenTx, decodedParams,