status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-02-26 00:15:23 +00:00
Code Issues Projects Releases Wiki Activity

Return all Safe App interactions to be multisend transactions

Browse Source
This commit is contained in:
Daniel Sanchez 2021-02-04 10:04:00 +01:00
parent a1acfc206a
commit 633e5403a1
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/routes/safe/components/Apps/components/ConfirmTransactionModal.tsx
View File

@ -18,7 +18,7 @@ import { SafeApp } from 'src/routes/safe/components/Apps/types.d'
import { fromTokenUnit } from 'src/logic/tokens/utils/humanReadableValue' import { fromTokenUnit } from 'src/logic/tokens/utils/humanReadableValue'
import createTransaction from 'src/logic/safe/store/actions/createTransaction' import createTransaction from 'src/logic/safe/store/actions/createTransaction'
import { MULTI_SEND_ADDRESS } from 'src/logic/contracts/safeContracts' import { MULTI_SEND_ADDRESS } from 'src/logic/contracts/safeContracts'
import { CALL, DELEGATE_CALL, TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions' import { DELEGATE_CALL, TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
import { encodeMultiSendCall } from 'src/logic/safe/transactions/multisend' import { encodeMultiSendCall } from 'src/logic/safe/transactions/multisend'
import GasEstimationInfo from './GasEstimationInfo' import GasEstimationInfo from './GasEstimationInfo'
@ -114,9 +114,14 @@ export const ConfirmTransactionModal = ({
}: OwnProps): React.ReactElement | null => { }: OwnProps): React.ReactElement | null => {
const [estimatedSafeTxGas, setEstimatedSafeTxGas] = useState(0) const [estimatedSafeTxGas, setEstimatedSafeTxGas] = useState(0)
const threshold = useSelector(safeThresholdSelector) || 1 const threshold = useSelector(safeThresholdSelector) || 1
const txRecipient: string | undefined = useMemo(() => (txs.length > 1 ? MULTI_SEND_ADDRESS : txs[0]?.to), [txs]) // FIXME #issue-1848 check why this generates bugs with WalletConnect Safe app and some interactions
const txData: string | undefined = useMemo(() => (txs.length > 1 ? encodeMultiSendCall(txs) : txs[0]?.data), [txs]) // const txRecipient: string | undefined = useMemo(() => (txs.length > 1 ? MULTI_SEND_ADDRESS : txs[0]?.to), [txs])
const operation = useMemo(() => (txs.length > 1 ? DELEGATE_CALL : CALL), [txs]) // const txData: string | undefined = useMemo(() => (txs.length > 1 ? encodeMultiSendCall(txs) : txs[0]?.data), [txs])
// const operation = useMemo(() => (txs.length > 1 ? DELEGATE_CALL : CALL), [txs])
// #issue-1848 Remove this when non multisend transactions are checked
const txRecipient: string | undefined = MULTI_SEND_ADDRESS
const txData: string | undefined = useMemo(() => encodeMultiSendCall(txs), [txs])
const operation = DELEGATE_CALL
const { const {
gasLimit, gasLimit,