diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-07-01 12:20:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 12:20:40 +0800 |
| commit | d4e400e5e5a7ba501f210b722f6ccf97be9e6c17 (patch) | |
| tree | 85b9c12d88db37dd586a50c9ebfdebc5d980da1e /ui | |
| parent | 70cf24617bf6adabf5ba012ba1af261df6e79fb3 (diff) | |
| parent | 0f16155abfbe3b45677503846aa04cb5c7ef47bf (diff) | |
| download | tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar.gz tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar.bz2 tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar.lz tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar.xz tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.tar.zst tangerine-wallet-browser-d4e400e5e5a7ba501f210b722f6ccf97be9e6c17.zip | |
Merge pull request #378 from MetaMask/UiDev
Ui dev
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/info.js | 8 | ||||
| -rw-r--r-- | ui/app/reducers.js | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ui/app/info.js b/ui/app/info.js index a473f5921..d97998fd7 100644 --- a/ui/app/info.js +++ b/ui/app/info.js @@ -17,7 +17,13 @@ function InfoScreen () { InfoScreen.prototype.render = function () { var state = this.props - var manifest = chrome.runtime.getManifest() + var manifest + try { + manifest = chrome.runtime.getManifest() + } catch (e) { + manifest = { version: '2.0.0' } + } + return ( h('.flex-column.flex-grow', [ diff --git a/ui/app/reducers.js b/ui/app/reducers.js index 17f94f230..f198758ea 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -13,6 +13,10 @@ function rootReducer (state, action) { // clone state = extend(state) + if (action.type === 'GLOBAL_FORCE_UPDATE') { + return action.value + } + // // Identities // |