[beta] Bump react-qr-reader (#7943)

* [beta] Update react-qr-reader * Explicit webrtc-adapter dependency (package-lock workaround) * iframe with allow (QR, new Chrome policy)
openethereum · Feb 19, 2018 · 9d697c5 · 9d697c5
1 parent 6a29fea
commit 9d697c5
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 47 deletions.
diff --git a/js-old/package-lock.json b/js-old/package-lock.json
diff --git a/js-old/package.json b/js-old/package.json
@@ -179,7 +179,7 @@
     "react-intl": "2.1.5",
     "react-markdown": "2.4.4",
     "react-portal": "3.0.0",
-    "react-qr-reader": "1.1.3",
+    "react-qr-reader": "2.0.1",
     "react-redux": "4.4.6",
     "react-router": "3.0.0",
     "react-router-redux": "4.0.7",
@@ -201,6 +201,7 @@
     "utf8": "2.1.2",
     "valid-url": "1.0.9",
     "validator": "6.2.0",
+    "webrtc-adapter": "5.0.6",
     "whatwg-fetch": "2.0.1",
     "worker-loader": "^0.8.0",
     "zxcvbn": "4.4.1"

diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/src/Dapp/dapp.js b/js/src/Dapp/dapp.js
@@ -135,6 +135,7 @@ export default class Dapp extends Component {
 
     return (
       <iframe
+        allow='camera'
         className={ styles.frame }
         frameBorder={ 0 }
         id='dappFrame'