Komodod is down!
+{ this.props.ActiveCoin.coin === 'KMD' ? 'Komodod' : `Komodod / ${this.props.ActiveCoin.coin}` } is down!
diff --git a/react/src/components/dashboard/jumblr/jumblr.js b/react/src/components/dashboard/jumblr/jumblr.js
index 4ae03a0..a69dbd1 100755
--- a/react/src/components/dashboard/jumblr/jumblr.js
+++ b/react/src/components/dashboard/jumblr/jumblr.js
@@ -1,14 +1,391 @@
import React from 'react';
import { translate } from '../../../translate/translate';
+import {
+ dashboardChangeActiveCoin,
+ getKMDAddressesNative,
+ startInterval,
+ stopInterval,
+ triggerToaster,
+ setJumblrAddress,
+ importPrivkey,
+ copyCoinAddress,
+ copyString
+} from '../../../actions/actionCreators';
+import Store from '../../../store';
+import Config from '../../../config';
+import {
+ JumblrRender,
+ JumblrRenderSecretAddressList
+} from './jumblr.render';
+import { PassPhraseGenerator } from '../../../util/crypto/passphrasegenerator';
-import JumblrRender from './jumblr.render';
+// import gen komodo keys utils
+import '../../../util/crypto/gen/array.map.js';
+import '../../../util/crypto/gen/cryptojs.js';
+import '../../../util/crypto/gen/cryptojs.sha256.js';
+import '../../../util/crypto/gen/cryptojs.pbkdf2.js';
+import '../../../util/crypto/gen/cryptojs.hmac.js';
+import '../../../util/crypto/gen/cryptojs.aes.js';
+import '../../../util/crypto/gen/cryptojs.blockmodes.js';
+import '../../../util/crypto/gen/cryptojs.ripemd160.js';
+import '../../../util/crypto/gen/securerandom.js';
+import '../../../util/crypto/gen/ellipticcurve.js';
+import '../../../util/crypto/gen/biginteger.js';
+import '../../../util/crypto/gen/crypto-scrypt.js';
+import { Bitcoin } from '../../../util/crypto/gen/bitcoin.js';
+
+if (!window.jumblrPasshrase) { // gen jumblr passphrase
+ window.jumblrPasshrase = 'jumblr ' + PassPhraseGenerator.generatePassPhrase(256);
+}
class Jumblr extends React.Component {
constructor(props) {
super(props);
this.state = {
activeTab: 0,
+ randomSeed: window.jumblrPasshrase,
+ jumblrDepositAddress: null,
+ jumblrDepositAddressPBased: true,
+ jumblrSecretAddressShow: true,
+ jumblrSecretAddress: [],
+ jumblrSecretAddressImport: [],
+ jumblrSecretAddressCountImport: 0,
+ jumblrSecretAddressShowImport: true,
+ jumblrSecretAddressCount: 0,
+ jumblrMode: 'public',
+ secretAddressCount: 1,
+ secretAddressCountImport: 1,
+ jumblrPassphraseImport: '',
+ };
+ this.generateJumblrDepositAddress = this.generateJumblrDepositAddress.bind(this);
+ this.generateJumblrSecretAddress = this.generateJumblrSecretAddress.bind(this);
+ this.checkJumblrSecretAddressListLength = this.checkJumblrSecretAddressListLength.bind(this);
+ this.returnPassphrase = this.returnPassphrase.bind(this);
+ this.generateKeys = this.generateKeys.bind(this);
+ this._copyCoinAddress = this._copyCoinAddress.bind(this);
+ this.copyPassphrase = this.copyPassphrase.bind(this);
+ this.checkPassphraseValid = this.checkPassphraseValid.bind(this);
+ this.importJumblrSecretAddress = this.importJumblrSecretAddress.bind(this);
+ this.onChange = this.onChange.bind(this);
+ }
+
+ generateKeys(passphrase) {
+ if (!passphrase) {
+ const key = new Bitcoin.ECKey(false).setCompressed(true);
+ const kmdAddress = key.getBitcoinAddress();
+ const wifAddress = key.getBitcoinWalletImportFormat();
+
+ return {
+ address: kmdAddress,
+ wif: wifAddress,
+ };
+ } else {
+ const bytes = Crypto.SHA256(passphrase, { asBytes: true });
+ const btcKey = new Bitcoin.ECKey(bytes).setCompressed(true);
+ const kmdAddress = btcKey.getBitcoinAddress();
+ const wifAddress = btcKey.getBitcoinWalletImportFormat();
+
+ return {
+ address: kmdAddress,
+ wif: wifAddress,
+ };
+ }
+ }
+
+ _JumblrRenderSecretAddressList(type) {
+ return JumblrRenderSecretAddressList.call(this, type);
+ }
+
+ onChange(e) {
+ const regex = /^[0-9\b]+$/;
+
+ if (e.target.value === '' ||
+ regex.test(e.target.value)) {
+ this.setState({
+ [e.target.name]: e.target.value,
+ });
+ }
+ }
+
+ passphraseOnChange(e) {
+ this.setState({
+ [e.target.name]: e.target.value,
+ });
+ }
+
+ returnPassphrase() {
+ this.setState({
+ randomSeed: window.jumblrPasshrase,
+ });
+ }
+
+ toggle(prop) {
+ const _prop = this.state[prop];
+
+ this.setState({
+ [prop]: !_prop,
+ });
+ }
+
+ /*toggleAddressGenMod() {
+ this.setState({
+ jumblrDepositAddressPBased: !this.state.jumblrDepositAddressPBased,
+ });
+ }*/
+
+ generateJumblrSecretAddress() {
+ let _jumblrSecretAddress = [];
+ let _apiSuccessCount = 0;
+
+ if (this.state.secretAddressCount === '') {
+ Store.dispatch(
+ triggerToaster(
+ 'Enter a correct address count value',
+ 'Jumblr',
+ 'error'
+ )
+ );
+ } else {
+ for (let i = 0; i < this.state.secretAddressCount; i++) {
+ let _genKeys;
+
+ if (this.state.jumblrDepositAddressPBased) {
+ let _postfix;
+
+ if (i < 9) {
+ _postfix = `00${i + 1}`;
+ } else if (i > 10 && i < 100) {
+ _postfix = `0${i + 1}`;
+ }
+ _genKeys = this.generateKeys(`${this.state.randomSeed} ${_postfix}`);
+ // console.warn(`${this.state.randomSeed} ${_postfix}`);
+ } else {
+ _genKeys = this.generateKeys();
+ }
+
+ setJumblrAddress(this.props.ActiveCoin.coin, 'secret', _genKeys.address)
+ .then((json) => {
+ if (json.error &&
+ json.error.code) {
+ Store.dispatch(
+ triggerToaster(
+ json.error.message,
+ 'Error',
+ 'error'
+ )
+ );
+ } else if (json.result && json.result.result && json.result.result === 'success') {
+ _jumblrSecretAddress.push(_genKeys);
+ this.setState(Object.assign({}, this.state, {
+ jumblrSecretAddress: _jumblrSecretAddress,
+ }));
+
+ if (_apiSuccessCount === this.state.secretAddressCount - 1) {
+ Store.dispatch(
+ triggerToaster(
+ this.state.secretAddressCount > 1 ? 'Jumblr secret addresses are set' : 'Jumblr secret address is set',
+ 'Jumblr',
+ 'success'
+ )
+ );
+ }
+ _apiSuccessCount++;
+ }
+ });
+ }
+ }
+ }
+
+ checkPassphraseValid() { // test passphrase validity
+ const _passphrase = this.state.jumblrPassphraseImport;
+ const _jumblrPrefix = _passphrase.substring(0, 6);
+ const _passphraseWords = _passphrase.substring(6, _passphrase.length);
+ let _errors = {
+ prefix: false, // jumblr
+ length: false, // 24
};
+
+ if (_jumblrPrefix !== 'jumblr') {
+ _errors.prefix = true;
+ }
+
+ try {
+ const _passphraseWordsSplit = _passphraseWords.split(' ');
+ let _correctWords = 0;
+
+ if (_passphraseWordsSplit &&
+ _passphraseWordsSplit.length) {
+ for (let i = 0; i < _passphraseWordsSplit.length; i++) {
+ if (_passphraseWordsSplit[i].length > 2) {
+ _correctWords++;
+ }
+ }
+
+ if (_correctWords !== _passphraseWordsSplit.length - 1 || _correctWords !== 24) {
+ _errors.length = true;
+ }
+ } else {
+ _errors.length = true;
+ }
+ } catch(e) {
+ _errors.length = true;
+ }
+
+
+ if (_errors.length ||
+ _errors.prefix) {
+ Store.dispatch(
+ triggerToaster(
+ 'Provided passphrase has wrong format',
+ 'Jumblr',
+ 'error',
+ false
+ )
+ );
+
+ return false;
+ }
+
+ return true;
+ }
+
+ importJumblrSecretAddress() {
+ let _jumblrSecretAddress = [];
+ let _apiSuccessCount = 0;
+
+ if (this.state.secretAddressCountImport === '') {
+ Store.dispatch(
+ triggerToaster(
+ 'Enter a correct address count value',
+ 'Jumblr',
+ 'error'
+ )
+ );
+ } else {
+ if (this.checkPassphraseValid()) {
+ for (let i = 0; i < this.state.secretAddressCountImport; i++) {
+ let _genKeys;
+
+ if (this.state.jumblrDepositAddressPBased) {
+ let _postfix;
+
+ if (i < 9) {
+ _postfix = `00${i + 1}`;
+ } else if (i > 10 && i < 100) {
+ _postfix = `0${i + 1}`;
+ }
+ _genKeys = this.generateKeys(`${this.state.jumblrPassphraseImport} ${_postfix}`);
+ } else {
+ _genKeys = this.generateKeys();
+ }
+
+ importPrivkey(this.props.ActiveCoin.coin, _genKeys.wif)
+ .then((json) => {
+ if (!json.id && !json.result && !json.error) {
+ _jumblrSecretAddress.push(_genKeys);
+ this.setState(Object.assign({}, this.state, {
+ jumblrSecretAddressImport: _jumblrSecretAddress,
+ }));
+ if (_apiSuccessCount === this.state.secretAddressCountImport - 1) {
+ Store.dispatch(
+ triggerToaster(
+ this.state.secretAddressCountImport > 1 ? 'Jumblr secret addresses imported' : 'Jumblr secret address imported',
+ 'Jumblr',
+ 'success'
+ )
+ );
+ }
+ _apiSuccessCount++;
+ } else {
+ Store.dispatch(
+ triggerToaster(
+ json.error.message,
+ 'Error',
+ 'error'
+ )
+ );
+ }
+ });
+ }
+ }
+ }
+ }
+
+ checkJumblrSecretAddressListLength(type) {
+ if (type === 'gen') {
+ if (this.state.jumblrSecretAddress &&
+ this.state.jumblrSecretAddress.length) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ if (this.state.jumblrSecretAddressImport &&
+ this.state.jumblrSecretAddressImport.length) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+
+ generateJumblrDepositAddress() {
+ let _genKeys;
+
+ if (this.state.jumblrDepositAddressPBased) {
+ _genKeys = this.generateKeys(this.state.randomSeed);
+ } else {
+ _genKeys = this.generateKeys();
+ }
+
+ importPrivkey(this.props.ActiveCoin.coin, _genKeys.wif)
+ .then((json) => {
+ if (!json.id && !json.result && !json.error) {
+ // console.warn('importPrivkey', json);
+ setJumblrAddress(this.props.ActiveCoin.coin, 'deposit', _genKeys.address)
+ .then((json) => {
+ if (json.error &&
+ json.error.code) {
+ Store.dispatch(
+ triggerToaster(
+ json.error.message,
+ 'Error',
+ 'error'
+ )
+ );
+ } else if (json.result && json.result.result === 0) {
+ this.setState(Object.assign({}, this.state, {
+ jumblrDepositAddress: {
+ address: _genKeys.address,
+ wif: _genKeys.wif,
+ },
+ }));
+ Store.dispatch(
+ triggerToaster(
+ 'Jumblr deposit address is set',
+ 'Jumblr',
+ 'success'
+ )
+ );
+ }
+ });
+ } else {
+ Store.dispatch(
+ triggerToaster(
+ json.error.message,
+ 'Error',
+ 'error'
+ )
+ );
+ }
+ });
+ }
+
+ switchJumblrMode(mode) {
+ this.setState(Object.assign({}, this.state, {
+ jumblrMode: mode,
+ activeTab: 0,
+ }));
}
openTab(tab) {
@@ -17,6 +394,14 @@ class Jumblr extends React.Component {
}));
}
+ _copyCoinAddress(address) {
+ Store.dispatch(copyCoinAddress(address));
+ }
+
+ copyPassphrase() {
+ Store.dispatch(copyString(this.state.randomSeed, 'Passphrase copied'));
+ }
+
renderLB(_translationID) {
const _translationComponents = translate(_translationID).split('
'); diff --git a/react/src/components/dashboard/jumblr/jumblr.render.js b/react/src/components/dashboard/jumblr/jumblr.render.js index 846400d..0e8b25e 100644 --- a/react/src/components/dashboard/jumblr/jumblr.render.js +++ b/react/src/components/dashboard/jumblr/jumblr.render.js @@ -2,10 +2,52 @@ import React from 'react'; import { translate } from '../../../translate/translate'; import WalletsHeader from '../walletsHeader/walletsHeader'; +import WalletsNativeSend from '../walletsNativeSend/walletsNativeSend'; +import ReceiveCoin from '../receiveCoin/receiveCoin'; -const JumblrRender = function() { +export const JumblrRenderSecretAddressList = function(type) { + const _jumblrAddressList = type === 'gen' ? this.state.jumblrSecretAddress : this.state.jumblrSecretAddressImport; + let _items = []; + + if (_jumblrAddressList && + _jumblrAddressList.length) { + for (let i = 0; i < _jumblrAddressList.length; i++) { + _items.push( +
+ { _jumblrAddressList[i].address }
+ { _jumblrAddressList[i].wif }
+
+ );
+ }
+ return _items;
+ } else {
+ return null;
+ }
+};
+
+/* passphrase toggle
+
'); diff --git a/react/src/components/dashboard/jumblr/jumblr.render.js b/react/src/components/dashboard/jumblr/jumblr.render.js index 846400d..0e8b25e 100644 --- a/react/src/components/dashboard/jumblr/jumblr.render.js +++ b/react/src/components/dashboard/jumblr/jumblr.render.js @@ -2,10 +2,52 @@ import React from 'react'; import { translate } from '../../../translate/translate'; import WalletsHeader from '../walletsHeader/walletsHeader'; +import WalletsNativeSend from '../walletsNativeSend/walletsNativeSend'; +import ReceiveCoin from '../receiveCoin/receiveCoin'; -const JumblrRender = function() { +export const JumblrRenderSecretAddressList = function(type) { + const _jumblrAddressList = type === 'gen' ? this.state.jumblrSecretAddress : this.state.jumblrSecretAddressImport; + let _items = []; + + if (_jumblrAddressList && + _jumblrAddressList.length) { + for (let i = 0; i < _jumblrAddressList.length; i++) { + _items.push( +
+
+
+
+*/
+
+export const JumblrRender = function() {
return (
- this.toggleAddressGenMod() }>
+ Passphrase based address
+
+
+
+
- this.dashboardChangeSection('jumblr') }>
- Jumblr
-
-
+ { this.props.ActiveCoin && this.props.ActiveCoin.mode === 'native' && (this._checkAC() || this.props.ActiveCoin.coin === 'KMD') &&
+
+ this.dashboardChangeSection('jumblr') }>
+ Jumblr
+
+
+ }
this.dashboardChangeSection('atomic') }>
Atomic Explorer
diff --git a/react/src/components/dashboard/qrModal/qrModal.js b/react/src/components/dashboard/qrModal/qrModal.js
index 0866cc9..7012919 100755
--- a/react/src/components/dashboard/qrModal/qrModal.js
+++ b/react/src/components/dashboard/qrModal/qrModal.js
@@ -19,22 +19,28 @@ class QRModal extends React.Component {
this.closeModal = this.closeModal.bind(this);
this.handleScan = this.handleScan.bind(this);
this.handleError = this.handleError.bind(this);
- document.body.addEventListener('click', this.closeModal);
}
handleScan(data) {
if (data !== null) {
if (this.props.mode === 'scan') {
- this.props.setRecieverFromScan(data)
+ this.props.setRecieverFromScan(data);
}
+
this.closeModal();
}
}
handleError(err) {
- this.setState({
- error: err,
- });
+ if (err.name === 'NoVideoInputDevicesError') {
+ this.setState({
+ error: 'Error: No video input devices found!',
+ });
+ } else {
+ this.setState({
+ error: 'Error: unknown error!',
+ });
+ }
}
openModal() {
@@ -60,10 +66,6 @@ class QRModal extends React.Component {
this.setState({
modalIsOpen: false,
});
-
- if (this.props.mode === 'scan') {
- ReactDOM.unmountComponentAtNode(document.getElementById('webcam'));
- }
}
render() {
diff --git a/react/src/components/dashboard/qrModal/qrModal.render.js b/react/src/components/dashboard/qrModal/qrModal.render.js
index 0524407..db7d0eb 100644
--- a/react/src/components/dashboard/qrModal/qrModal.render.js
+++ b/react/src/components/dashboard/qrModal/qrModal.render.js
@@ -66,7 +66,13 @@ export const QRModalReaderRender = function () {
@@ -32,87 +74,135 @@ const JumblrRender = function() {
×
- { translate('JUMBLR.NEED_NATIVE') }
+ About Jumblr
- { translate('JUMBLR.TO_USE_JUMBLR') } -
- { translate('JUMBLR.IF_YOU_ALREADY_RUNNING') } +
- { translate('JUMBLR.TO_USE_JUMBLR') } -
- { translate('JUMBLR.IF_YOU_ALREADY_RUNNING') } +
+ Jumblr functions all locally which means no middle man is required to jumble your funds. You take control over the whole process. +
++ Tip: to achive maximum anonimity setup Jumblr node on a dedicated piece of hardware (laptop or VPS), use a separate IP address for main Jumblr node. +
-
{ translate('JUMBLR.THIS_SCREEN_DOESNT_REFRESH') }
+
+
-
+
+
+
+
+
+
+
+
-
-
-
diff --git a/react/src/components/dashboard/main/dashboard.render.js b/react/src/components/dashboard/main/dashboard.render.js
index 580f60e..59b5b98 100644
--- a/react/src/components/dashboard/main/dashboard.render.js
+++ b/react/src/components/dashboard/main/dashboard.render.js
@@ -36,21 +36,21 @@ const DashboardRender = function() {
-
- this.openTab(0) }>
- { translate('JUMBLR.FEW_SECURITY_NOTES') }
-
-
-
-
-
- -
-
- { translate('JUMBLR.FEW_SECURITY_NOTES_DESC1') } -
- { translate('JUMBLR.FEW_SECURITY_NOTES_DESC2') } -
- { translate('JUMBLR.FEW_SECURITY_NOTES_DESC3') } -
- { translate('JUMBLR.FEW_SECURITY_NOTES_DESC4') } -
- { translate('JUMBLR.FEW_SECURITY_NOTES_DESC5') } -
-
- this.openTab(1) }>
- { translate('JUMBLR.ACCESS_JUMBLR_FUNDS') }
-
-
-
-
-
- { translate('JUMBLR.ADDRESS_ACCESSIBLE_EASILY') }
--
-
duck dog cat donkey
- -
-
- { translate('JUMBLR.TO_ACCESS') } -
- { translate('JUMBLR.CLOSE_IAPP') } -
- { translate('JUMBLR.START_IAPP') } -
- { translate('JUMBLR.START_KMD') } -
- { translate('JUMBLR.ACCESS_JUMBLR_FUNDS') }
-
-
-
- { translate('JUMBLR.SMALL_LETTERS') } -
- { translate('JUMBLR.WHITE_SPACE') } -
- -
- { translate('JUMBLR.PER_EXAMPLE') }
-
-jumblr duck dog cat donkey-
- - { translate('JUMBLR.LOGIN_WITH_JUMBLR') } -
{ translate('JUMBLR.AGAIN_DONT_SHARE') }
-
-
+ }
+ { this.state.jumblrMode === 'private' &&
+ this.openTab(2) }>
- { translate('JUMBLR.USING_JUMBLR') }
+
-
+ { this.state.jumblrMode === 'public' &&
+
-
+
-
-
+ { this.props.ActiveCoin.coin }
+ 
-
-
-
+
- -
+
- this.openTab(0) }> + + { translate('JUMBLR.USING_JUMBLR') } + + +
- this.openTab(1) }> + + Deposit address + + +
- this.openTab(2) }> + + Secret address + + +
- this.openTab(3) }> + + Deposit funds + + +
+
-
+
+
- How to use Jumblr
-
-
- { translate('JUMBLR.RUN_KMD') } -
- { translate('JUMBLR.LOGIN_KMD') } -
- { translate('JUMBLR.GO_TO') } -
- { translate('JUMBLR.FIND_DEPOSIT_ADDR') } -
- { translate('JUMBLR.YOU_SEND_FUNDS') } +
- Create deposit address +
- Create secret address +
- Send funds to deposit address
- { translate('JUMBLR.KEEP_WALLET_OPEN') }
- { translate('JUMBLR.IMPORTANT_FUNDS') }
- { translate('JUMBLR.LARGE_LOT') } @@ -122,105 +212,276 @@ const JumblrRender = function() {
{ translate('JUMBLR.TO_CLEAR_THEM') }
{ translate('JUMBLR.WHEN_IT_TOTALS') }
-
{ translate('JUMBLR.JADDR') }
-
-
+
-
-
-
+
+ }
+ | { translate('JUMBLR.BTC_DEPOSIT') } | -- - | -
| BTC Jumblr | -
+
+
+ { translate('JUMBLR.FEW_SECURITY_NOTES') }+
+
+ { this.state.jumblrDepositAddressPBased &&
+
+
+
+
+
-
- { translate('JUMBLR.HIDDEN') }
- + Please write down your Jumblr passphrase and keept it safe. + +This is your main recovery passphrase. +All Jumblr addresses can be regenrated based on it. +
+ Tip: do not use smart editors to store your passphrase as they tend to add extra characters. |
-
| { translate('JUMBLR.KMD_DEPOSIT') } | -- |
| KMD Jumblr | -
+
+ }
+
+ { this.state.jumblrDepositAddress && this.state.jumblrDepositAddress.address &&
+
+ Your Jumblr deposit address:
+
+ }
+
+ + { this.state.jumblrDepositAddress.address } + + ++ { this.state.jumblrDepositAddress.wif } + + +
+
+ Jumblr secret addresses are used for the final z -> t transactions. +In order to allow larger accounts to obtain privacy, up to 777 secret addresses are supported. +Whenever a z -> t stage is activated, a random secret address from the list of the then active secret addresses is selected. +To add a new set of secret addresses enter address count below. The passphrase below is exactly the same you saw on the previous step. +Your Jumblr secret address recovery passphrase will have the following pattern
+
+
-
-
- { translate('JUMBLR.HIDDEN') }
-
- |
-
Number of secret addresses
+
+
+
+
+
+
+
+
+
+
+ this.toggle('jumblrSecretAddressShow') }>
+ Show address list
+
+
+
+ { this.state.jumblrSecretAddressShow && this.checkJumblrSecretAddressListLength('gen') &&
+
+
+
+ }
+
+ | + Address + | ++ Wif + | +
+
+ Use the form below to send funds to your jumblr deposit address.
+You can also send funds to deposit address from an external service or another wallet.
+
+
-
+
- this.openTab(0) }> + + Import secret address + + +
- this.openTab(1) }> + + Check funds + + +
+
+
+
+ }
+
- Enter your Jumblr passphrase you got previously during Public node configuration to import secret address.
+Passphrase example: jumblr muffin smart educate tomato boss foil open dirt opinion pizza goddess skate action card garden cotton life write life note shine myself gloom summer.
The form below will "regenerate" Jumblr secret address based on passphrase provided.
+After this final step expect to see funds processed and credited to your address after 2 days period.
-
-
- { translate('JUMBLR.JSTATUS') } -
-
-
+
-
-
-
+ { this.state.jumblrDepositAddressPBased &&
+
+ | { translate('JUMBLR.RESULT') } | -- - | -
| { translate('JUMBLR.DEPOSITED') } | -- |
| { translate('JUMBLR.PUB_TO_PRIV') } | -- |
| { translate('JUMBLR.PRIV_TO_PRIV') } | -- |
| { translate('JUMBLR.PRIV_TO_PUB') } | -- |
| { translate('JUMBLR.FINISHED') } | -- |
| { translate('JUMBLR.PENDING') } | -- |
+
+ this.passphraseOnChange(event) }
+ value={ this.state.jumblrPassphraseImport } />
+
+ }
+ Number of secret addresses
+
+
+
+
+
+
+
+
+
+
+ this.toggle('jumblrSecretAddressShowImport') }>
+ Show address list
+
+
+
+ { this.state.jumblrSecretAddressShowImport && this.checkJumblrSecretAddressListLength('import') &&
+
+
+
+ }
+
+ | + Address + | ++ Wif + | +
+
+
+ { this.isSectionActive('edex') &&
-
+ }
+ { this.isSectionActive('atomic') &&
-
+ }
+ { this.isSectionActive('jumblr') &&
-
+ }
+ { this.isSectionActive('settings') &&
-
+ }
+ { this.isSectionActive('about') &&
+ }
-
+
{ this.state.error }
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.js b/react/src/components/dashboard/receiveCoin/receiveCoin.js
index 9f1c1dd..cd304b4 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.js
@@ -10,7 +10,8 @@ import {
AddressActionsBasiliskModeRender,
AddressActionsNonBasiliskModeRender,
AddressItemRender,
- ReceiveCoinRender
+ ReceiveCoinRender,
+ _ReceiveCoinTableRender
} from './receiveCoin.render';
// TODO: implement balance/interest sorting
@@ -28,6 +29,11 @@ class ReceiveCoin extends React.Component {
this.handleClickOutside = this.handleClickOutside.bind(this);
this.toggleVisibleAddress = this.toggleVisibleAddress.bind(this);
this.checkTotalBalance = this.checkTotalBalance.bind(this);
+ this.ReceiveCoinTableRender = _ReceiveCoinTableRender.bind(this);
+ }
+
+ ReceiveCoinTableRender() {
+ return this._ReceiveCoinTableRender();
}
componentWillMount() {
@@ -108,7 +114,7 @@ class ReceiveCoin extends React.Component {
}
getNewAddress(type) {
- Store.dispatch(getNewKMDAddresses(this.props.coin, type));
+ Store.dispatch(getNewKMDAddresses(this.props.coin, type, this.props.mode));
}
toggleVisibleAddress() {
@@ -167,15 +173,17 @@ class ReceiveCoin extends React.Component {
if (this.isBasiliskMode() &&
this.hasNoAmount(address)) {
- address.amount = _cache && _cache[_coin][address.address]
- && _cache[_coin][address.address].getbalance.data
- && _cache[_coin][address.address].getbalance.data.balance ? _cache[_coin][address.address].getbalance.data.balance : 'N/A';
+ address.amount = _cache && _cache[_coin][address.address] &&
+ _cache[_coin][address.address].getbalance &&
+ _cache[_coin][address.address].getbalance.data &&
+ _cache[_coin][address.address].getbalance.data.balance ? _cache[_coin][address.address].getbalance.data.balance : 'N/A';
}
if (this.isBasiliskMode() &&
this.hasNoInterest(address)) {
- address.interest = _cache && _cache[_coin][address.address]
- && _cache[_coin][address.address].getbalance.data
- && _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
+ address.interest = _cache && _cache[_coin][address.address] &&
+ _cache[_coin][address.address].getbalance &&
+ _cache[_coin][address.address].getbalance.data &&
+ _cache[_coin][address.address].getbalance.data.interest ? _cache[_coin][address.address].getbalance.data.interest : 'N/A';
}
if (this.state.hideZeroAddresses) {
diff --git a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
index a95a02d..038ea1c 100644
--- a/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+++ b/react/src/components/dashboard/receiveCoin/receiveCoin.render.js
@@ -26,9 +26,7 @@ export const AddressActionsBasiliskModeRender = function(address) {
onClick={ () => this._validateAddressBasilisk(address) }>
-
-
-
-
-
-
-
- {this.isNativeMode() &&
-
-
-
-
- }
- { translate('INDEX.RECEIVING_ADDRESS') }
-
- { this.checkTotalBalance() !== 0 &&
-
- );
+ );
+ }
};
diff --git a/react/src/components/dashboard/sendCoin/sendCoin.js b/react/src/components/dashboard/sendCoin/sendCoin.js
index 39566aa..e80716e 100644
--- a/react/src/components/dashboard/sendCoin/sendCoin.js
+++ b/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
@@ -55,7 +53,6 @@ class SendCoin extends React.Component {
currentStackLength: 0,
totalStackLength: 0,
utxoMethodInProgress: false,
- isCameraFeatureDetected: false,
};
this.updateInput = this.updateInput.bind(this);
this.handleBasiliskSend = this.handleBasiliskSend.bind(this);
@@ -66,27 +63,9 @@ class SendCoin extends React.Component {
this._fetchNewUTXOData = this._fetchNewUTXOData.bind(this);
this.handleClickOutside = this.handleClickOutside.bind(this);
this.setRecieverFromScan = this.setRecieverFromScan.bind(this);
- this.detectCamera = this.detectCamera.bind(this);
socket.on('messages', msg => this.updateSocketsData(msg));
}
- // test device camera capabilities
- detectCamera() {
- const _getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
-
- _getUserMedia(
- { 'video': true },
- function() {
- this.setState({
- isCameraFeatureDetected: true,
- });
- },
- function() {
- console.warn('this device doesn\'t have camera!');
- }
- );
- }
-
setRecieverFromScan(receiver) {
this.setState({
sendTo: receiver
@@ -101,8 +80,6 @@ class SendCoin extends React.Component {
this.handleClickOutside,
false
);
-
- this.detectCamera();
}
componentWillUnmount() {
@@ -323,7 +300,7 @@ class SendCoin extends React.Component {
);
} else {
return (
- - { translate('SEND.SELECT_T_OR_Z_ADDR') } -
+ { translate('SEND.SELECT_T_OR_Z_ADDR') }
);
}
}
@@ -347,7 +324,7 @@ class SendCoin extends React.Component {
-
- - - - { translate('SEND.SELECT_T_OR_Z_ADDR') } - + { translate('SEND.SELECT_T_OR_Z_ADDR') } @@ -395,7 +372,7 @@ class SendCoin extends React.Component { amount: 0, fee: 0.0001, sendSig: false, - sendApiType: false, + sendApiType: true, addressSelectorOpen: false, currentStackLength: 0, totalStackLength: 0, @@ -697,6 +674,8 @@ class SendCoin extends React.Component { ); } } else if (key === 'sendrawtransaction') { + const _lastSendToResponse = this.props.ActiveCoin.lastSendToResponse; + if (_lastSendToResponse[key] === 'success') { return ( true @@ -707,6 +686,8 @@ class SendCoin extends React.Component { ); } } else if (key === 'txid' || key === 'sent') { + const _lastSendToResponse = this.props.ActiveCoin.lastSendToResponse; + return ( { _lastSendToResponse[key] } ); @@ -775,6 +756,7 @@ class SendCoin extends React.Component { return null; } + render() { if (this.props.ActiveCoin && this.props.ActiveCoin.send && diff --git a/react/src/components/dashboard/sendCoin/sendCoin.render.js b/react/src/components/dashboard/sendCoin/sendCoin.render.js index 5a30302..43672d8 100644 --- a/react/src/components/dashboard/sendCoin/sendCoin.render.js +++ b/react/src/components/dashboard/sendCoin/sendCoin.render.js @@ -8,6 +8,8 @@ import { import QRModal from '../qrModal/qrModal'; export const UTXOCacheInfoRender = function(refreshCacheData, isReadyToUpdate, waitUntilCallIsFinished, timestamp) { + const _progress = 100 - this.state.currentStackLength * 100 / this.state.totalStackLength; + return (
@@ -25,7 +27,7 @@ export const UTXOCacheInfoRender = function(refreshCacheData, isReadyToUpdate, w
+ style={{ width: `${_progress}%` }}>
{ translate('SEND.PROCESSING_REQ') }: { this.state.currentStackLength } / { this.state.totalStackLength }
-
- { translate('SEND.PROCESSING_TRANSACTION') }...
- { translate('SEND.NOTE_IT_WILL_TAKE') }. -
- - { translate('SEND.NOTE_IT_WILL_TAKE') }. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
);
}
}
-export const OASendUIRender = function () {
+export const OASendUIRender = function() {
return (
+
-
+
+ { translate('SEND.PROCESSING_TRANSACTION') }...
+ { translate('SEND.NOTE_IT_WILL_TAKE') }.
-
- + { translate('SEND.NOTE_IT_WILL_TAKE') }.
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -136,7 +142,7 @@ export const OASendUIRender = function () {
);
};
-export const SendApiTypeSelectorRender = function () {
+export const SendApiTypeSelectorRender = function() {
return (
- { this.stateisCameraFeatureDetected &&
-
);
};
-export const SendCoinRender = function () {
+export const SendCoinRender = function() {
return (
@@ -144,7 +150,8 @@ export const SendApiTypeSelectorRender = function () {
-
- }
+
+
@@ -247,9 +252,8 @@ export const SendCoinRender = function () {
className="form-control"
id="edexcoinAmount"
name="amount"
- placeholder="0.000"
+ placeholder="0.001"
autoComplete="off"
- defaultValue={ this.state.amount }
value={ this.state.amount }
onChange={ this.updateInput } />
@@ -264,16 +268,15 @@ export const SendCoinRender = function () {
className="form-control"
id="edexcoinFee"
name="fee"
- defaultValue={ this.state.fee }
value={ this.state.fee }
- placeholder="0.000"
+ placeholder="0.001"
autoComplete="off"
onChange={ this.updateInput } />
{ translate('INDEX.TOTAL') }
- ({ translate('INDEX.AMOUNT_SM') } - txfee):
+ ({ translate('INDEX.AMOUNT_SM') } - fee):
{ Number(this.state.amount) - Number(this.state.fee) } { this.props.ActiveCoin.coin }
@@ -282,7 +285,8 @@ export const SendCoinRender = function () {