Format code

src/logic/safe/transactions/send.js

@@ -62,8 +62,7 @@ export const approveTransaction = async (
         )
       })
       .on('error', (error) => {
-        /* eslint-disable */
+        console.error('Tx error:', error)
-        console.log('Tx error:', error)
       })
       .then(async (receipt) => {
         closeSnackbar(pendingExecutionKey)
@@ -84,13 +83,13 @@ export const approveTransaction = async (
 
     return transactionHash
   } catch (error) {
+    closeSnackbar(beforeExecutionKey)
     closeSnackbar(pendingExecutionKey)
     enqueueSnackbar(notiQueue.afterExecutionError.description, notiQueue.afterExecutionError.options)
 
-    /* eslint-disable */
     const executeData = safeInstance.contract.methods.approveHash(txHash).encodeABI()
     const errMsg = await getErrorMessage(safeInstance.address, 0, executeData, sender)
-    console.log(`Error executing the TX: ${errMsg}`)
+    console.error(`Error executing the TX: ${errMsg}`)
 
     throw error
   }
@@ -138,7 +137,7 @@ export const executeTransaction = async (
         )
       })
       .on('error', (error) => {
-        console.log('Tx error:', error)
+        console.error('Tx error:', error)
       })
       .then(async (receipt) => {
         closeSnackbar(pendingExecutionKey)
@@ -160,14 +159,14 @@ export const executeTransaction = async (
     return transactionHash
   } catch (error) {
     closeSnackbar(beforeExecutionKey)
+    closeSnackbar(pendingExecutionKey)
     enqueueSnackbar(notiQueue.afterExecutionError.description, notiQueue.afterExecutionError.options)
 
-    /* eslint-disable */
     const executeDataUsedSignatures = safeInstance.contract.methods
       .execTransaction(to, valueInWei, data, operation, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs)
       .encodeABI()
     const errMsg = await getErrorMessage(safeInstance.address, 0, executeDataUsedSignatures, sender)
-    console.log(`Error executing the TX: ${errMsg}`)
+    console.error(`Error executing the TX: ${errMsg}`)
 
     throw error
   }

src/logic/wallets/store/actions/fetchProvider.js

@@ -46,11 +46,9 @@ const handleProviderNotification = (enqueueSnackbar: Function, closeSnackbar: Fu
   }
 }
 
-export default (
+export default (provider: ProviderProps, enqueueSnackbar: Function, closeSnackbar: Function) => (
-  provider: ProviderProps,
+  dispatch: ReduxDispatch<*>,
-  enqueueSnackbar: Function,
+) => {
-  closeSnackbar: Function,
-) => (dispatch: ReduxDispatch<*>) => {
   handleProviderNotification(enqueueSnackbar, closeSnackbar, provider)
   processProviderResponse(dispatch, provider)
 }

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

@@ -24,10 +24,7 @@ export const addSafe = createAction<string, Function, ActionReturn>(ADD_SAFE, (s
   safe,
 }))
 
-const saveSafe = (safe: Safe) => (
+const saveSafe = (safe: Safe) => (dispatch: ReduxDispatch<GlobalState>, getState: GetState<GlobalState>) => {
-  dispatch: ReduxDispatch<GlobalState>,
-  getState: GetState<GlobalState>,
-) => {
   const state = getState()
   const safeList = safesListSelector(state)
 

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

@@ -14,7 +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/send'
+import { TX_TYPE_EXECUTION } from '~/logic/safe/transactions'
 import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds'
 
 let web3

src/store/index.js

@@ -37,9 +37,6 @@ const reducers: Reducer<GlobalState> = combineReducers({
   [TRANSACTIONS_REDUCER_ID]: transactions,
 })
 
-export const store: Store<GlobalState> = createStore(
+export const store: Store<GlobalState> = createStore(reducers, finalCreateStore)
-  reducers,
-  finalCreateStore,
-)
 
 export const aNewStore = (localState?: Object): Store<GlobalState> => createStore(reducers, localState, finalCreateStore)