From 633e5403a123d23df6a2f6f274944cfe55734867 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Thu, 4 Feb 2021 10:04:00 +0100 Subject: [PATCH] Return all Safe App interactions to be multisend transactions --- .../Apps/components/ConfirmTransactionModal.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/routes/safe/components/Apps/components/ConfirmTransactionModal.tsx b/src/routes/safe/components/Apps/components/ConfirmTransactionModal.tsx index b2bf1d62..057cf611 100644 --- a/src/routes/safe/components/Apps/components/ConfirmTransactionModal.tsx +++ b/src/routes/safe/components/Apps/components/ConfirmTransactionModal.tsx @@ -18,7 +18,7 @@ import { SafeApp } from 'src/routes/safe/components/Apps/types.d' import { fromTokenUnit } from 'src/logic/tokens/utils/humanReadableValue' import createTransaction from 'src/logic/safe/store/actions/createTransaction' 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 GasEstimationInfo from './GasEstimationInfo' @@ -114,9 +114,14 @@ export const ConfirmTransactionModal = ({ }: OwnProps): React.ReactElement | null => { const [estimatedSafeTxGas, setEstimatedSafeTxGas] = useState(0) const threshold = useSelector(safeThresholdSelector) || 1 - const txRecipient: string | undefined = useMemo(() => (txs.length > 1 ? MULTI_SEND_ADDRESS : txs[0]?.to), [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]) + // FIXME #issue-1848 check why this generates bugs with WalletConnect Safe app and some interactions + // const txRecipient: string | undefined = useMemo(() => (txs.length > 1 ? MULTI_SEND_ADDRESS : txs[0]?.to), [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 { gasLimit,