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

validate addresses in qr codes (#9916)

Browse Source
This commit is contained in:
Brad Decker 2020-11-19 15:44:42 -06:00 committed by GitHub
parent 35af9ea301
commit 3ebba0d411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/app/pages/send/send.component.js
View File

@ -1,5 +1,6 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import ethUtil from 'ethereumjs-util'
import { debounce } from 'lodash'
import {
getAmountErrorObject,
@ -16,6 +17,7 @@ import AddRecipient from './send-content/add-recipient'
import SendContent from './send-content'
import SendFooter from './send-footer'
import EnsInput from './send-content/add-recipient/ens-input'
import { INVALID_RECIPIENT_ADDRESS_ERROR } from './send.constants'
export default class SendTransactionScreen extends Component {
static propTypes = {
@ -162,12 +164,18 @@ export default class SendTransactionScreen extends Component {
if (qrCodeData) {
if (qrCodeData.type === 'address') {
scannedAddress = qrCodeData.values.address.toLowerCase()
const currentAddress = prevTo?.toLowerCase()
if (currentAddress !== scannedAddress) {
updateSendTo(scannedAddress)
updateGas = true
// Clean up QR code data after handling
if (ethUtil.isValidAddress(scannedAddress)) {
const currentAddress = prevTo?.toLowerCase()
if (currentAddress !== scannedAddress) {
updateSendTo(scannedAddress)
updateGas = true
// Clean up QR code data after handling
qrCodeDetected(null)
}
} else {
scannedAddress = null
qrCodeDetected(null)
this.setState({ toError: INVALID_RECIPIENT_ADDRESS_ERROR })
}
}
}