From 1024362325f779131e39a81db602df071a027aa4 Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Fri, 24 Apr 2020 18:13:29 +0400 Subject: [PATCH] fix project compilation --- src/routes/safe/components/Apps/sendTransactions.js | 2 +- .../components/Settings/ManageOwners/AddOwnerModal/index.jsx | 2 +- .../Settings/ManageOwners/RemoveOwnerModal/index.jsx | 2 +- .../Settings/ManageOwners/ReplaceOwnerModal/index.jsx | 2 +- .../safe/components/Settings/ThresholdSettings/index.jsx | 2 +- .../Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx | 2 +- .../Transactions/TxsTable/ExpandedTx/RejectTxModal/index.jsx | 2 +- src/routes/safe/container/Hooks/useCheckForUpdates.jsx | 2 +- src/routes/safe/container/Hooks/useLoadSafe.jsx | 2 +- .../safe/store/actions/transactions/createTransaction.js | 4 +--- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/routes/safe/components/Apps/sendTransactions.js b/src/routes/safe/components/Apps/sendTransactions.js index 278686d4..b7807755 100644 --- a/src/routes/safe/components/Apps/sendTransactions.js +++ b/src/routes/safe/components/Apps/sendTransactions.js @@ -1,7 +1,7 @@ // @flow import { DELEGATE_CALL } from '~/logic/safe/transactions/send' 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 multiSendAbi = [ diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.jsx index e76e1a4d..c63cc933 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/index.jsx @@ -14,7 +14,7 @@ import { addOrUpdateAddressBookEntry } from '~/logic/addressBook/store/actions/a import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions' 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 { safeOwnersSelector, safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors' diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx index 4b5e9ceb..423012c7 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/index.jsx @@ -12,8 +12,8 @@ import ThresholdForm from './screens/ThresholdForm' import Modal from '~/components/Modal' import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' 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 createTransaction from '~/routes/safe/store/actions/transactions/createTransaction' import { type Owner } from '~/routes/safe/store/models/owner' import { safeOwnersSelector, diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx index fdcdb5f1..2390f572 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/index.jsx @@ -11,8 +11,8 @@ import Modal from '~/components/Modal' import { addOrUpdateAddressBookEntry } from '~/logic/addressBook/store/actions/addOrUpdateAddressBookEntry' import { SENTINEL_ADDRESS, getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' 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 createTransaction from '~/routes/safe/store/actions/transactions/createTransaction' import { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors' const styles = () => ({ diff --git a/src/routes/safe/components/Settings/ThresholdSettings/index.jsx b/src/routes/safe/components/Settings/ThresholdSettings/index.jsx index aa5023d5..1788cab0 100644 --- a/src/routes/safe/components/Settings/ThresholdSettings/index.jsx +++ b/src/routes/safe/components/Settings/ThresholdSettings/index.jsx @@ -17,7 +17,7 @@ import Row from '~/components/layout/Row' import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' import { TX_NOTIFICATION_TYPES } from '~/logic/safe/transactions' 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 { safeOwnersSelector, safeParamAddressFromStateSelector, diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx index 472637fe..8ed2e34d 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/ApproveTxModal/index.jsx @@ -22,7 +22,7 @@ import { estimateTxGasCosts } from '~/logic/safe/transactions/gasNew' import { formatAmount } from '~/logic/tokens/utils/formatAmount' import { getWeb3 } from '~/logic/wallets/getWeb3' 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 { safeParamAddressFromStateSelector, safeThresholdSelector } from '~/routes/safe/store/selectors' diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/RejectTxModal/index.jsx b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/RejectTxModal/index.jsx index 980e1f95..7ec2d5bd 100644 --- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/RejectTxModal/index.jsx +++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/RejectTxModal/index.jsx @@ -20,7 +20,7 @@ import { estimateTxGasCosts } from '~/logic/safe/transactions/gasNew' import { formatAmount } from '~/logic/tokens/utils/formatAmount' import { EMPTY_DATA } from '~/logic/wallets/ethTransactions' 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 { safeParamAddressFromStateSelector } from '~/routes/safe/store/selectors' diff --git a/src/routes/safe/container/Hooks/useCheckForUpdates.jsx b/src/routes/safe/container/Hooks/useCheckForUpdates.jsx index 6cfdc4bb..098c4c04 100644 --- a/src/routes/safe/container/Hooks/useCheckForUpdates.jsx +++ b/src/routes/safe/container/Hooks/useCheckForUpdates.jsx @@ -6,7 +6,7 @@ import fetchCollectibles from '~/logic/collectibles/store/actions/fetchCollectib import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens' import fetchEtherBalance from '~/routes/safe/store/actions/fetchEtherBalance' 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 { TIMEOUT } from '~/utils/constants' diff --git a/src/routes/safe/container/Hooks/useLoadSafe.jsx b/src/routes/safe/container/Hooks/useLoadSafe.jsx index 31c12110..de8591bb 100644 --- a/src/routes/safe/container/Hooks/useLoadSafe.jsx +++ b/src/routes/safe/container/Hooks/useLoadSafe.jsx @@ -7,7 +7,7 @@ import addViewedSafe from '~/logic/currentSession/store/actions/addViewedSafe' import fetchSafeTokens from '~/logic/tokens/store/actions/fetchSafeTokens' import fetchLatestMasterContractVersion from '~/routes/safe/store/actions/fetchLatestMasterContractVersion' 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) => { const dispatch = useDispatch() diff --git a/src/routes/safe/store/actions/transactions/createTransaction.js b/src/routes/safe/store/actions/transactions/createTransaction.js index f2c1c7a6..05d782dc 100644 --- a/src/routes/safe/store/actions/transactions/createTransaction.js +++ b/src/routes/safe/store/actions/transactions/createTransaction.js @@ -10,7 +10,6 @@ import fetchTransactions from './fetchTransactions' import updateTransaction from './updateTransaction' import { onboardUser } from '~/components/ConnectButton' -import { nameFromAddressBookSelector } from '~/logic/addressBook/store/selectors/index' import { getGnosisSafeInstanceAt } from '~/logic/contracts/safeContracts' import { type NotificationsQueue, getNotificationsFromTxType, showSnackbar } from '~/logic/notifications' import { @@ -161,7 +160,6 @@ const createTransaction = ({ console.error('Tx error: ', error) }) .then((receipt) => { - console.log(receipt) closeSnackbar(pendingExecutionKey) const safeTxHash = isExecution ? receipt.events.ExecutionSuccess.returnValues[0] @@ -181,7 +179,7 @@ const createTransaction = ({ type: 'confirmation', hash: receipt.transactionHash, signature: sigs, - owner: { address: from, name: nameFromAddressBookSelector(state, from) }, + owner: from, }), ]), },