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/reducers/app.js | |
| parent | 463a56ff54b0d850c86348e260e5f7c17b138ccb (diff) | |
| parent | 23c2b0b9a5d3f222bfeba7bcff5cf5a57367ffc8 (diff) | |
| download | tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.gz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.bz2 tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.lz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.xz tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.tar.zst tangerine-wallet-browser-70b8e640f0170281b92ac610e063351a74d5333d.zip | |
Merge branch 'dev' into i#1048
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index ae91272cc..6a2c93f78 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -386,6 +386,7 @@ function reduceApp (state, action) { case actions.SHOW_LOADING: return extend(appState, { isLoading: true, + loadingMessage: action.value, }) case actions.HIDE_LOADING: |