Electrum

assets/mainWindow/css/loading.css

@@ -31,11 +31,11 @@ body.agama-default-window-height {
 }
 
 body.closing-window-height {
-  height: 300px;
+  height: 320px;
 }
 
 body.agama-app-settings-window {
-  height: 570px;
+  height: 610px;
 }
 
 .agama-logo {
@@ -149,6 +149,9 @@ body.agama-app-settings-window {
 .margin-right-20 {
   margin-right: 20px;
 }
+.margin-left-20 {
+  margin-left: 20px;
+}
 .margin-top-15 {
   margin-top: 15px;
 }
@@ -208,7 +211,7 @@ body.agama-app-settings-window {
 }
 
 .settings-buttons-block {
-  margin-top: 50px;
+  margin-top: 40px;
   margin-right: 50px;
   text-align: right;
 }
@@ -437,11 +440,30 @@ button.toast-close-button {
   display: inherit;
   top: inherit;
   left: inherit;
-  right: 33.1%;
   padding: 2px 0;
 }
 
+.dropdown-menu.native {
+  right: 256px;
+}
+
+.dropdown-menu.lite {
+  right: 74px;
+}
+
 .dropdown-menu li {
   cursor: pointer;
   margin: 5px 0;
+}
+
+small {
+  display: block;
+  font-size: 14px;
+  width: 80%;
+  text-align: center;
+  margin: 0 auto;
+}
+
+.padding-top-40 {
+  padding-top: 40px;
 }

assets/mainWindow/js/loading.js

@@ -1,14 +1,16 @@
 // TODO: merge into react app
 let _configCopy;
 
-function toggleDropdown() {
-  const _dropdown = $('.dropdown-menu');
+function toggleDropdown(type) {
+  const _dropdown = $('.dropdown-menu.' + (type === 'lite' ? 'lite' : 'native'));
 
   if (_dropdown.hasClass('hide')) {
     _dropdown.removeClass('hide');
   } else {
     _dropdown.addClass('hide');
   }
+
+  $('.dropdown-menu.' + (type === 'lite' ? 'native' : 'lite')).addClass('hide');;
 }
 
 function initSettingsForm() {
@@ -23,7 +25,7 @@ function initSettingsForm() {
         appConfSchema[key].initDisplay) {
       _htmlOut = `
         ${_htmlOut}
-        <tr id="${key}">
+        <tr>
           <td class="left">
             ${appConfSchema[key].displayName}`;
 
@@ -129,9 +131,9 @@ function handleSaveSettings() {
     remote.getCurrentWindow().testLocation(_configCopy.dataDir)
     .then(function(res) {
       if (res === -1) {
-        showToast('error', 'Komodo datadir path is invalid');
+        showToast('error', 'Komodo datadir path is invalid.<br>It must be an absolute path to an existing folder that doesn\'t contain spaces and/or any special characters.');
       } else if (res === false) {
-        showToast('error', 'Komodo datadir path is not a directory');
+        showToast('error', 'Komodo datadir path is not a directory.<br>It must be an absolute path to an existing folder that doesn\'t contain spaces and/or any special characters.');
       } else {
         // save settings
         remote.getCurrentWindow().updateAppSettings(_configCopy);
@@ -178,15 +180,31 @@ function openSettingsWindow() {
   const remote = require('electron').remote;
   const window = remote.getCurrentWindow();
 
-  $('.dropdown-menu').addClass('hide');
+  $('.dropdown-menu.lite').addClass('hide');
+  $('.dropdown-menu.native').addClass('hide');
   window.createAppSettingsWindow();
 }
 
 function startKMDPassive() {
   const remote = require('electron').remote;
   const window = remote.getCurrentWindow();
 
-  $('.dropdown-menu').addClass('hide');
+  $('.dropdown-menu.lite').addClass('hide');
+  $('.dropdown-menu.native').addClass('hide');
+  disableModeButtons();
+
+  window.startKMDNative('KMD', true);
+
+  window.createWindow('open');
+  window.hide();
+}
+
+function startKMDPassive() {
+  const remote = require('electron').remote;
+  const window = remote.getCurrentWindow();
+
+  $('.dropdown-menu.lite').addClass('hide');
+  $('.dropdown-menu.native').addClass('hide');
   disableModeButtons();
 
   window.startKMDNative('KMD', true);
@@ -195,11 +213,26 @@ function startKMDPassive() {
   window.hide();
 }
 
+function startSPV(coin) {
+  const remote = require('electron').remote;
+  const window = remote.getCurrentWindow();
+
+  $('.dropdown-menu.lite').addClass('hide');
+  $('.dropdown-menu.native').addClass('hide');
+  disableModeButtons();
+
+  window.startSPV(coin);
+
+  window.createWindow('open');
+  window.hide();
+}
+
 function closeMainWindow(isKmdOnly, isCustom) {
   const remote = require('electron').remote;
   const window = remote.getCurrentWindow();
 
-  $('.dropdown-menu').addClass('hide');
+  $('.dropdown-menu.lite').addClass('hide');
+  $('.dropdown-menu.native').addClass('hide');
   disableModeButtons();
 
   if (!isCustom) {
@@ -227,13 +260,30 @@ function disableModeButtons() {
   $('#normalStartBtn').attr('disabled', true);
   $('#settingsBtn').attr('disabled', true);
   $('#nativeOnlyBtnCarret').attr('disabled', true);
+  $('#spvBtn').attr('disabled', true);
+  $('#spvBtnCarret').attr('disabled', true);
 }
 
 function normalStart() {
   const remote = require('electron').remote;
   let appConf = remote.getCurrentWindow().appConfig;
   appConf.iguanaLessMode = false;
 
-  $('.dropdown-menu').addClass('hide');
+  $('.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');
+  }
 }

react/src/actions/actionCreators.js

@@ -27,23 +27,17 @@ import {
   GET_PIN_LIST,
   DASHBOARD_SYNC_ONLY_UPDATE,
   DISPLAY_IMPORT_KEY_MODAL,
+  ELECTRUM_SERVER_CHANGED,
+  DISPLAY_ZCASH_PARAMS_FETCH,
 } from './storeType';
 
 export * from './actions/nativeSyncInfo';
 export * from './actions/nativeSend';
 export * from './actions/coinList';
-// export * from './actions/createWallet';
-//export * from './actions/nativeTxHistory';
-//export * from './actions/nativeBalance';
 export * from './actions/nativeNewAddress';
 // export * from './actions/logout';
-//export * from './actions/edexGetTx';
 export * from './actions/settings';
-// export * from './actions/edexBalance';
 export * from './actions/addCoin';
-//export * from './actions/addressBalance';
-//export * from './actions/syncInfo';
-//export * from './actions/getAddrByAccount';
 // export * from './actions/walletAuth';
 export * from './actions/copyAddress';
 export * from './actions/sysInfo';
@@ -54,6 +48,8 @@ export * from './actions/update';
 export * from './actions/jumblr';
 export * from './actions/interest';
 export * from './actions/nativeDashboardUpdate';
+export * from './actions/getTxDetails';
+export * from './actions/electrum';
 
 export function changeActiveAddress(address) {
   return {
@@ -137,7 +133,7 @@ export function dashboardCoinsState(json) {
   return {
     type: GET_ACTIVE_COINS,
     coins: json,
-    activeCoins: Object.keys(json.native).length ? true : false,
+    total: json.total,
   }
 }
 
@@ -278,4 +274,18 @@ export function displayImportKeyModal(display) {
     type: DISPLAY_IMPORT_KEY_MODAL,
     displayImportKeyModal: display,
   }
+}
+
+export function electrumServerChanged(isChanged) {
+  return {
+    type: ELECTRUM_SERVER_CHANGED,
+    eletrumServerChanged: isChanged,
+  }
+}
+
+export function toggleZcparamsFetchModal(display) {
+  return {
+    type: DISPLAY_ZCASH_PARAMS_FETCH,
+    displayZcparamsModal: display,
+  }
 }