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

Fix #9043 - Ensure QR code scanner works

Browse Source
This commit is contained in:
David Walsh 2020-10-14 16:48:09 -05:00
parent 0558689636
commit 947bfb7a11
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,15 +104,28 @@ export default class QrScanner extends Component {
componentWillUnmount () {
this.mounted = false
clearTimeout(this.permissionChecker)
if (this.codeReader) {
this.codeReader.reset()
this.teardownCodeReader();
}
teardownCodeReader() {
if(this.codeReader) {
this.codeReader.reset();
this.codeReader.stop();
this.codeReader = null;
}
}
initCamera = async () => {
// The `decodeFromInputVideoDevice` call prompts the browser to show
// the user the camera permission request. We must then call it again
// once we receive permission so that the video displays.
// Removing this teardown will create 2 video streams in Firefox, one
// of which the user will not be able to remove without refreshing the page.
this.teardownCodeReader();
this.codeReader = new BrowserQRCodeReader()
try {
await this.codeReader.getVideoInputDevices()
this.checkPermissions();
const content = await this.codeReader.decodeFromInputVideoDevice(undefined, 'video')
const result = this.parseContent(content.text)
if (!this.mounted) {
@ -162,7 +175,7 @@ export default class QrScanner extends Component {
stopAndClose = () => {
if (this.codeReader) {
this.codeReader.reset()
this.teardownCodeReader();
}
this.props.hideModal()
}
@ -170,7 +183,7 @@ export default class QrScanner extends Component {
tryAgain = () => {
clearTimeout(this.permissionChecker)
if (this.codeReader) {
this.codeReader.reset()
this.teardownCodeReader()
}
this.setState(this.getInitialState(), () => {
this.checkEnvironment()