diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-25 07:39:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 07:39:33 +0800 |
| commit | 70b8e640f0170281b92ac610e063351a74d5333d (patch) | |
| tree | b87831b7cf4acb06a0bca115b12e8be64210f455 /ui/app/app.js | |
| parent | 463a56ff54b0d850c86348e260e5f7c17b138ccb (diff) | |
| parent | 23c2b0b9a5d3f222bfeba7bcff5cf5a57367ffc8 (diff) | |
| download | tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.gz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.zst tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.zip | |
Merge branch 'dev' into i#1048
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 0e04c334c..d8dedd397 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -43,6 +43,7 @@ function mapStateToProps (state) { return { // state from plugin isLoading: state.appState.isLoading, + loadingMessage: state.appState.loadingMessage, isDisclaimerConfirmed: state.metamask.isDisclaimerConfirmed, noActiveNotices: state.metamask.noActiveNotices, isInitialized: state.metamask.isInitialized, @@ -64,7 +65,7 @@ function mapStateToProps (state) { App.prototype.render = function () { var props = this.props - const { isLoading, transForward } = props + const { isLoading, loadingMessage, transForward } = props return ( @@ -76,7 +77,7 @@ App.prototype.render = function () { }, }, [ - h(LoadingIndicator, { isLoading }), + h(LoadingIndicator, { isLoading, loadingMessage }), // app bar this.renderAppBar(), |