diff options
| author | Dan <danjm.com@gmail.com> | 2018-06-07 03:10:43 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-06-07 03:10:43 +0800 |
| commit | ae55e8a3c122a3f6d91e28153124bfb6a13ded84 (patch) | |
| tree | b23043409b2877bce4096d411f3c3273a610b146 /ui/app/app.js | |
| parent | aee9247faab984734d2f0278baaf768e2a7926d2 (diff) | |
| parent | 1fb408f62eb081311937420bb42da6c835510590 (diff) | |
| download | tangerine-wallet-browser-ae55e8a3c122a3f6d91e28153124bfb6a13ded84.tar.gz tangerine-wallet-browser-ae55e8a3c122a3f6d91e28153124bfb6a13ded84.tar.zst tangerine-wallet-browser-ae55e8a3c122a3f6d91e28153124bfb6a13ded84.zip | |
Merge branch 'develop' into i3725-refactor-send-component-
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 09f7fdef4..ec2329463 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 |