diff --git a/assets/mainWindow/css/loading.css b/assets/mainWindow/css/loading.css
index 8782de6..47ad63a 100644
--- a/assets/mainWindow/css/loading.css
+++ b/assets/mainWindow/css/loading.css
@@ -2,6 +2,8 @@ body {
overflow: hidden !important;
border: solid 1px #ccc;
height: 300px;
+ user-select: none;
+ cursor: default;
}
.text-center {
@@ -31,6 +33,15 @@ body.agamaMode {
background-color: rgba(33, 33, 33, 0.85);
padding-top: 40px;
color: #fff;
+ height: 335px;
+}
+
+body.agama-default-window-height {
+ height: 300px !important;
+}
+
+body.agama-app-settings-window {
+ height: 770px;
}
.agama-logo {
@@ -38,11 +49,21 @@ body.agamaMode {
}
#agamaModeStatus {
- padding-bottom: 25px;
+ padding-bottom: 35px;
font-weight: bold;
font-size: 16px;
}
+.btn-info {
+ color: #fff;
+ background-color: #25b4c5 !important;
+ border-color: #25b4c5 !important;
+}
+.btn-info:hover {
+ background-color: #6cd2de !important;
+ border-color: #6cd2de !important;
+}
+
.btn-primary.focus,
.btn-primary:focus,
.btn-primary:hover,
@@ -67,8 +88,8 @@ body.agamaMode {
font-size: 14px;
line-height: 1.57142857;
border-radius: 3px;
- -webkit-box-shadow: 0 1px 4px 0 rgba(0,0,0,.1);
- box-shadow: 0 1px 4px 0 rgba(0,0,0,.1);
+ -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.1);
-webkit-transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear;
-o-transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear;
transition: border .2s linear,color .2s linear,width .2s linear,background-color .2s linear;
@@ -114,4 +135,251 @@ body.agamaMode {
.app-closing {
position: relative;
top: 50px;
+}
+
+.height--auto {
+ height: auto;
+}
+
+.settings-title {
+ font-weight: bold;
+ margin-bottom: 30px;
+}
+
+.margin-right-5 {
+ margin-right: 5px;
+}
+.margin-right-10 {
+ margin-right: 10px;
+}
+.margin-right-20 {
+ margin-right: 20px;
+}
+.margin-top-15 {
+ margin-top: 15px;
+}
+.margin-top-20 {
+ margin-top: 20px;
+}
+
+.btn-close {
+ border-bottom-left-radius: 50%;
+ background: #fff;
+ color: rgba(33, 33, 33, 0.85);
+ padding: 8px 10px;
+ font-weight: bold;
+ font-size: 20px;
+ position: absolute;
+ top: 0;
+ right: 0;
+ cursor: pointer;
+}
+
+.btn-close img {
+ height: 12px;
+ position: relative;
+ top: -1px;
+ right: -1px;
+}
+
+.btn-mode img {
+ height: 20px;
+ position: relative;
+ top: -1px;
+ left: -4px;
+ padding-right: 5px;
+}
+
+/* settings */
+.settings-help {
+ position: relative;
+ top: -2px;
+ left: 10px;
+ color: #fff;
+ border-radius: 50%;
+ background: #5683ad;
+ display: inline-block;
+ padding: 4px 4px;
+ line-height: 30px;
+ cursor: default;
+}
+
+.settings-help img {
+ height: 13px;
+}
+
+.settings-buttons-block {
+ margin-top: 50px;
+}
+
+.settings-table {
+ margin: 0 auto;
+ width: 650px;
+ text-align: left;
+}
+
+.settings-table input[type="number"] {
+ width: 100px;
+ padding: 0 4px;
+}
+
+.settings-table input[type="text"] {
+ width: 100%;
+ padding: 0 4px;
+}
+
+.settings-table td {
+ padding-bottom: 35px;
+}
+
+.settings-table tr:last-child td {
+ padding: 0;
+}
+
+.settings-table .left {
+ width: 50%;
+}
+
+.settings-table .right {
+ width: 50%;
+ text-align: left;
+}
+
+.agama-app-settings-window #agamaModeStatus {
+ padding-bottom: 50px;
+}
+
+/* toggle */
+.slider {
+ border-radius: 20px;
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #fff;
+ transition: .4s;
+}
+.switch input {
+ display: none;
+}
+input[type=checkbox],
+input[type=radio] {
+ margin: 4px 0 0;
+ margin-top: 1px\9;
+ line-height: normal;
+}
+input[type=checkbox],
+input[type=radio] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 0;
+}
+.switch {
+ position: relative;
+ display: inline-block;
+ width: 40px;
+ height: 24px;
+}
+label {
+ font-weight: 300;
+}
+label {
+ display: inline-block;
+ max-width: 100%;
+ margin-bottom: 5px;
+ font-weight: 700;
+}
+input:checked + .slider {
+ background: #36ab7a;
+}
+input:checked + .slider:before {
+ background: #fff;
+}
+input:checked + .slider:before {
+ -ms-transform: translateX(16px);
+ transform: translateX(16px);
+}
+.slider:before {
+ content: '';
+ display: inline-block;
+ border-radius: 50%;
+ position: absolute;
+ height: 20px;
+ width: 20px;
+ left: 2px;
+ bottom: 2px;
+ background-color: #ccc;
+ transition: .4s;
+}
+input[type="text"],
+input[type="number"] {
+ color: rgb(33, 33, 33);
+}
+
+/* toastr */
+#toast-container {
+ position: fixed;
+ z-index: 999999;
+}
+.toast-bottom-right {
+ right: 12px;
+ bottom: 12px;
+}
+#toast-container > .toast-success {
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==) !important;
+}
+#toast-container > .toast-error {
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=) !important;
+}
+#toast-container > div {
+ margin: 0 0 6px;
+ padding: 15px 15px 15px 50px;
+ width: 300px;
+ -moz-border-radius: 3px 3px 3px 3px;
+ -webkit-border-radius: 3px 3px 3px 3px;
+ border-radius: 3px 3px 3px 3px;
+ background-position: 15px center;
+ background-repeat: no-repeat;
+ color: #fff;
+}
+.toast-success {
+ background-color: #51a351;
+}
+.toast-error {
+ background-color: #bd362f;
+}
+.toast-title {
+ font-weight: bold;
+ text-align: left;
+ margin-left: 10px;
+}
+button.toast-close-button {
+ padding: 0;
+ cursor: pointer;
+ background: transparent;
+ border: 0;
+ -webkit-appearance: none;
+}
+.toast-close-button {
+ position: relative;
+ right: -0.3em;
+ top: -0.3em;
+ float: right;
+ font-size: 20px;
+ font-weight: bold;
+ color: #fff;
+ -webkit-text-shadow: 0 1px 0 #fff;
+ text-shadow: 0 1px 0 #fff;
+ opacity: .8;
+ -ms-filter: alpha(opacity=80);
+ filter: alpha(opacity=80);
+}
+.toast-message {
+ text-align: left;
+ margin-left: 10px;
+ -ms-word-wrap: break-word;
+ word-wrap: break-word;
}
\ No newline at end of file
diff --git a/assets/mainWindow/img/fa-close.png b/assets/mainWindow/img/fa-close.png
new file mode 100644
index 0000000..541cde8
Binary files /dev/null and b/assets/mainWindow/img/fa-close.png differ
diff --git a/assets/mainWindow/img/fa-cogs.png b/assets/mainWindow/img/fa-cogs.png
new file mode 100644
index 0000000..3faf854
Binary files /dev/null and b/assets/mainWindow/img/fa-cogs.png differ
diff --git a/assets/mainWindow/img/fa-cube.png b/assets/mainWindow/img/fa-cube.png
new file mode 100644
index 0000000..6d89cfa
Binary files /dev/null and b/assets/mainWindow/img/fa-cube.png differ
diff --git a/assets/mainWindow/img/fa-cubes.png b/assets/mainWindow/img/fa-cubes.png
new file mode 100644
index 0000000..df37e21
Binary files /dev/null and b/assets/mainWindow/img/fa-cubes.png differ
diff --git a/assets/mainWindow/img/fa-question.png b/assets/mainWindow/img/fa-question.png
new file mode 100644
index 0000000..429d671
Binary files /dev/null and b/assets/mainWindow/img/fa-question.png differ
diff --git a/assets/mainWindow/js/loading.js b/assets/mainWindow/js/loading.js
index 0620761..82ff800 100644
--- a/assets/mainWindow/js/loading.js
+++ b/assets/mainWindow/js/loading.js
@@ -1,59 +1,225 @@
- function closeMainWindow() {
- const remote = require('electron').remote;
- const window = remote.getCurrentWindow();
+let _configCopy;
- window.createWindow('open');
- window.hide();
- }
+function initSettingsForm() {
+ const remote = require('electron').remote;
+ let appConf = remote.getCurrentWindow().appConfig;
+ let appConfSchema = remote.getCurrentWindow().appConfigSchema;
+ _configCopy = Object.assign({}, appConf);
- function quitApp() {
- const remote = require('electron').remote;
- const window = remote.getCurrentWindow();
+ let _htmlOut = '<table class="settings-table">';
+ for (let key in appConf) {
+ if (appConfSchema[key] &&
+ appConfSchema[key].initDisplay) {
+ _htmlOut = `
+ ${_htmlOut}
+ <tr>
+ <td class="left">
+ ${appConfSchema[key].displayName}`;
+
+ if (appConfSchema[key].info) {
+ _htmlOut = `
+ ${_htmlOut}
+ <div
+ class="settings-help"
+ title="${appConfSchema[key].info}">
+ <img src="EasyDEX-GUI/assets/mainWindow/img/fa-question.png" />
+ </div>`;
+ }
- window.forseCloseApp();
+ if (appConfSchema[key].type === 'number') {
+ _htmlOut = `
+ ${_htmlOut}
+ </td>
+ <td class="right">
+ <input
+ type="number"
+ id="${key}"
+ pattern="[0-9]*"
+ onKeyup="handleInput('${key}')"
+ value="${_configCopy[key]}" />
+ </td>
+ </tr>`;
+ } else if (appConfSchema[key].type === 'string' || appConfSchema[key].type === 'folder') {
+ _htmlOut = `
+ ${_htmlOut}
+ </td>
+ <td class="right">
+ <input
+ type="text"
+ id="${key}"
+ onKeyup="handleInput('${key}')"
+ value="${_configCopy[key]}" />
+ </td>
+ </tr>`;
+ } else if (appConfSchema[key].type === 'boolean') {
+ _htmlOut = `${_htmlOut}
+ </td>
+ <td class="right">
+ <label
+ class="switch"
+ id="${key}"
+ onClick="settingsToggle(\'${key}\')">
+ ${(appConf[key] ? '<input type="checkbox" class="cb" checked />' : '<input type="checkbox" class="cb" />')}
+ <div class="slider"></div>
+ </label>
+ </td>
+ </tr>`;
+ }
+ }
}
- function normalStart() {
+ _htmlOut = `
+ ${_htmlOut}
+ </table>`;
+
+ $('#agamaConfigBlock').html(_htmlOut);
+}
+
+function hideToastImmediate() {
+ $('#toast-container').addClass('hide');
+}
+
+function hideToast() {
+ setTimeout(function() {
+ $('#toast-container').addClass('hide');
+ }, 5000);
+}
+
+function showToast(type, message) {
+ $('#toast-container .toast').removeClass('toast-success').removeClass('toast-error');
+ $('#toast-container .toast').addClass(`toast-${type}`);
+ $('#toast-container .toast-message').html(message);
+ $('#toast-container').removeClass('hide');
+ hideToast();
+}
+
+function setDefaultAppSettings() {
+ const remote = require('electron').remote;
+
+ remote.getCurrentWindow().setDefaultAppSettings();
+ remote.getCurrentWindow().appConfig = remote.getCurrentWindow().defaultAppSettings;
+ initSettingsForm();
+ showToast('success', 'App settings are reset to default');
+}
+
+function handleSaveSettings() {
+ if (_configCopy.dataDir &&
+ _configCopy.dataDir.length) {
const remote = require('electron').remote;
- let appConf = remote.getCurrentWindow().appConfig;
- appConf.iguanaLessMode = false;
-
- // run iguana-less mode with no daemons startup
- if (appConf && appConf.iguanaLessMode) {
- // do something
- } else { // run normal mode with 2 iguana instances started prior loading GUI
- if (appConf && !appConf.manualIguanaStart) {
- StartIguana();
+
+ remote.getCurrentWindow().testLocation(_configCopy.dataDir)
+ .then(function(res) {
+ $('#debugOut').html(res + ' | ' + _configCopy.dataDir);
+ if (res === -1) {
+ showToast('error', 'Komodo datadir path is invalid');
+ } else if (res === false) {
+ showToast('error', 'Komodo datadir path is not a directory');
+ } else {
+ // save settings
+ remote.getCurrentWindow().updateAppSettings(_configCopy);
+ remote.getCurrentWindow().appConfig = _configCopy;
+ showToast('success', 'Settings saved');
}
+ });
+ } else {
+ // save settings
+ const remote = require('electron').remote;
- var portcheck;
+ remote.getCurrentWindow().updateAppSettings(_configCopy);
+ remote.getCurrentWindow().appConfig = _configCopy;
+ showToast('success', 'Settings saved');
+ }
+}
- function startcheck() {
- portcheck = setInterval(function() {
- Iguana_activehandle(appConf).then(function(result){
- console.log(result);
+function handleInput(key) {
+ const _value = $(`#${key}`).val();
+ _configCopy[key] = _value;
+}
- if (result !== 'error') {
- stopcheck();
+function settingsToggle(key) {
+ const _value = $(`#${key} .cb`).prop('checked');
+ _configCopy[key] = _value;
+}
- if (appConf && appConf.useBasiliskInstance) {
- StartIguana_Cache();
- }
+function closeSettingsWindow() {
+ const remote = require('electron').remote;
+ const window = remote.getCurrentWindow();
- $('#loading_status_text').text('Connecting to Basilisk Network...');
- EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries, appConf);
+ window.destroyAppSettingsWindow();
+}
+
+function reloadSettingsWindow() {
+ const remote = require('electron').remote;
+ const window = remote.getCurrentWindow();
+
+ window.reloadSettingsWindow();
+}
+
+function openSettingsWindow() {
+ const remote = require('electron').remote;
+ const window = remote.getCurrentWindow();
+
+ window.createAppSettingsWindow();
+}
+
+function closeMainWindow() {
+ const remote = require('electron').remote;
+ const window = remote.getCurrentWindow();
+
+ window.createWindow('open');
+ window.hide();
+}
+
+function quitApp() {
+ const remote = require('electron').remote;
+ const window = remote.getCurrentWindow();
+
+ window.forseCloseApp();
+}
+
+function normalStart() {
+ const remote = require('electron').remote;
+ let appConf = remote.getCurrentWindow().appConfig;
+ appConf.iguanaLessMode = false;
+
+ // run iguana-less mode with no daemons startup
+ if (appConf &&
+ appConf.iguanaLessMode) {
+ // do something
+ } else { // run normal mode with 2 iguana instances started prior loading GUI
+ if (appConf &&
+ !appConf.manualIguanaStart) {
+ StartIguana();
+ }
+
+ var portcheck;
+
+ function startcheck() {
+ portcheck = setInterval(function() {
+ Iguana_activehandle(appConf).then(function(result){
+ console.log(result);
+
+ if (result !== 'error') {
+ stopcheck();
+
+ if (appConf && appConf.useBasiliskInstance) {
+ StartIguana_Cache();
}
- })
- }, 2000);
- }
- function stopcheck() {
- clearInterval(portcheck);
- }
+ $('#loading_status_text').text('Connecting to Basilisk Network...');
+ EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries, appConf);
+ }
+ })
+ }, 2000);
+ }
- startcheck();
+ function stopcheck() {
+ clearInterval(portcheck);
}
+
+ startcheck();
}
+}
function IguanaAJAX(url, ajax_data, timeout) {
return $.ajax({
diff --git a/react/src/components/addcoin/addcoinOptionsACFiat.js b/react/src/components/addcoin/addcoinOptionsACFiat.js
index c5b8ace..6268c70 100644
--- a/react/src/components/addcoin/addcoinOptionsACFiat.js
+++ b/react/src/components/addcoin/addcoinOptionsACFiat.js
@@ -2,41 +2,52 @@ import React from 'react';
import { translate } from '../../translate/translate';
class AddCoinOptionsACFiat extends React.Component {
+ const _fiat = [
+ 'aud',
+ 'brl',
+ 'gbp',
+ 'bgn',
+ 'cad',
+ 'hrk',
+ 'czk',
+ 'cny',
+ 'dkk',
+ 'eur',
+ 'hkd',
+ 'huf',
+ 'inr',
+ 'idr',
+ 'ils',
+ 'jpy',
+ 'krw',
+ 'myr',
+ 'mxn',
+ 'nzd',
+ 'nok',
+ 'php',
+ 'pln',
+ 'ron',
+ 'rub',
+ 'sgd',
+ 'zar',
+ 'sek',
+ 'chf',
+ 'thb',
+ 'try',
+ 'usd'
+ ];
+ let _items = [];
+
+ for (let i = 0; i < _fiat.length; i++) {
+ _items.push(
+ <option value={ `${_fiat[i].toUpperCase()}|basilisk|native` }>{ translate(`FIAT_CURRENCIES.${_fiat[i].toUpperCase()}`) }</option>
+ );
+ }
+
render() {
return (
<optgroup label={ translate('ADD_COIN.FIAT_CURRENCIES') }>
- <option value="AUD|basilisk|native">Australian Dollar (AUD)</option>
- <option value="BRL|basilisk|native">Brazilian Real (BRL)</option>
- <option value="GBP|basilisk|native">British Pound (GBP)</option>
- <option value="BGN|basilisk|native">Bulgarian Lev (BGN)</option>
- <option value="CAD|basilisk|native">Canadian Dollar (CAD)</option>
- <option value="HRK|basilisk|native">Croatian Kuna (HRK)</option>
- <option value="CZK|basilisk|native">Czech Koruna (CZK)</option>
- <option value="CNY|basilisk|native">Chinese Yuan (CNY)</option>
- <option value="DKK|basilisk|native">Danish Krone (DKK)</option>
- <option value="EUR|basilisk|native">Euro (EUR)</option>
- <option value="HKD|basilisk|native">Hong Kong Dollar (HKD)</option>
- <option value="HUF|basilisk|native">Hungarian Forint (HUF)</option>
- <option value="INR|basilisk|native">Indian Rupee (INR)</option>
- <option value="IDR|basilisk|native">Indonesian Rupiah (IDR)</option>
- <option value="ILS|basilisk|native">Israeli Shekel (ILS)</option>
- <option value="JPY|basilisk|native">Japanese Yen (JPY)</option>
- <option value="KRW|basilisk|native">Korean Won (KRW)</option>
- <option value="MYR|basilisk|native">Malaysian Ringgit (MYR)</option>
- <option value="MXN|basilisk|native">Mexican peso (MXN)</option>
- <option value="NZD|basilisk|native">New Zealand Dollar (NZD)</option>
- <option value="NOK|basilisk|native">Norwegian Krone (NOK)</option>
- <option value="PHP|basilisk|native">Philippine Peso (PHP)</option>
- <option value="PLN|basilisk|native">Polish Zloty (PLN)</option>
- <option value="RON|basilisk|native">Romanian Leu (RON)</option>
- <option value="RUB|basilisk|native">Russian Ruble (RUB)</option>
- <option value="SGD|basilisk|native">Singapore Dollar (SGD)</option>
- <option value="ZAR|basilisk|native">South African Rand (ZAR)</option>
- <option value="SEK|basilisk|native">Swedish Krona (SEK)</option>
- <option value="CHF|basilisk|native">Swiss Franc (CHF)</option>
- <option value="THB|basilisk|native">Thai Baht (THB)</option>
- <option value="TRY|basilisk|native">Turkish Lira (TRY)</option>
- <option value="USD|basilisk|native">US Dollar (USD)</option>
+ { _items }
</optgroup>
);
}
diff --git a/react/src/components/addcoin/addcoinOptionsCrypto.js b/react/src/components/addcoin/addcoinOptionsCrypto.js
index c192407..c72aa68 100644
--- a/react/src/components/addcoin/addcoinOptionsCrypto.js
+++ b/react/src/components/addcoin/addcoinOptionsCrypto.js
@@ -12,50 +12,61 @@ class AddCoinOptionsCrypto extends React.Component {
}
render() {
- const isWindows = this.props.appSettings && this.props.appSettings.appInfo && this.props.appSettings.appInfo.sysInfo && this.props.appSettings.appInfo.sysInfo.platform === 'win32';
+ // const isWindows = this.props.appSettings && this.props.appSettings.appInfo && this.props.appSettings.appInfo.sysInfo && this.props.appSettings.appInfo.sysInfo.platform === 'win32';
+ let appConfig;
+
+ try {
+ appConfig = window.require('electron').remote.getCurrentWindow().appConfig;
+ } catch (e) {}
- //<option value="ANC|full">AnonCoin (ANC)</option>
- //<option value="MZC|full">MazaCoin (MZC)</option>
- //<option value="SYS|full">SysCoin (SYS)</option>
return (
<optgroup label={ translate('ADD_COIN.CRYPTO_CURRENCIES') }>
+ <option
+ value="ANC|full"
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>AnonCoin (ANC)</option>
<option
value="BTCD|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>BitcoinDark (BTCD)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>BitcoinDark (BTCD)</option>
<option
value="BTC|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Bitcoin (BTC)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Bitcoin (BTC)</option>
<option
value="BTM|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Bitmark (BTM)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Bitmark (BTM)</option>
<option
value="CARB|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Carboncoin (CARB)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Carboncoin (CARB)</option>
<option
value="DGB|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Digibyte (DGB)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Digibyte (DGB)</option>
<option
value="DOGE|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Dogecoin (DOGE)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Dogecoin (DOGE)</option>
<option
value="FRK|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Franko (FRK)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Franko (FRK)</option>
<option
value="GAME|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Gamecredits (GAME)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Gamecredits (GAME)</option>
<option value="KMD|basilisk|native">Komodo (KMD)</option>
+ <option
+ value="MZC|full"
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>MazaCoin (MZC)</option>
<option
value="LTC|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Litecoin (LTC)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Litecoin (LTC)</option>
+ <option
+ value="SYS|full"
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>SysCoin (SYS)</option>
<option
value="UNO|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Unobtanium (UNO)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Unobtanium (UNO)</option>
<option
value="ZEC|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Zcash (ZEC)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Zcash (ZEC)</option>
<option
value="ZET|full"
- className={ this.state.nativeOnly || isWindows ? 'hide' : '' }>Zetacoin (ZET)</option>
+ className={ this.state.nativeOnly || !appConfig.experimentalFeatures ? 'hide' : '' }>Zetacoin (ZET)</option>
</optgroup>
);
}
@@ -65,7 +76,6 @@ const mapStateToProps = (state) => {
return {
appSettings: state.appSettings,
};
-
};
export default connect(mapStateToProps)(AddCoinOptionsCrypto);
diff --git a/react/src/components/addcoin/coin-selectors.render.js b/react/src/components/addcoin/coin-selectors.render.js
index 7f164f8..60bc6f9 100644
--- a/react/src/components/addcoin/coin-selectors.render.js
+++ b/react/src/components/addcoin/coin-selectors.render.js
@@ -6,6 +6,13 @@ import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat';
const CoinSelectorsRender = function(item, coin, i) {
const isWindows = this.props.Settings && this.props.Settings.appInfo && this.props.Settings.appInfo.sysInfo && this.props.Settings.appInfo.sysInfo.platform === 'win32';
+ let appConfig;
+
+ try {
+ appConfig = window.require('electron').remote.getCurrentWindow().appConfig;
+ } catch (e) {}
+
+ const hideFullModeBtn = item && item.selectedCoin && item.selectedCoin.indexOf('|full') === -1 || !appConfig.experimentalFeatures ? true : false;
return (
<div
@@ -54,7 +61,7 @@ const CoinSelectorsRender = function(item, coin, i) {
</button>
</div>
<div className="col-sm-11 text-center add-coin-modes">
- <div className={ this.state.nativeOnly || isWindows ? 'hide' : 'form-group col-lg-4 col-md-4 col-sm-6 col-xs-6 style-addcoin-lbl-mdl-login' }>
+ <div className={ this.state.nativeOnly || hideFullModeBtn ? 'hide' : 'form-group col-lg-4 col-md-4 col-sm-6 col-xs-6 style-addcoin-lbl-mdl-login' }>
<input
type="radio"
className="to-labelauty labelauty"
diff --git a/react/src/components/dashboard/settings/settings.js b/react/src/components/dashboard/settings/settings.js
index 101565e..8aab3ca 100644
--- a/react/src/components/dashboard/settings/settings.js
+++ b/react/src/components/dashboard/settings/settings.js
@@ -534,7 +534,6 @@ class Settings extends React.Component {
<input
type="number"
pattern="[0-9]*"
- type="text"
name={ `${key}__${_key}` }
value={ _appConfig[key][_key] }
onChange={ (event) => this.updateInputSettings(event, key, _key) } />
@@ -856,7 +855,7 @@ const mapStateToProps = (state) => {
ActiveCoin: {
coin: state.ActiveCoin.coin,
},
- Settings: state.Settings,
+ Settings: state.Settings,
};
};
diff --git a/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
index e5daafb..9a9225f 100644
--- a/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
+++ b/react/src/components/dashboard/walletsNativeSend/walletsNativeSend.js
@@ -47,6 +47,9 @@ class WalletsNativeSend extends React.Component {
this.toggleSubstractFee = this.toggleSubstractFee.bind(this);
}
+ // TODO: 1) t -> z amount validation
+ // 2) z -> z amount validation
+
WalletsNativeSendFormRender() {
return _WalletsNativeSendFormRender.call(this);
}
@@ -366,8 +369,9 @@ class WalletsNativeSend extends React.Component {
checkTotalBalance() {
let _balance = 0;
+
if (this.props.ActiveCoin.balance &&
- this.props.ActiveCoin.balance.total) {
+ this.props.ActiveCoin.balance.total) {
_balance = this.props.ActiveCoin.balance.total;
}