32/64 bit os switch

assets/mainWindow/js/loading.js

@@ -288,9 +288,19 @@ function init() {
   const remote = require('electron').remote;
   var window = remote.getCurrentWindow();
   var appConf = remote.getCurrentWindow().appConfig;
-
+  var arch = remote.getCurrentWindow().arch;
+
+  if (arch !== 'x64') {
+    $('.settings-help').hide();
+    $('#agamaModeStatusText').html('Choose a shortcut or custom selection');
+    $('#settingsBtn').hide();
+    $('.mode-desc.native').hide();
+    $('#nativeOnlyBtn').hide();
+    $('#nativeOnlyBtnCarret').hide();
+    $('.mode-desc.spv').css('left', '200px');
+    $('.dropdown-menu.lite').css('left', '180px');
+  } else {
     if (!appConf.experimentalFeatures) {
-    $('#kmdPassiveMode').hide();
       $('#spvBtn').hide();
       $('#spvBtnCarret').hide();
       $('.dropdown-menu.native').css('right', '165px');
@@ -299,4 +309,5 @@ function init() {
       $('.mode-desc.spv').hide();
       $('.mode-desc.native').css('left', '180px');
     }
+  }
 }

react/src/components/addcoin/addcoin.render.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { translate } from '../../translate/translate';
-
+import mainWindow from '../../util/mainWindow';
 // TODO: add modal close on modal overlay click evt
 
 const AddCoinRender = function() {
@@ -50,6 +50,7 @@ const AddCoinRender = function() {
                     { translate('ADD_COIN.ACTIVATE_ALL') }
                 </button>
               </div>
+              { mainWindow.arch === 'x64' &&
                 <div className="col-sm-12">
                   <p>
                     <strong>{ translate('INDEX.NATIVE_MODE') }:</strong> { translate('INDEX.NATIVE_MODE_DESC1') }&nbsp;
@@ -63,6 +64,7 @@ const AddCoinRender = function() {
                     <i>{ translate('INDEX.NATIVE_MODE_DESC5') }</i>.
                   </div>
                 </div>
+              }
             </div>
           </div>
         </div>

react/src/components/addcoin/addcoinOptionsAC.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { translate } from '../../translate/translate';
+import mainWindow from '../../util/mainWindow';
 
 class AddCoinOptionsAC extends React.Component {
   render() {
@@ -25,7 +26,11 @@ class AddCoinOptionsAC extends React.Component {
     let _items = [];
 
     for (let i = 0; i < _assetChains.length; i++) {
-      const availableModes = _assetChains[i] !== 'kv' && _assetChains[i] !== 'mgw' ? 'native|spv' : 'native';
+      let availableModes = _assetChains[i] !== 'kv' && _assetChains[i] !== 'mgw' ? 'native|spv' : 'native';
+
+      if (mainWindow.arch !== 'x64') {
+        availableModes = 'spv';
+      }
 
       _items.push(
         <option

react/src/components/addcoin/addcoinOptionsCrypto.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { translate } from '../../translate/translate';
+import mainWindow from '../../util/mainWindow';
 
 class AddCoinOptionsCrypto extends React.Component {
   constructor() {
@@ -10,11 +11,7 @@ class AddCoinOptionsCrypto extends React.Component {
   }
 
   componentWillMount() {
-    let appConfig;
+    const appConfig = mainWindow.appConfig;
-
-    try {
-      appConfig = window.require('electron').remote.getCurrentWindow().appConfig;
-    } catch (e) {}
 
     this.setState({
       isExperimentalOn: appConfig.experimentalFeatures,
@@ -22,9 +19,11 @@ class AddCoinOptionsCrypto extends React.Component {
   }
 
   render() {
+    let availableKMDModes = mainWindow.arch === 'x64' ? 'native|spv' : 'spv';
+
     return (
       <optgroup label={ translate('ADD_COIN.CRYPTO_CURRENCIES') }>
-        <option value="KMD|native|spv">Komodo (KMD)</option>
+        <option value={ `KMD|${availableKMDModes}` }>Komodo (KMD)</option>
         <option
           value="CHIPS|spv"
           className={ this.state.isExperimentalOn ? '' : 'hide' }>Chips (CHIPS)</option>

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

@@ -3,6 +3,7 @@ import { translate } from '../../translate/translate';
 import AddCoinOptionsCrypto from '../addcoin/addcoinOptionsCrypto';
 import AddCoinOptionsAC from '../addcoin/addcoinOptionsAC';
 import AddCoinOptionsACFiat from '../addcoin/addcoinOptionsACFiat';
+import mainWindow from '../../util/mainWindow';
 
 const CoinSelectorsRender = function(item, coin, i) {
   return (
@@ -24,7 +25,9 @@ const CoinSelectorsRender = function(item, coin, i) {
             <option>{ translate('INDEX.SELECT') }</option>
             <AddCoinOptionsCrypto appSettings={ this.props.Settings } />
             <AddCoinOptionsAC appSettings={ this.props.Settings } />
+            { mainWindow.arch === 'x64' &&
               <AddCoinOptionsACFiat appSettings={ this.props.Settings } />
+            }
           </select>
         </div>
         <div className={ this.hasMoreThanOneCoin() && (item.mode === '-1' || item.mode === -1) ? 'col-sm-6' : 'hide' }>
@@ -82,6 +85,7 @@ const CoinSelectorsRender = function(item, coin, i) {
             </span>
           </label>
         </div>
+        { mainWindow.arch === 'x64' &&
           <div
             className="form-group col-lg-4 col-md-4 col-sm-6 col-xs-6"
             style={{ paddingLeft: '0' }}>
@@ -114,6 +118,7 @@ const CoinSelectorsRender = function(item, coin, i) {
               </span>
             </label>
           </div>
+        }
       </div>
       <div className={ this.hasMoreThanOneCoin() && i !== 0 ? 'col-sm-1' : 'hide' }>
         <button

react/src/components/dashboard/settings/settings.appInfoPanel.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { translate } from '../../../translate/translate';
 import { connect } from 'react-redux';
+import mainWindow from '../../../util/mainWindow';
 
 class AppInfoPanel extends React.Component {
   constructor() {
@@ -20,7 +21,7 @@ class AppInfoPanel extends React.Component {
             <p>
               { translate('SETTINGS.NAME') }: { this.props.Settings.appInfo.releaseInfo.name }
               <br />
-              { translate('SETTINGS.VERSION') }: { `${this.props.Settings.appInfo.releaseInfo.version.replace('version=', '')}-beta` }
+              { translate('SETTINGS.VERSION') }: { `${this.props.Settings.appInfo.releaseInfo.version.replace('version=', '')}${mainWindow.arch === 'x64' ? '' : '-32bit'}-beta` }
               <br />
               { translate('SETTINGS.APP_SESSION') }: { this.props.Settings.appInfo.appSession }
             </p>
@@ -40,7 +41,10 @@ class AppInfoPanel extends React.Component {
               <br />
               { translate('SETTINGS.MEM') }: { this.props.Settings.appInfo.sysInfo.totalmem_readable }
             </p>
+            { mainWindow.arch === 'x64' &&
               <h5>{ translate('SETTINGS.LOCATIONS') }</h5>
+            }
+            { mainWindow.arch === 'x64' &&
               <p>
                 { translate('SETTINGS.CACHE') }: { this.props.Settings.appInfo.dirs.cacheLocation }
                 <br />
@@ -56,6 +60,7 @@ class AppInfoPanel extends React.Component {
                 <br />
                 Komodo wallet.dat: { this.props.Settings.appInfo.dirs.komodoDir }
               </p>
+            }
           </div>
         </div>
       );

react/src/components/dashboard/settings/settings.appSettingsPanel.js

@@ -11,6 +11,7 @@ import {
   triggerToaster,
 } from '../../../actions/actionCreators';
 import Store from '../../../store';
+import mainWindow from '../../../util/mainWindow';
 
 class AppSettingsPanel extends React.Component {
   constructor() {
@@ -26,15 +27,13 @@ class AppSettingsPanel extends React.Component {
   }
 
   componentWillMount() {
-    try {
+    const _appConfigSchema = mainWindow.appConfigSchema;
-      const _appConfigSchema = window.require('electron').remote.getCurrentWindow().appConfigSchema;
+    const _appSettings = this.props.Settings.appSettings ? this.props.Settings.appSettings : Object.assign({}, mainWindow.appConfig);
-      const _appSettings = this.props.Settings.appSettings ? this.props.Settings.appSettings : Object.assign({}, window.require('electron').remote.getCurrentWindow().appConfig);
 
     this.setState(Object.assign({}, this.state, {
       appConfigSchema: _appConfigSchema,
       appSettings: _appSettings,
     }));
-    } catch(e) {}
   }
 
   componentDidMount(props) {
@@ -119,6 +118,7 @@ class AppSettingsPanel extends React.Component {
   renderConfigEditForm() {
     let items = [];
     const _appConfig = this.state.appSettings;
+
     for (let key in _appConfig) {
        if (this.state.appConfigSchema[key] && typeof _appConfig[key] === 'object') {
         if (this.state.appConfigSchema[key].display) {

react/src/components/dashboard/settings/settings.render.js

@@ -17,6 +17,7 @@ import SPVServersPanel from './settings.spvServersPanel';
 import DaemonStdoutPanel from './settings.daemonStdoutPanel';
 import NativeWalletDatKeysPanel from './settings.nativeWalletDatKeysPanel';
 import CoindClearDataDirPanel from './settings.coindClearDataDirPanel';
+import mainWindow from '../../../util/mainWindow';
 
 // import WalletInfoPanel from './settings.walletInfoPanel';
 // import WalletBackupPanel from './settings.walletBackupPanel';
@@ -71,12 +72,14 @@ export const SettingsRender = function() {
             <Panel
               uniqId={'SettingsAccordion'}
               singleOpen={true}>
+              { mainWindow.arch === 'x64' &&
                 <PanelSection
                   title={ translate('INDEX.DEBUG_LOG') }
                   icon="icon fa-bug"
                   openByDefault={this.props.disableWalletSpecificUI}>
                   <DebugLogPanel />
                 </PanelSection>
+              }
               { this.props.Main.coins &&
                 this.props.Main.coins.native &&
                 Object.keys(this.props.Main.coins.native).length > 0 &&
@@ -86,11 +89,13 @@ export const SettingsRender = function() {
                   <DaemonStdoutPanel />
                 </PanelSection>
               }
+              { mainWindow.arch === 'x64' &&
                 <PanelSection
                   title={ translate('SETTINGS.APP_CONFIG') + ' (config.json)' }
                   icon="icon fa-wrench">
                   <AppSettingsPanel />
                 </PanelSection>
+              }
               <PanelSection
                 title={ translate('SETTINGS.APP_INFO') }
                 icon="icon md-info">
@@ -106,16 +111,20 @@ export const SettingsRender = function() {
                   <ExportKeysPanel />
                 </PanelSection>
               }
+              { mainWindow.arch === 'x64' &&
                 <PanelSection
                   title={ 'Wallet.dat keys' }
                   icon="icon md-key">
                   <NativeWalletDatKeysPanel />
                 </PanelSection>
+              }
+              { mainWindow.arch === 'x64' &&
                 <PanelSection
                   title={ 'Clear native coin data dir' }
                   icon="icon fa-trash">
                   <CoindClearDataDirPanel />
                 </PanelSection>
+              }
               { this.props.Main.coins &&
                 this.props.Main.coins.spv &&
                 Object.keys(this.props.Main.coins.spv).length &&

react/src/components/dashboard/settings/settings.scss

@@ -111,6 +111,7 @@
 
 #section-iguana-wallet-settings {
   background: #f3f4f5;
+  height: 100%;
 
   .panel-title {
     cursor: pointer;

react/src/components/main/main.js

@@ -21,7 +21,7 @@ class Main extends React.Component {
     const appConfig = mainWindow.appConfig;
 
     if (appVersion) {
-      document.title = `${appVersion.name} (v${appVersion.version.replace('version=', '')}-beta)`;
+      document.title = `${appVersion.name} (v${appVersion.version.replace('version=', '')}${mainWindow.arch === 'x64' ? '' : '-32bit'}-beta)`;
     }
   }