m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix 9988 - Don't allow more than 15% slippage (#9991)

Browse Source
This commit is contained in:
David Walsh 2020-12-07 09:12:55 -06:00 committed by GitHub
parent e8cb565b48
commit 56f80ae9a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/_locales/en/messages.json
View File

@ -1737,7 +1737,7 @@
"message": "Quote details" "message": "Quote details"
}, },
"swapQuoteDetailsSlippageInfo": { "swapQuoteDetailsSlippageInfo": {
"message": "If the price changes between the time your order is placed and confirmed it’s called \"slippage\". Your Swap will automatically cancel if slippage exceeds your \"max slippage\" setting." "message": "If the price changes between the time your order is placed and confirmed it’s called \"slippage\". Your Swap will automatically cancel if slippage exceeds your \"slippage tolerance\" setting."
}, },
"swapQuoteIncludesRate": { "swapQuoteIncludesRate": {
"message": "Quote includes a $1% MetaMask fee", "message": "Quote includes a $1% MetaMask fee",
@ -1853,8 +1853,11 @@
"message": "Convert $1 to about", "message": "Convert $1 to about",
"description": "This message is part of a quote for a swap. The $1 is the amount being converted, and the amount it is being swapped for is below this message" "description": "This message is part of a quote for a swap. The $1 is the amount being converted, and the amount it is being swapped for is below this message"
}, },
"swapsExcessiveSlippageWarning": {
"message": "Slippage amount is too high and will result in a bad rate. Please reduce your slippage tolerance to a value below 15%."
},
"swapsMaxSlippage": { "swapsMaxSlippage": {
"message": "Max slippage" "message": "Slippage Tolerance"
}, },
"swapsNotEnoughForTx": { "swapsNotEnoughForTx": {
"message": "Not enough $1 to complete this transaction", "message": "Not enough $1 to complete this transaction",

6
ui/app/pages/swaps/build-quote/build-quote.js
View File

@ -47,6 +47,8 @@ const fuseSearchKeys = [
{ name: 'address', weight: 0.002 }, { name: 'address', weight: 0.002 },
] ]
const MAX_ALLOWED_SLIPPAGE = 15
export default function BuildQuote({ export default function BuildQuote({
inputValue, inputValue,
onInputChange, onInputChange,
@ -393,6 +395,7 @@ export default function BuildQuote({
onSelect={(newSlippage) => { onSelect={(newSlippage) => {
setMaxSlippage(newSlippage) setMaxSlippage(newSlippage)
}} }}
maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
/> />
</div> </div>
</div> </div>
@ -411,7 +414,8 @@ export default function BuildQuote({
disabled={ disabled={
!Number(inputValue) || !Number(inputValue) ||
!selectedToToken?.address || !selectedToToken?.address ||
Number(maxSlippage) === 0 Number(maxSlippage) === 0 ||
Number(maxSlippage) > MAX_ALLOWED_SLIPPAGE
} }
hideCancel hideCancel
/> />

22
ui/app/pages/swaps/slippage-buttons/slippage-buttons.js
View File

@ -6,7 +6,7 @@ import ButtonGroup from '../../../components/ui/button-group'
import Button from '../../../components/ui/button' import Button from '../../../components/ui/button'
import InfoTooltip from '../../../components/ui/info-tooltip' import InfoTooltip from '../../../components/ui/info-tooltip'
export default function SlippageButtons({ onSelect }) { export default function SlippageButtons({ onSelect, maxAllowedSlippage }) {
const t = useContext(I18nContext) const t = useContext(I18nContext)
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const [customValue, setCustomValue] = useState('') const [customValue, setCustomValue] = useState('')
@ -15,12 +15,19 @@ export default function SlippageButtons({ onSelect }) {
const [inputRef, setInputRef] = useState(null) const [inputRef, setInputRef] = useState(null)
let errorText = '' let errorText = ''
if (customValue && Number(customValue) <= 0) { if (customValue) {
errorText = t('swapSlippageTooLow') if (Number(customValue) <= 0) {
} else if (customValue && Number(customValue) < 0.5) { errorText = t('swapSlippageTooLow')
errorText = t('swapLowSlippageError') } else if (Number(customValue) < 0.5) {
} else if (customValue && Number(customValue) > 5) { errorText = t('swapLowSlippageError')
errorText = t('swapHighSlippageWarning') } else if (
Number(customValue) >= 5 &&
Number(customValue) <= maxAllowedSlippage
) {
errorText = t('swapHighSlippageWarning')
} else if (Number(customValue) > maxAllowedSlippage) {
errorText = t('swapsExcessiveSlippageWarning')
}
} }
const customValueText = customValue || t('swapCustom') const customValueText = customValue || t('swapCustom')
@ -151,4 +158,5 @@ export default function SlippageButtons({ onSelect }) {
SlippageButtons.propTypes = { SlippageButtons.propTypes = {
onSelect: PropTypes.func.isRequired, onSelect: PropTypes.func.isRequired,
maxAllowedSlippage: PropTypes.number.isRequired,
} }