diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-14 03:18:19 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-14 03:18:19 +0800 |
| commit | 19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a (patch) | |
| tree | 425f11071576a44ca4327125056ac217ae499bae /ui/app/reducers | |
| parent | 4aa5114019870ea6606d98ee9bf5092b45ed9fc5 (diff) | |
| parent | 54ecb09a209bf3ffeba968a79acfa500625b0d4a (diff) | |
| download | tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.gz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.bz2 tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.lz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.xz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.zst tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.zip | |
Merge branch 'master' into qrCode
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 1 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 2173eff3d..8eb6ec4d4 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -39,7 +39,6 @@ function reduceApp (state, action) { accountDetail: { subview: 'transactions', }, - currentDomain: 'example.com', transForward: true, // Used to render transition direction isLoading: false, // Used to display loading indicator warning: null, // Used to display error text diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 7f18480cb..84953d734 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -11,7 +11,6 @@ function reduceMetamask (state, action) { isInitialized: false, isUnlocked: false, isEthConfirmed: false, - currentDomain: 'example.com', rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unconfTxs: {}, |