diff --git a/react/src/components/addcoin/addcoin.js b/react/src/components/addcoin/addcoin.js index 0b67b88..221ae38 100644 --- a/react/src/components/addcoin/addcoin.js +++ b/react/src/components/addcoin/addcoin.js @@ -43,6 +43,7 @@ class AddCoin extends React.Component { display: false, actionsMenu: false, modalClassName: 'hide', + isExperimentalOn: false, }; this.existingCoins = null; this.activateCoin = this.activateCoin.bind(this); @@ -113,6 +114,16 @@ class AddCoin extends React.Component { componentWillMount() { this.addNewItem(); + + let appConfig; + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} + + this.setState({ + isExperimentalOn: appConfig.experimentalFeatures, + }); } componentWillReceiveProps(props) { diff --git a/react/src/components/addcoin/coin-selectors.render.js b/react/src/components/addcoin/coin-selectors.render.js index 60bc6f9..ed33140 100644 --- a/react/src/components/addcoin/coin-selectors.render.js +++ b/react/src/components/addcoin/coin-selectors.render.js @@ -5,14 +5,8 @@ import AddCoinOptionsAC from '../addcoin/addcoinOptionsAC'; 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; + // const isWindows = this.props.Settings && this.props.Settings.appInfo && this.props.Settings.appInfo.sysInfo && this.props.Settings.appInfo.sysInfo.platform === 'win32'; + const hideFullModeBtn = item && item.selectedCoin && item.selectedCoin.indexOf('|full') === -1 || !this.state.isExperimentalOn ? true : false; return (
-
+
) }; + export default CoinSelectorsRender; \ No newline at end of file diff --git a/react/src/components/dashboard/navbar/navbar.js b/react/src/components/dashboard/navbar/navbar.js index 5e16c05..9d5babc 100755 --- a/react/src/components/dashboard/navbar/navbar.js +++ b/react/src/components/dashboard/navbar/navbar.js @@ -21,6 +21,7 @@ class Navbar extends React.Component { this.state = { openDropMenu: false, nativeOnly: Config.iguanaLessMode, + isExperimentalOn: false, }; this.openDropMenu = this.openDropMenu.bind(this); this.logout = this.logout.bind(this); @@ -34,6 +35,16 @@ class Navbar extends React.Component { this.handleClickOutside, false ); + + let appConfig; + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} + + this.setState({ + isExperimentalOn: appConfig.experimentalFeatures, + }); } componentWillUnmount() { diff --git a/react/src/components/dashboard/navbar/navbar.render.js b/react/src/components/dashboard/navbar/navbar.render.js index d0e2d1f..eed8d1b 100644 --- a/react/src/components/dashboard/navbar/navbar.render.js +++ b/react/src/components/dashboard/navbar/navbar.render.js @@ -99,7 +99,7 @@ const NavbarRender = function() { { translate('INDEX.SETTINGS') } -
  • +
  • this.openSyncOnlyModal() }> { translate('ADD_COIN.SYNC_ONLY') } diff --git a/react/src/components/dashboard/sendCoin/sendCoin.js b/react/src/components/dashboard/sendCoin/sendCoin.js index e11b575..231ae13 100644 --- a/react/src/components/dashboard/sendCoin/sendCoin.js +++ b/react/src/components/dashboard/sendCoin/sendCoin.js @@ -789,7 +789,7 @@ class SendCoin extends React.Component { } } - return +_balance; + return _balance; } validateSendFormData() { diff --git a/react/src/components/login/login.js b/react/src/components/login/login.js index 75777e7..9739b74 100644 --- a/react/src/components/login/login.js +++ b/react/src/components/login/login.js @@ -45,6 +45,7 @@ class Login extends React.Component { trimPassphraseTimer: null, displayLoginSettingsDropdown: false, displayLoginSettingsDropdownSection: null, + isExperimentalOn: false, }; this.toggleActivateCoinForm = this.toggleActivateCoinForm.bind(this); this.updateRegisterConfirmPassPhraseInput = this.updateRegisterConfirmPassPhraseInput.bind(this); @@ -118,6 +119,15 @@ class Login extends React.Component { componentDidMount() { Store.dispatch(iguanaActiveHandle(true)); + let appConfig; + + try { + appConfig = window.require('electron').remote.getCurrentWindow().appConfig; + } catch (e) {} + + this.setState({ + isExperimentalOn: appConfig.experimentalFeatures, + }); } toggleSeedInputVisibility() { diff --git a/react/src/components/login/login.render.js b/react/src/components/login/login.render.js index 7dd58ce..44774db 100644 --- a/react/src/components/login/login.render.js +++ b/react/src/components/login/login.render.js @@ -5,8 +5,7 @@ import LoginSettingsModal from '../dashboard/loginSettingsModal/loginSettingsMod const LoginRender = function () { return (
    - + { this.renderSwallModal() }
    @@ -35,7 +34,7 @@ const LoginRender = function () { { translate('INDEX.SETTINGS') }
  • -
  • +
  • { translate('ADD_COIN.SYNC_ONLY') }