aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-25 10:34:15 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-25 10:34:15 +0800
commit4759915856440028186df56d4646565dc5c4a5d6 (patch)
tree1c5bd488c70596c3c60fe95802a8cee49669f071 /ui
parenteeb902dbf0d77a487903c386c11fca5bd9114300 (diff)
downloadtangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar.gz
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar.bz2
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar.lz
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar.xz
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.tar.zst
tangerine-wallet-browser-4759915856440028186df56d4646565dc5c4a5d6.zip
fix spinner and qr icon
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/qr-scanner/qr-scanner.component.js7
-rw-r--r--ui/app/css/itcss/components/send.scss1
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/qr-scanner/qr-scanner.component.js b/ui/app/components/qr-scanner/qr-scanner.component.js
index 4cc296441..fd3361cf2 100644
--- a/ui/app/components/qr-scanner/qr-scanner.component.js
+++ b/ui/app/components/qr-scanner/qr-scanner.component.js
@@ -44,8 +44,11 @@ class QrScanner extends Component {
Instascan.Camera.getCameras().then((cameras) => {
if (cameras.length > 0) {
this.scanner.start(cameras[0])
- this.setState({ ready: true })
- this.setState({ msg: 'Place the QR code in front of your camera so we can read it...'})
+ setTimeout(_ => {
+ this.setState({
+ ready: true,
+ msg: 'Place the QR code in front of your camera so we can read it...'})
+ }, 2000)
console.log('QR-SCANNER: started scanning with camera', cameras[0])
} else {
this.setState({ msg: 'No camera found :('})
diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss
index e9f22a14e..ad6199f02 100644
--- a/ui/app/css/itcss/components/send.scss
+++ b/ui/app/css/itcss/components/send.scss
@@ -631,6 +631,7 @@
position: absolute;
top: 21px;
left: 13px;
+ cursor: pointer;
}
&__input.with-qr {