mirror of
https://github.com/status-im/safe-react.git
synced 2025-01-16 21:14:07 +00:00
fix project compilation
This commit is contained in:
parent
4c92fcbcde
commit
1024362325
@ -1,7 +1,7 @@
|
|||||||
// @flow
|
// @flow
|
||||||
import { DELEGATE_CALL } from '~/logic/safe/transactions/send'
|
import { DELEGATE_CALL } from '~/logic/safe/transactions/send'
|
||||||
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
|
|
||||||
const multiSendAddress = '0xB522a9f781924eD250A11C54105E51840B138AdD'
|
const multiSendAddress = '0xB522a9f781924eD250A11C54105E51840B138AdD'
|
||||||
const multiSendAbi = [
|
const multiSendAbi = [
|
||||||
|
@ -14,7 +14,7 @@ import { addOrUpdateAddressBookEntry } from '~/logic/addressBook/store/actions/a
|
|||||||
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
||||||
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
||||||
import addSafeOwner from '~/routes/safe/store/actions/addSafeOwner'
|
import addSafeOwner from '~/routes/safe/store/actions/addSafeOwner'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
import { type Owner } from '~/routes/safe/store/models/owner'
|
import { type Owner } from '~/routes/safe/store/models/owner'
|
||||||
import { safeOwnersSelector, safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
import { safeOwnersSelector, safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@ import ThresholdForm from './screens/ThresholdForm'
|
|||||||
import Modal from '~/components/Modal'
|
import Modal from '~/components/Modal'
|
||||||
import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
||||||
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
|
||||||
import removeSafeOwner from '~/routes/safe/store/actions/removeSafeOwner'
|
import removeSafeOwner from '~/routes/safe/store/actions/removeSafeOwner'
|
||||||
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
import { type Owner } from '~/routes/safe/store/models/owner'
|
import { type Owner } from '~/routes/safe/store/models/owner'
|
||||||
import {
|
import {
|
||||||
safeOwnersSelector,
|
safeOwnersSelector,
|
||||||
|
@ -11,8 +11,8 @@ import Modal from '~/components/Modal'
|
|||||||
import { addOrUpdateAddressBookEntry } from '~/logic/addressBook/store/actions/addOrUpdateAddressBookEntry'
|
import { addOrUpdateAddressBookEntry } from '~/logic/addressBook/store/actions/addOrUpdateAddressBookEntry'
|
||||||
import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
||||||
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
|
||||||
import replaceSafeOwner from '~/routes/safe/store/actions/replaceSafeOwner'
|
import replaceSafeOwner from '~/routes/safe/store/actions/replaceSafeOwner'
|
||||||
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
import { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors'
|
import { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors'
|
||||||
|
|
||||||
const styles = () => ({
|
const styles = () => ({
|
||||||
|
@ -17,7 +17,7 @@ import Row from '~/components/layout/Row'
|
|||||||
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
||||||
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions'
|
||||||
import { grantedSelector } from '~/routes/safe/container/selector'
|
import { grantedSelector } from '~/routes/safe/container/selector'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
import {
|
import {
|
||||||
safeOwnersSelector,
|
safeOwnersSelector,
|
||||||
safeParamAddressFromStateSelector,
|
safeParamAddressFromStateSelector,
|
||||||
|
@ -22,7 +22,7 @@ import { estimateTxGasCosts } from '~/logic/safe/transactions/gasNew'
|
|||||||
import { formatAmount } from '~/logic/tokens/utils/formatAmount'
|
import { formatAmount } from '~/logic/tokens/utils/formatAmount'
|
||||||
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
||||||
import { userAccountSelector } from '~/logic/wallets/store/selectors'
|
import { userAccountSelector } from '~/logic/wallets/store/selectors'
|
||||||
import processTransaction from '~/routes/safe/store/actions/processTransaction'
|
import processTransaction from '~/routes/safe/store/actions/transactions/processTransaction'
|
||||||
import { type Transaction } from '~/routes/safe/store/models/transaction'
|
import { type Transaction } from '~/routes/safe/store/models/transaction'
|
||||||
import { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors'
|
import { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors'
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ import { estimateTxGasCosts } from '~/logic/safe/transactions/gasNew'
|
|||||||
import { formatAmount } from '~/logic/tokens/utils/formatAmount'
|
import { formatAmount } from '~/logic/tokens/utils/formatAmount'
|
||||||
import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
|
import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
|
||||||
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
import { getWeb3 } from '~/logic/wallets/getWeb3'
|
||||||
import createTransaction from '~/routes/safe/store/actions/createTransaction'
|
import createTransaction from '~/routes/safe/store/actions/transactions/createTransaction'
|
||||||
import { type Transaction } from '~/routes/safe/store/models/transaction'
|
import { type Transaction } from '~/routes/safe/store/models/transaction'
|
||||||
import { safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
import { safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import fetchCollectibles from '~/logic/collectibles/store/actions/fetchCollectib
|
|||||||
import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens'
|
import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens'
|
||||||
import fetchEtherBalance from '~/routes/safe/store/actions/fetchEtherBalance'
|
import fetchEtherBalance from '~/routes/safe/store/actions/fetchEtherBalance'
|
||||||
import { checkAndUpdateSafe } from '~/routes/safe/store/actions/fetchSafe'
|
import { checkAndUpdateSafe } from '~/routes/safe/store/actions/fetchSafe'
|
||||||
import fetchTransactions from '~/routes/safe/store/actions/fetchTransactions'
|
import fetchTransactions from '~/routes/safe/store/actions/transactions/fetchTransactions'
|
||||||
import { safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
import { safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors'
|
||||||
import { TIMEOUT } from '~/utils/constants'
|
import { TIMEOUT } from '~/utils/constants'
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ import addViewedSafe from '~/logic/currentSession/store/actions/addViewedSafe'
|
|||||||
import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens'
|
import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens'
|
||||||
import fetchLatestMasterContractVersion from '~/routes/safe/store/actions/fetchLatestMasterContractVersion'
|
import fetchLatestMasterContractVersion from '~/routes/safe/store/actions/fetchLatestMasterContractVersion'
|
||||||
import fetchSafe from '~/routes/safe/store/actions/fetchSafe'
|
import fetchSafe from '~/routes/safe/store/actions/fetchSafe'
|
||||||
import fetchTransactions from '~/routes/safe/store/actions/fetchTransactions'
|
import fetchTransactions from '~/routes/safe/store/actions/transactions/fetchTransactions'
|
||||||
|
|
||||||
export const useLoadSafe = (safeAddress: ?string) => {
|
export const useLoadSafe = (safeAddress: ?string) => {
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
|
@ -10,7 +10,6 @@ import fetchTransactions from './fetchTransactions'
|
|||||||
import updateTransaction from './updateTransaction'
|
import updateTransaction from './updateTransaction'
|
||||||
|
|
||||||
import { onboardUser } from '~/components/ConnectButton'
|
import { onboardUser } from '~/components/ConnectButton'
|
||||||
import { nameFromAddressBookSelector } from '~/logic/addressBook/store/selectors/index'
|
|
||||||
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts'
|
||||||
import { type NotificationsQueue, getNotificationsFromTxType, showSnackbar } from '~/logic/notifications'
|
import { type NotificationsQueue, getNotificationsFromTxType, showSnackbar } from '~/logic/notifications'
|
||||||
import {
|
import {
|
||||||
@ -161,7 +160,6 @@ const createTransaction = ({
|
|||||||
console.error('Tx error: ', error)
|
console.error('Tx error: ', error)
|
||||||
})
|
})
|
||||||
.then((receipt) => {
|
.then((receipt) => {
|
||||||
console.log(receipt)
|
|
||||||
closeSnackbar(pendingExecutionKey)
|
closeSnackbar(pendingExecutionKey)
|
||||||
const safeTxHash = isExecution
|
const safeTxHash = isExecution
|
||||||
? receipt.events.ExecutionSuccess.returnValues[0]
|
? receipt.events.ExecutionSuccess.returnValues[0]
|
||||||
@ -181,7 +179,7 @@ const createTransaction = ({
|
|||||||
type: 'confirmation',
|
type: 'confirmation',
|
||||||
hash: receipt.transactionHash,
|
hash: receipt.transactionHash,
|
||||||
signature: sigs,
|
signature: sigs,
|
||||||
owner: { address: from, name: nameFromAddressBookSelector(state, from) },
|
owner: from,
|
||||||
}),
|
}),
|
||||||
]),
|
]),
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user