diff options
author | Frankie <frankie.pangilinan@consensys.net> | 2016-07-01 05:56:10 +0800 |
---|---|---|
committer | Frankie <frankie.pangilinan@consensys.net> | 2016-07-01 05:56:10 +0800 |
commit | 1b1bb92fd34343d2cec03d68e2b12de15934ebc2 (patch) | |
tree | e8e0ad67370646bfcacb280e940fa76033c92a9d /ui/app | |
parent | 42cd0b69e76537022c7766cae430e496371818b6 (diff) | |
parent | 213c84336e1083f4abe278ac2f70c45124c6ab62 (diff) | |
download | tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.gz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.bz2 tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.lz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.xz tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.tar.zst tangerine-wallet-browser-1b1bb92fd34343d2cec03d68e2b12de15934ebc2.zip |
Merge branch 'master' into compactLayout
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/actions.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 0cbc3b9e6..c6b57d29d 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -47,6 +47,7 @@ var actions = { unlockInProgress: unlockInProgress, // error handling displayWarning: displayWarning, + showWarning: showWarning, // alias DISPLAY_WARNING: 'DISPLAY_WARNING', HIDE_WARNING: 'HIDE_WARNING', hideWarning: hideWarning, @@ -507,6 +508,10 @@ function hideLoadingIndication () { } } +function showWarning (text) { + return this.displayWarning(text) +} + function displayWarning (text) { return { type: actions.DISPLAY_WARNING, |