From f7ad978474f42eb96f4f6c79376391504cf228c1 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 23 Jul 2018 21:27:51 -0400 Subject: camera working back and forth --- ui/app/components/send/send-content/send-content.component.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ui/app/components/send/send-content') diff --git a/ui/app/components/send/send-content/send-content.component.js b/ui/app/components/send/send-content/send-content.component.js index 7a0b1a18e..566ee1c7f 100644 --- a/ui/app/components/send/send-content/send-content.component.js +++ b/ui/app/components/send/send-content/send-content.component.js @@ -11,6 +11,7 @@ export default class SendContent extends Component { static propTypes = { updateGas: PropTypes.func, + scanQrCode: PropTypes.func, }; render () { @@ -19,6 +20,7 @@ export default class SendContent extends Component {
this.props.updateGas(updateData)} /> + this.props.updateGas(updateData)} /> -- cgit v1.2.3 From d5929e5c42e230fc0a52337f86b5850e68516563 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 23 Jul 2018 22:10:57 -0400 Subject: added qr code scanner icon in send transaction --- ui/app/components/send/send-content/send-content.component.js | 6 ++++-- .../send/send-content/send-to-row/send-to-row.component.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'ui/app/components/send/send-content') diff --git a/ui/app/components/send/send-content/send-content.component.js b/ui/app/components/send/send-content/send-content.component.js index 566ee1c7f..60f97ab32 100644 --- a/ui/app/components/send/send-content/send-content.component.js +++ b/ui/app/components/send/send-content/send-content.component.js @@ -19,8 +19,10 @@ export default class SendContent extends Component {
- this.props.updateGas(updateData)} /> - + this.props.updateGas(updateData)} + scanQrCode={ _ => this.props.scanQrCode()} + /> this.props.updateGas(updateData)} /> diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js index 892ad5d67..321d1cfac 100644 --- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js +++ b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js @@ -51,6 +51,7 @@ export default class SendToRow extends Component { showError={inError} > this.props.scanQrCode()} accounts={toAccounts} closeDropdown={() => closeToDropdown()} dropdownOpen={toDropdownOpen} -- cgit v1.2.3 From ea028e750663b41d5d01ea642f7946ffbbb1287a Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 26 Jul 2018 20:56:58 -0400 Subject: fully working without tweaking ext. permission --- ui/app/components/send/send-content/send-content.component.js | 2 +- .../components/send/send-content/send-to-row/send-to-row.component.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ui/app/components/send/send-content') diff --git a/ui/app/components/send/send-content/send-content.component.js b/ui/app/components/send/send-content/send-content.component.js index 60f97ab32..df7bcb7cc 100644 --- a/ui/app/components/send/send-content/send-content.component.js +++ b/ui/app/components/send/send-content/send-content.component.js @@ -20,7 +20,7 @@ export default class SendContent extends Component {
this.props.updateGas(updateData)} + updateGas={(updateData) => this.props.updateGas(updateData)} scanQrCode={ _ => this.props.scanQrCode()} /> this.props.updateGas(updateData)} /> diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js index 321d1cfac..1163dcffc 100644 --- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js +++ b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js @@ -17,6 +17,7 @@ export default class SendToRow extends Component { updateGas: PropTypes.func, updateSendTo: PropTypes.func, updateSendToError: PropTypes.func, + scanQrCode: PropTypes.func, }; static contextTypes = { -- cgit v1.2.3 From d4a15f22c24074f44daa9eeb4fda192ea3742792 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 26 Jul 2018 21:00:48 -0400 Subject: added webrtc-adapter for browser compat --- ui/app/components/send/send-content/send-to-row/send-to-row.component.js | 1 + 1 file changed, 1 insertion(+) (limited to 'ui/app/components/send/send-content') diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js index 1163dcffc..6d8ec8d89 100644 --- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js +++ b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types' import SendRowWrapper from '../send-row-wrapper/' import EnsInput from '../../../ens-input' import { getToErrorObject } from './send-to-row.utils.js' +import adapter from 'webrtc-adapter' export default class SendToRow extends Component { -- cgit v1.2.3 From 6886429f0b74b8f281818fb03484cccd0e0b8ed0 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 26 Jul 2018 21:22:39 -0400 Subject: fix linting errors --- ui/app/components/send/send-content/send-to-row/send-to-row.component.js | 1 - 1 file changed, 1 deletion(-) (limited to 'ui/app/components/send/send-content') diff --git a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js index 6d8ec8d89..1163dcffc 100644 --- a/ui/app/components/send/send-content/send-to-row/send-to-row.component.js +++ b/ui/app/components/send/send-content/send-to-row/send-to-row.component.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types' import SendRowWrapper from '../send-row-wrapper/' import EnsInput from '../../../ens-input' import { getToErrorObject } from './send-to-row.utils.js' -import adapter from 'webrtc-adapter' export default class SendToRow extends Component { -- cgit v1.2.3