Merge pull request #278 from gnosis/bug/executed-tx-shown-as-awaiting

Bug: Executed tx shown as awaiting

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,