Browse Source

added missing qr code scan in native send

all-modes
pbca26 7 years ago
parent
commit
eb5caa9ba6
  1. 1
      react/change.log
  2. 9
      react/src/components/dashboard/sendCoin/sendCoin.js
  3. 9
      react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
  4. 6
      react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js
  5. 6
      react/src/components/overrides.scss

1
react/change.log

@ -15,6 +15,7 @@ UI:
- quick access dropdown on login to open settings / about / sync only modals
- qr code generator / scan
- basilisk send form reset fix
- added native wallet info button
v0.2.0.21a-beta
--------------

9
react/src/components/dashboard/sendCoin/sendCoin.js

@ -1,9 +1,7 @@
import React from 'react';
import Config from '../../../config';
import { translate } from '../../../translate/translate';
import {
checkTimestamp
} from '../../../util/time';
import { checkTimestamp } from '../../../util/time';
import {
edexGetTxIDList,
edexRemoveTXID
@ -302,7 +300,7 @@ class SendCoin extends React.Component {
);
} else {
return (
<span>- { translate('SEND.SELECT_T_OR_Z_ADDR') } -</span>
<span>{ translate('SEND.SELECT_T_OR_Z_ADDR') }</span>
);
}
}
@ -326,7 +324,7 @@ class SendCoin extends React.Component {
<ul className="dropdown-menu inner">
<li className="selected">
<a>
<span className="text"> - { translate('SEND.SELECT_T_OR_Z_ADDR') } - </span>
<span className="text">{ translate('SEND.SELECT_T_OR_Z_ADDR') }</span>
<span className="glyphicon glyphicon-ok check-mark"></span>
</a>
</li>
@ -758,6 +756,7 @@ class SendCoin extends React.Component {
return null;
}
render() {
if (this.props.ActiveCoin &&
this.props.ActiveCoin.send &&

9
react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js

@ -35,6 +35,7 @@ class WalletsNativeSend extends React.Component {
this.getOAdress = this.getOAdress.bind(this);
this.handleClickOutside = this.handleClickOutside.bind(this);
this.checkZAddressCount = this.checkZAddressCount.bind(this);
this.setRecieverFromScan = this.setRecieverFromScan.bind(this);
}
componentWillMount() {
@ -57,6 +58,14 @@ class WalletsNativeSend extends React.Component {
this.checkZAddressCount();
}
setRecieverFromScan(receiver) {
this.setState({
sendTo: receiver
});
document.getElementById('kmdWalletSendTo').focus();
}
handleClickOutside(e) {
if (e.srcElement.className !== 'btn dropdown-toggle btn-info' &&
(e.srcElement.offsetParent && e.srcElement.offsetParent.className !== 'btn dropdown-toggle btn-info') &&

6
react/src/components/dashboard/walletsNativeSend/walletsNativeSend.render.js

@ -1,5 +1,6 @@
import React from 'react';
import { translate } from '../../../translate/translate';
import QRModal from '../qrModal/qrModal';
export const AddressListRender = function() {
return (
@ -70,6 +71,11 @@ export const WalletsNativeSendRender = function() {
{ translate('INDEX.SEND') } { this.props.ActiveCoin.coin }
</h3>
</div>
<div className="qr-modal-send-block">
<QRModal
mode="scan"
setRecieverFromScan={ this.setRecieverFromScan } />
</div>
<div className="panel-body container-fluid">
<form
className="extcoin-send-form"

6
react/src/components/overrides.scss

@ -658,6 +658,12 @@ select{
}
}
.qr-modal-send-block {
position: absolute;
top: 15px;
right: 30px;
}
@media only screen and (min-width : 1201px) {
.wallet-widgets {
.flex {

Loading…
Cancel
Save