status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-01-12 02:54:09 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #194 from gnosis/refactor-tx-service"

Browse Source 
This reverts commit d4f0cc8f47fda343376baba276c1b7a3b635099d, reversing
changes made to 101ac77dbef1226e44f687a060470b9a01b40698.
This commit is contained in:
Mikhail Mikheev 2019-11-14 17:34:59 +04:00
parent 0214b05d69
commit f25f9fb138
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/safe/store/actions/fetchTransactions.js
View File

@ -14,6 +14,7 @@ import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
import { addTransactions } from './addTransactions' import { addTransactions } from './addTransactions'
import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens' import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens'
import { isTokenTransfer } from '~/logic/tokens/utils/tokenHelpers' import { isTokenTransfer } from '~/logic/tokens/utils/tokenHelpers'
import { TX_TYPE_EXECUTION } from '~/logic/safe/transactions'
import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds' import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds'
import { ALTERNATIVE_TOKEN_ABI } from '~/logic/tokens/utils/alternativeAbi' import { ALTERNATIVE_TOKEN_ABI } from '~/logic/tokens/utils/alternativeAbi'
@ -37,7 +38,6 @@ type TxServiceModel = {
executionDate: string, executionDate: string,
confirmations: ConfirmationServiceModel[], confirmations: ConfirmationServiceModel[],
isExecuted: boolean, isExecuted: boolean,
transactionHash: string,
} }
export const buildTransactionFrom = async ( export const buildTransactionFrom = async (
@ -63,6 +63,13 @@ export const buildTransactionFrom = async (
const isSendTokenTx = await isTokenTransfer(tx.data, tx.value) const isSendTokenTx = await isTokenTransfer(tx.data, tx.value)
const customTx = tx.to !== safeAddress && !!tx.data && !isSendTokenTx 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 symbol = 'ETH'
let decimals = 18 let decimals = 18
let decodedParams let decodedParams
@ -105,7 +112,7 @@ export const buildTransactionFrom = async (
isExecuted: tx.isExecuted, isExecuted: tx.isExecuted,
submissionDate: tx.submissionDate, submissionDate: tx.submissionDate,
executionDate: tx.executionDate, executionDate: tx.executionDate,
executionTxHash: tx.transactionHash, executionTxHash,
safeTxHash: tx.safeTxHash, safeTxHash: tx.safeTxHash,
isTokenTransfer: isSendTokenTx, isTokenTransfer: isSendTokenTx,
decodedParams, decodedParams,