aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers/app.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-01-20 02:58:33 +0800
committerGitHub <noreply@github.com>2017-01-20 02:58:33 +0800
commita09332f9379400204cae885345a8fd975e887098 (patch)
tree253ad8b40a129b85e7603d43d9edb5b650dbbeb4 /ui/app/reducers/app.js
parent29cbfd1ea28e4408dd79cb1b2769b53ba01913c4 (diff)
parentb478ce5b778bd70a3ebfc89f2c680daa25a6f395 (diff)
downloadtangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar.gz
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar.bz2
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar.lz
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar.xz
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.tar.zst
tangerine-wallet-browser-a09332f9379400204cae885345a8fd975e887098.zip
Merge pull request #1029 from MetaMask/i715-AddJsonImport
Add JSON file account import
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r--ui/app/reducers/app.js1
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: