status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix project compilation

This commit is contained in:
Mikhail Mikheev 2020-04-23 15:49:14 +04:00
parent c2ef1f3b50
commit fe2e21d2d4
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/safe/store/actions/transactions/createTransaction.js
View File

@ -4,8 +4,9 @@ import { List } from 'immutable'
import type { GetState, Dispatch as ReduxDispatch } from 'redux'
import semverSatisfies from 'semver/functions/satisfies'
import { makeConfirmation } from '../models/confirmation'
import { makeConfirmation } from '../../models/confirmation'
import fetchTransactions from './fetchTransactions'
import updateTransaction from './updateTransaction'
import { onboardUser } from '~/components/ConnectButton'
@ -26,7 +27,6 @@ import { ZERO_ADDRESS } from '~/logic/wallets/ethAddresses'
import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
import { providerSelector } from '~/logic/wallets/store/selectors'
import { SAFELIST_ADDRESS } from '~/routes/routes'
import fetchTransactions from '~/routes/safe/store/actions/transactionsfetchTransactions'
import { getLastTx, getNewTxNonce, shouldExecuteTransaction } from '~/routes/safe/store/actions/utils'
import { type GlobalState } from '~/store'
import { getErrorMessage } from '~/test/utils/ethereumErrors'

2
src/routes/safe/store/actions/transactions/fetchTransactions.js
View File

@ -24,7 +24,7 @@ import {
import { ZERO_ADDRESS, sameAddress } from '~/logic/wallets/ethAddresses'
import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
import { getWeb3 } from '~/logic/wallets/getWeb3'
import { addCancellationTransactions } from '~/routes/safe/store/actions/addCancellationTransactions'
import { addCancellationTransactions } from '~/routes/safe/store/actions/transactions/addCancellationTransactions'
import { makeConfirmation } from '~/routes/safe/store/models/confirmation'
import { type IncomingTransaction, makeIncomingTransaction } from '~/routes/safe/store/models/incomingTransaction'
import { makeOwner } from '~/routes/safe/store/models/owner'

2
src/routes/safe/store/actions/transactions/utils/mockTransaction.js Normal file
View File

@ -0,0 +1,2 @@
// @flow
const getMockedTransaction = (safeTxHash, isExecution) => {}

4
src/routes/safe/store/middleware/notificationsMiddleware.js
View File

@ -12,9 +12,9 @@ import { isUserOwner } from '~/logic/wallets/ethAddresses'
import { userAccountSelector } from '~/logic/wallets/store/selectors'
import { getIncomingTxAmount } from '~/routes/safe/components/Transactions/TxsTable/columns'
import { grantedSelector } from '~/routes/safe/container/selector'
import { ADD_INCOMING_TRANSACTIONS } from '~/routes/safe/store/actions/addIncomingTransactions'
import { ADD_SAFE } from '~/routes/safe/store/actions/addSafe'
import { ADD_TRANSACTIONS } from '~/routes/safe/store/actions/addTransactions'
import { ADD_INCOMING_TRANSACTIONS } from '~/routes/safe/store/actions/transactions/addIncomingTransactions'
import { ADD_TRANSACTIONS } from '~/routes/safe/store/actions/transactions/addTransactions'
import updateSafe from '~/routes/safe/store/actions/updateSafe'
import { safeParamAddressFromStateSelector, safesMapSelector } from '~/routes/safe/store/selectors'
import { type GlobalState } from '~/store/'

2
src/routes/safe/store/reducer/cancellationTransactions.js
View File

@ -2,7 +2,7 @@
import { List, Map } from 'immutable'
import { type ActionType, handleActions } from 'redux-actions'
import { ADD_CANCELLATION_TRANSACTIONS } from '~/routes/safe/store/actions/addCancellationTransactions'
import { ADD_CANCELLATION_TRANSACTIONS } from '~/routes/safe/store/actions/transactions/addCancellationTransactions'
import { type Transaction } from '~/routes/safe/store/models/transaction'
export const CANCELLATION_TRANSACTIONS_REDUCER_ID = 'cancellationTransactions'

2
src/routes/safe/store/reducer/incomingTransactions.js
View File

@ -2,7 +2,7 @@
import { List, Map } from 'immutable'
import { type ActionType, handleActions } from 'redux-actions'
import { ADD_INCOMING_TRANSACTIONS } from '~/routes/safe/store/actions/addIncomingTransactions'
import { ADD_INCOMING_TRANSACTIONS } from '~/routes/safe/store/actions/transactions/addIncomingTransactions'
import type { IncomingTransaction } from '~/routes/safe/store/models/incomingTransaction'
export const INCOMING_TRANSACTIONS_REDUCER_ID = 'incomingTransactions'