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

This reverts commit d4f0cc8f47, reversing
changes made to 101ac77dbe.

src/routes/safe/store/actions/fetchTransactions.js

@@ -14,6 +14,7 @@ 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'
 
@@ -37,7 +38,6 @@ type TxServiceModel = {
   executionDate: string,
   confirmations: ConfirmationServiceModel[],
   isExecuted: boolean,
-  transactionHash: string,
 }
 
 export const buildTransactionFrom = async (
@@ -63,6 +63,13 @@ 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
@@ -105,7 +112,7 @@ export const buildTransactionFrom = async (
     isExecuted: tx.isExecuted,
     submissionDate: tx.submissionDate,
     executionDate: tx.executionDate,
-    executionTxHash: tx.transactionHash,
+    executionTxHash,
     safeTxHash: tx.safeTxHash,
     isTokenTransfer: isSendTokenTx,
     decodedParams,