Browse Source

spv coin mode hide by default

v0.25
pbca26 8 years ago
parent
commit
a2b63909ca
  1. 14
      assets/mainWindow/js/loading.js
  2. 3
      react/src/actions/actions/addCoin.js
  3. 2
      react/src/actions/actions/electrum.js
  4. 20
      react/src/components/addcoin/addcoinOptionsCrypto.js
  5. 2
      react/src/components/addcoin/coin-selectors.render.js
  6. 1
      react/src/components/dashboard/sendCoin/sendCoin.js
  7. 6
      react/src/components/dashboard/walletsData/walletsData.render.js

14
assets/mainWindow/js/loading.js

@ -272,4 +272,18 @@ function normalStart() {
$('.dropdown-menu.lite').addClass('hide');
$('.dropdown-menu.native').addClass('hide');
disableModeButtons();
}
function init() {
const remote = require('electron').remote;
var window = remote.getCurrentWindow();
var appConf = remote.getCurrentWindow().appConfig;
if (!appConf.experimentalFeatures) {
$('#spvBtn').hide();
$('#spvBtnCarret').hide();
$('.dropdown-menu.native').css('right', '165px');
$('#nativeOnlyBtnCarret').css('margin-right', '0');
$('#settingsBtn').css('margin', '0');
}
}

3
react/src/actions/actions/addCoin.js

@ -108,7 +108,8 @@ export function shepherdElectrumAddCoin(coin) {
export function addCoin(coin, mode, startupParams) {
console.warn(mode);
if (Number(mode) === 0) {
if (mode === 0 ||
mode === '0') {
console.warn('spv');
return dispatch => {
dispatch(shepherdElectrumAddCoin(coin));

2
react/src/actions/actions/electrum.js

@ -156,7 +156,7 @@ export function shepherdElectrumTransactions(coin, address) {
}
export function shepherdElectrumTransactionsState(json) {
json = json.result.listtransactions;
json = json.result;
if (json &&
json.error) {

20
react/src/components/addcoin/addcoinOptionsCrypto.js

@ -1,17 +1,33 @@
import React from 'react';
import { translate } from '../../translate/translate';
import Config from '../../config';
class AddCoinOptionsCrypto extends React.Component {
constructor() {
super();
this.state = {
isExperimentalOn: false,
};
}
componentWillMount() {
let appConfig;
try {
appConfig = window.require('electron').remote.getCurrentWindow().appConfig;
} catch (e) {}
this.setState({
isExperimentalOn: appConfig.experimentalFeatures,
});
}
render() {
return (
<optgroup label={ translate('ADD_COIN.CRYPTO_CURRENCIES') }>
<option value="KMD|native|spv">Komodo (KMD)</option>
<option value="CHIPS|native|spv">Chips (CHIPS)</option>
<option
value="CHIPS|native|spv"
className={ this.state.isExperimentalOn ? '' : 'hide' }>Chips (CHIPS)</option>
</optgroup>
);
}

2
react/src/components/addcoin/coin-selectors.render.js

@ -52,7 +52,7 @@ const CoinSelectorsRender = function(item, coin, i) {
</button>
</div>
<div className="col-sm-11 text-center add-coin-modes">
<div className="form-group col-lg-4 col-md-4 col-sm-6 col-xs-6 style-addcoin-lbl-mdl-login">
<div className={ this.state.isExperimentalOn ? 'form-group col-lg-4 col-md-4 col-sm-6 col-xs-6 style-addcoin-lbl-mdl-login' : 'hide' }>
<input
type="radio"
className="to-labelauty labelauty"

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

@ -21,6 +21,7 @@ import { isPositiveNumber } from '../../../util/number';
// TODO: - add links to explorers
// - render z address trim
// spv, request utxo and check if any failed to verify, display alert notice
class SendCoin extends React.Component {
constructor(props) {

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

@ -151,7 +151,11 @@ export const TxAmountRender = function(tx) {
return (
<span title={ tx.amount * _amountNegative }>
{ formatValue(tx.amount) * _amountNegative || translate('DASHBOARD.UNKNOWN') }
<span className={ formatValue(tx.interest) ? '' : 'hide' }>{ formatValue(tx.interest) }</span>
{ tx.interest &&
<span
className="tx-interest"
title={ `Claimed interest ${formatValue(Math.abs(tx.interest))}` }>+{ formatValue(Math.abs(tx.interest)) }</span>
}
</span>
);
}

Loading…
Cancel
Save