Refactor executeTransaction to show notification after confirmation

src/logic/safe/transactions/send.js

@@ -1,4 +1,5 @@
 // @flow
+import GnosisSafeSol from '@gnosis.pm/safe-contracts/build/contracts/GnosisSafe.json'
 import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { getStandardTokenContract } from '~/logic/tokens/store/actions/fetchTokens'
 import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
@@ -55,6 +56,7 @@ export const approveTransaction = async (
 }
 
 export const executeTransaction = async (
+  showNotification: Function,
   safeInstance: any,
   to: string,
   valueInWei: number | string,
@@ -75,33 +77,37 @@ export const executeTransaction = async (
   }
 
   try {
-    const receipt = await safeInstance.execTransaction(
+    const web3 = getWeb3()
-      to,
+    const contract = new web3.eth.Contract(GnosisSafeSol.abi, safeInstance.address)
-      valueInWei,
-      data,
-      operation,
-      0,
-      0,
-      0,
-      ZERO_ADDRESS,
-      ZERO_ADDRESS,
-      sigs,
-      { from: sender },
-    )
 
-    await saveTxToHistory(
+    const transactionHash = await contract.methods
-      safeInstance,
+      .execTransaction(to, valueInWei, data, operation, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs)
-      to,
+      .send({
-      valueInWei,
+        from: sender,
-      data,
+      })
-      operation,
+      .once('transactionHash', (transactionHash) => {
-      nonce,
+        showNotification()
-      receipt.tx, // tx hash,
+      })
-      sender,
+      .on('error', (error) => {
-      TX_TYPE_EXECUTION,
+        console.log('Tx error:', error)
-    )
+      })
+      .then(async (receipt) => {
+        await saveTxToHistory(
+          safeInstance,
+          to,
+          valueInWei,
+          data,
+          operation,
+          nonce,
+          receipt.transactionHash,
+          sender,
+          TX_TYPE_EXECUTION,
+        )
 
-    return receipt
+        return receipt.transactionHash
+      })
+
+    return transactionHash
   } catch (error) {
     /* eslint-disable */
     const executeDataUsedSignatures = safeInstance.contract.methods

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

@@ -33,8 +33,8 @@ const createTransaction = (
   let txHash
   try {
     if (isExecution) {
-      openSnackbar(notifications.BEFORE_EXECUTION_OR_CREATION, 'success')
+      const showNotification = () => openSnackbar(notifications.BEFORE_EXECUTION_OR_CREATION, 'success')
-      txHash = await executeTransaction(safeInstance, to, valueInWei, txData, CALL, nonce, from)
+      txHash = await executeTransaction(showNotification, safeInstance, to, valueInWei, txData, CALL, nonce, from)
       openSnackbar(notifications.AFTER_EXECUTION, 'success')
     } else {
       openSnackbar(notifications.BEFORE_EXECUTION_OR_CREATION, 'success')