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

clear qr code data before scanning

Browse Source
This commit is contained in:
brunobar79 2018-08-03 19:36:01 -04:00
parent 71ef4d85da
commit af97ba103c
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/components/modals/qr-scanner/qr-scanner.component.js
View File

@ -28,6 +28,9 @@ export default class QrScanner extends Component {
this.codeReader = null this.codeReader = null
this.permissionChecker = null this.permissionChecker = null
this.needsToReinit = false this.needsToReinit = false
// Clear pre-existing qr code data before scanning
this.props.qrCodeDetected(null)
} }
componentDidMount () { componentDidMount () {

45
ui/lib/webcam-utils.js
View File

@ -8,29 +8,28 @@ class WebcamUtils {
static checkStatus () { static checkStatus () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
reject({type: 'UNKNOWN_ERROR'}) const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP
// const isPopup = getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1
// const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1 const isBrave = !!window.chrome.ipcRenderer
// const isBrave = !!window.chrome.ipcRenderer const isFirefoxOrBrave = isFirefox || isBrave
// const isFirefoxOrBrave = isFirefox || isBrave try {
// try { DetectRTC.load(_ => {
// DetectRTC.load(_ => { if (DetectRTC.hasWebcam) {
// if (DetectRTC.hasWebcam) { let environmentReady = true
// let environmentReady = true if ((isFirefoxOrBrave && isPopup) || (isPopup && !DetectRTC.isWebsiteHasWebcamPermissions)) {
// if ((isFirefoxOrBrave && isPopup) || (isPopup && !DetectRTC.isWebsiteHasWebcamPermissions)) { environmentReady = false
// environmentReady = false }
// } resolve({
// resolve({ permissions: DetectRTC.isWebsiteHasWebcamPermissions,
// permissions: DetectRTC.isWebsiteHasWebcamPermissions, environmentReady,
// environmentReady, })
// }) } else {
// } else { reject({type: 'NO_WEBCAM_FOUND'})
// reject({type: 'NO_WEBCAM_FOUND'}) }
// } })
// }) } catch (e) {
// } catch (e) { reject({type: 'UNKNOWN_ERROR'})
// reject({type: 'UNKNOWN_ERROR'}) }
// }
}) })
} }
} }