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

Bug: Safe apps passed value converted to ether to createTransaction action instead of wei (#2115) 

* dont convert transaction value to ether for createTransaction

Co-authored-by: Daniel Sanchez <daniel.sanchez@gnosis.pm>
This commit is contained in:
Mikhail Mikheev 2021-03-31 17:36:18 +03:00 committed by GitHub
parent f8ccff0796
commit 2669471e13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/safe/components/Apps/components/ConfirmTxModal/ReviewConfirm.tsx
View File

@ -13,6 +13,7 @@ import { MULTI_SEND_ADDRESS } from 'src/logic/contracts/safeContracts'
import { DELEGATE_CALL, TX_NOTIFICATION_TYPES, CALL } from 'src/logic/safe/transactions' import { DELEGATE_CALL, TX_NOTIFICATION_TYPES, CALL } from 'src/logic/safe/transactions'
import { encodeMultiSendCall } from 'src/logic/safe/transactions/multisend' import { encodeMultiSendCall } from 'src/logic/safe/transactions/multisend'
import { getNetworkInfo } from 'src/config' import { getNetworkInfo } from 'src/config'
import { web3ReadOnly } from 'src/logic/wallets/getWeb3'
import { EstimationStatus, useEstimateTransactionGas } from 'src/logic/hooks/useEstimateTransactionGas' import { EstimationStatus, useEstimateTransactionGas } from 'src/logic/hooks/useEstimateTransactionGas'
import { TransactionFees } from 'src/components/TransactionsFees' import { TransactionFees } from 'src/components/TransactionsFees'
import { EditableTxParameters } from 'src/routes/safe/components/Transactions/helpers/EditableTxParameters' import { EditableTxParameters } from 'src/routes/safe/components/Transactions/helpers/EditableTxParameters'
@ -58,6 +59,10 @@ type Props = ConfirmTxModalProps & {
hidden: boolean // used to prevent re-rendering the modal each time a tx is inspected hidden: boolean // used to prevent re-rendering the modal each time a tx is inspected
} }
const parseTxValue = (value: string | number): string => {
return web3ReadOnly.utils.toBN(value).toString()
}
export const ReviewConfirm = ({ export const ReviewConfirm = ({
app, app,
txs, txs,
@ -86,10 +91,9 @@ export const ReviewConfirm = ({
isMultiSend, isMultiSend,
]) ])
const txValue: string | undefined = useMemo( const txValue: string | undefined = useMemo(
() => (isMultiSend ? '0' : txs[0]?.value && fromTokenUnit(txs[0]?.value, nativeCoin.decimals)), () => (isMultiSend ? '0' : txs[0]?.value && parseTxValue(txs[0]?.value)),
[txs, isMultiSend], [txs, isMultiSend],
) )
const operation = useMemo(() => (isMultiSend ? DELEGATE_CALL : CALL), [isMultiSend]) const operation = useMemo(() => (isMultiSend ? DELEGATE_CALL : CALL), [isMultiSend])
const [manualSafeTxGas, setManualSafeTxGas] = useState(0) const [manualSafeTxGas, setManualSafeTxGas] = useState(0)
const [manualGasPrice, setManualGasPrice] = useState<string | undefined>() const [manualGasPrice, setManualGasPrice] = useState<string | undefined>()
@ -199,7 +203,11 @@ export const ReviewConfirm = ({
<DividerLine withArrow /> <DividerLine withArrow />
{/* Txs decoded */} {/* Txs decoded */}
<BasicTxInfo txRecipient={txRecipient} txData={txData} txValue={txValue} /> <BasicTxInfo
txRecipient={txRecipient}
txData={txData}
txValue={fromTokenUnit(txValue, nativeCoin.decimals)}
/>
<DecodeTxsWrapper> <DecodeTxsWrapper>
<DecodeTxs txs={txs} decodedData={decodedData} onTxItemClick={showDecodedTxData} /> <DecodeTxs txs={txs} decodedData={decodedData} onTxItemClick={showDecodedTxData} />