diff --git a/react/src/actions/actionCreators.js b/react/src/actions/actionCreators.js index 42f2055..667896d 100644 --- a/react/src/actions/actionCreators.js +++ b/react/src/actions/actionCreators.js @@ -1,7 +1,6 @@ import 'whatwg-fetch'; import 'bluebird'; -import _config from '../config'; import { translate } from '../translate/translate'; import { GET_ACTIVE_COINS, @@ -68,14 +67,6 @@ export * from './actions/iguanaHelpers'; export * from './actions/cli'; export * from './actions/update'; -export let Config; - -try { - Config = window.require('electron').remote.getCurrentWindow().appConfig; -} catch (e) { - Config = _config; -} - export function changeActiveAddress(address) { return { type: DASHBOARD_ACTIVE_ADDRESS, diff --git a/react/src/components/dashboard/settings/settings.js b/react/src/components/dashboard/settings/settings.js index 89634b3..109f936 100644 --- a/react/src/components/dashboard/settings/settings.js +++ b/react/src/components/dashboard/settings/settings.js @@ -49,7 +49,7 @@ class Settings extends React.Component { activeTabHeight: '0', appSettings: {}, tabElId: null, - cliCmdString: null, + cliCmdString: '', cliCoin: null, cliResponse: null, exportWifKeysRaw: false, diff --git a/react/src/components/dashboard/settings/settings.render.js b/react/src/components/dashboard/settings/settings.render.js index 084bb90..47d4fd4 100644 --- a/react/src/components/dashboard/settings/settings.render.js +++ b/react/src/components/dashboard/settings/settings.render.js @@ -338,7 +338,7 @@ export const SettingsRender = function() { className={ 'panel-collapse collapse' + (this.state.activeTab === 4 ? ' in' : '') } style={{ height: this.state.activeTab === 4 ? `${this.state.activeTabHeight}px` : '0' }}>
-

+

{ this.renderLB('INDEX.ONLY_ACTIVE_WIF_KEYS') }
{ this.renderLB('SETTINGS.EXPORT_KEYS_NOTE') } @@ -346,7 +346,7 @@ export const SettingsRender = function() { { translate('INDEX.PLEASE_KEEP_KEYS_SAFE') } -

+
'); return _translationComponents.map((_translation) => - + {_translation}
diff --git a/react/src/components/login/login.scss b/react/src/components/login/login.scss index 29897ee..ed3e5c3 100644 --- a/react/src/components/login/login.scss +++ b/react/src/components/login/login.scss @@ -16,6 +16,17 @@ } button { + &.copy-floating-label { + position: absolute; + font-weight: 500; + font-size: 14px; + top: -22px; + right: 0; + background-color: #757575; + border: 0; + cursor: pointer; + z-index: 1000; + } &.swal2-confirm-container { background-color: rgb(48, 133, 214); border-left-color: rgb(48, 133, 214); @@ -111,14 +122,8 @@ input[type="password"] { margin-right: auto; } -button.copy-floating-label { - position: absolute; - font-weight: 500; - font-size: 11.2px; - top: -11px; - right: 0; - background-color: #757575; - border: 0; - cursor: pointer; - z-index: 1000; +.register-form { + .floating-label { + font-size: 13px; + } } \ No newline at end of file