diff options
| author | Dan <danjm.com@gmail.com> | 2018-05-31 03:13:45 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-05-31 03:30:50 +0800 |
| commit | 1c3d2aa18b85ddb83734d6afdbb1111ba0791229 (patch) | |
| tree | 30898c8b69393476196bcf194a31d99994bc8190 /ui/app/app.js | |
| parent | 389346913bf076fde6190a61afc4e3e4cd210afc (diff) | |
| download | dexon-wallet-1c3d2aa18b85ddb83734d6afdbb1111ba0791229.tar.gz dexon-wallet-1c3d2aa18b85ddb83734d6afdbb1111ba0791229.tar.zst dexon-wallet-1c3d2aa18b85ddb83734d6afdbb1111ba0791229.zip | |
Importing account by json and private key shows error and does not change account if no selectedAddress comes after import.
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 0e8b907d..7005adb7 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -99,7 +99,7 @@ class App extends Component { } = this.props const isLoadingNetwork = network === 'loading' && currentView.name !== 'config' const loadMessage = loadingMessage || isLoadingNetwork ? - this.getConnectingLabel() : null + this.getConnectingLabel(loadingMessage) : null log.debug('Main ui render function') return ( @@ -210,7 +210,10 @@ class App extends Component { } } - getConnectingLabel = function () { + getConnectingLabel = function (loadingMessage) { + if (loadingMessage) { + return loadingMessage + } const { provider } = this.props const providerName = provider.type |