From 794eef38c830d3d3bb7e24034f3894652f245d9d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 20 Nov 2017 21:56:11 +0000
Subject: [PATCH 01/46] chore(package): update node-sass to version 4.7.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6177aa28..8bea70e8 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "less-loader": "4.0.5",
     "lint-staged": "5.0.0",
     "minimist": "1.2.0",
-    "node-sass": "4.7.1",
+    "node-sass": "4.7.2",
     "nodemon": "1.12.1",
     "null-loader": "0.1.1",
     "prettier": "1.8.2",

From 0ef63807779b5707562bfaedcfad82182fd52510 Mon Sep 17 00:00:00 2001
From: James Prado <james-prado@users.noreply.github.com>
Date: Tue, 21 Nov 2017 13:33:20 -0500
Subject: [PATCH 02/46] Wallet-Decrypt/Send Tooltips (#436)

* Update Help component && Fix some css errors
---
 common/assets/images/icon-help-3.svg          |  1 +
 common/assets/styles/etherwallet-custom.less  | 50 +------------------
 common/components/WalletDecrypt/Web3.tsx      |  2 +-
 common/components/WalletDecrypt/index.tsx     | 30 ++++++++---
 common/components/ui/Help.scss                | 30 +++++++++++
 common/components/ui/Help.tsx                 | 34 +++----------
 .../SendTransaction/components/NonceField.tsx |  9 ++--
 common/sass/styles/overrides/forms.scss       |  3 +-
 8 files changed, 69 insertions(+), 90 deletions(-)
 create mode 100644 common/assets/images/icon-help-3.svg
 create mode 100644 common/components/ui/Help.scss

diff --git a/common/assets/images/icon-help-3.svg b/common/assets/images/icon-help-3.svg
new file mode 100644
index 00000000..7def12b7
--- /dev/null
+++ b/common/assets/images/icon-help-3.svg
@@ -0,0 +1 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 92 92"><path fill="#0e97c0" d="M45.386.004C19.983.344-.333 21.215.005 46.619c.34 25.393 21.209 45.715 46.611 45.377 25.398-.342 45.718-21.213 45.38-46.615-.34-25.395-21.21-45.716-46.61-45.377zM45.25 74l-.254-.004c-3.912-.116-6.67-2.998-6.559-6.852.109-3.788 2.934-6.538 6.717-6.538l.227.004c4.021.119 6.748 2.972 6.635 6.937C51.904 71.346 49.123 74 45.25 74zm16.455-32.659c-.92 1.307-2.943 2.93-5.492 4.916l-2.807 1.938c-1.541 1.198-2.471 2.325-2.82 3.434-.275.873-.41 1.104-.434 2.88l-.004.451H39.43l.031-.907c.131-3.728.223-5.921 1.768-7.733 2.424-2.846 7.771-6.289 7.998-6.435.766-.577 1.412-1.234 1.893-1.936 1.125-1.551 1.623-2.772 1.623-3.972a7.74 7.74 0 0 0-1.471-4.576c-.939-1.323-2.723-1.993-5.303-1.993-2.559 0-4.311.812-5.359 2.478-1.078 1.713-1.623 3.512-1.623 5.35v.457H27.936l.02-.477c.285-6.769 2.701-11.643 7.178-14.487C37.947 18.918 41.447 18 45.531 18c5.346 0 9.859 1.299 13.412 3.861 3.6 2.596 5.426 6.484 5.426 11.556 0 2.837-.896 5.502-2.664 7.924z"/></svg>
diff --git a/common/assets/styles/etherwallet-custom.less b/common/assets/styles/etherwallet-custom.less
index 4ab73d56..0e10a4de 100755
--- a/common/assets/styles/etherwallet-custom.less
+++ b/common/assets/styles/etherwallet-custom.less
@@ -135,52 +135,6 @@ textarea {
   }
 }
 
-.account-help-icon {
-  h3,
-  h4,
-  h5,
-  h6,
-  img {
-    display: inline-block;
-  }
-  img:hover + .account-help-text {
-    display: block;
-  }
-  img {
-    margin-left: -30px;
-    margin-right: 3px;
-  }
-}
-
-.account-help-text {
-  background: white;
-  border-radius: @border-radius;
-  border: 1px solid #cdcdcd;
-  box-shadow: 0 0 @space-sm rgba(100, 100, 100, .2);
-  display: none;
-  font-size: @font-size-xs;
-  font-weight: 400;
-  padding: @space-xs;
-  position: absolute;
-  width: 18rem;
-  z-index: 999;
-  ul& {
-    padding-left: 1.6rem;
-  }
-  li {
-    font-size: @font-size-xs;
-    font-weight: 400;
-  }
-}
-
-@media screen and (max-width: 767px) {
-  .account-help-icon li,
-  .account-help-icon img,
-  .account-help-icon p {
-    display: none;
-  }
-}
-
 // monospace things
 .mono,
 .form-control,
@@ -283,7 +237,7 @@ input[type="password"] + .eye {
 
 .m-addresses td:first-child {
   max-width: 50px;
-  min-widht: 50px;
+  min-width: 50px;
 }
 
 .m-addresses td:last-child {
@@ -444,4 +398,4 @@ label small {
 
 .ens-response {
   color: @gray;
-}
+}
\ No newline at end of file
diff --git a/common/components/WalletDecrypt/Web3.tsx b/common/components/WalletDecrypt/Web3.tsx
index f2edeae6..50ed20e4 100644
--- a/common/components/WalletDecrypt/Web3.tsx
+++ b/common/components/WalletDecrypt/Web3.tsx
@@ -13,7 +13,7 @@ export default class Web3Decrypt extends Component<Props> {
       <section className="Web3Decrypt col-md-4 col-sm-6">
         <div>
           <button
-            className="Web3Decrypt btn btn-primary btn-lg"
+            className="Web3Decrypt-decrypt btn btn-primary btn-lg"
             onClick={this.props.onUnlock}
           >
             {translate('ADD_MetaMask')}
diff --git a/common/components/WalletDecrypt/index.tsx b/common/components/WalletDecrypt/index.tsx
index 70855560..8b7a7dd7 100644
--- a/common/components/WalletDecrypt/index.tsx
+++ b/common/components/WalletDecrypt/index.tsx
@@ -22,6 +22,7 @@ import TrezorDecrypt from './Trezor';
 import ViewOnlyDecrypt from './ViewOnly';
 import { AppState } from 'reducers';
 import Web3Decrypt from './Web3';
+import Help from 'components/ui/Help';
 
 const WALLETS = {
   'keystore-file': {
@@ -32,7 +33,9 @@ const WALLETS = {
       password: ''
     },
     unlock: unlockKeystore,
-    disabled: false
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
   'private-key': {
     lid: 'x_PrivKey2',
@@ -42,40 +45,50 @@ const WALLETS = {
       password: ''
     },
     unlock: unlockPrivateKey,
-    disabled: false
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
   'mnemonic-phrase': {
     lid: 'x_Mnemonic',
     component: MnemonicDecrypt,
     initialParams: {},
     unlock: unlockMnemonic,
-    disabled: false
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
   'ledger-nano-s': {
     lid: 'x_Ledger',
     component: LedgerNanoSDecrypt,
     initialParams: {},
     unlock: setWallet,
-    disabled: false
+    disabled: false,
+    helpLink:
+      'https://ledger.zendesk.com/hc/en-us/articles/115005200009-How-to-use-MyEtherWallet-with-Ledger'
   },
   trezor: {
     lid: 'x_Trezor',
     component: TrezorDecrypt,
     initialParams: {},
     unlock: setWallet,
-    disabled: false
+    disabled: false,
+    helpLink: 'https://doc.satoshilabs.com/trezor-apps/mew.html'
   },
   web3: {
     lid: 'x_MetaMask',
     component: Web3Decrypt,
     initialParams: {},
     unlock: unlockWeb3,
-    disabled: false
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/migration/moving-from-private-key-to-metamask.html'
   },
   'view-only': {
     lid: 'View with Address Only',
     component: ViewOnlyDecrypt,
-    disabled: true
+    disabled: true,
+    helpLink: ''
   }
 };
 
@@ -127,7 +140,7 @@ export class WalletDecrypt extends Component<Props, State> {
   public buildWalletOptions() {
     return map(WALLETS, (wallet, key) => {
       const isSelected = this.state.selectedWalletKey === key;
-
+      const { helpLink } = wallet;
       return (
         <label className="radio" key={key}>
           <input
@@ -143,6 +156,7 @@ export class WalletDecrypt extends Component<Props, State> {
             }
           />
           <span id={`${key}-label`}>{translate(wallet.lid)}</span>
+          {helpLink ? <Help link={helpLink} /> : null}
         </label>
       );
     });
diff --git a/common/components/ui/Help.scss b/common/components/ui/Help.scss
new file mode 100644
index 00000000..eb67172a
--- /dev/null
+++ b/common/components/ui/Help.scss
@@ -0,0 +1,30 @@
+.Help {
+  display: inline-block;
+  margin-left: 8px;
+  padding: 4px;
+  box-sizing: content-box;
+  line-height: inherit;
+  vertical-align: top;
+  transition: opacity 0.3s;
+
+  & img {
+    display: block;
+    height: inherit;
+    width: inherit;
+  }
+
+  &-x1 {
+    height: 16px;
+    width: 16px;
+  }
+
+  &-x2 {
+    height: 24px;
+    width: 24px;
+  }
+
+  &-x3 {
+    height: 36px;
+    width: 36px;
+  }
+}
diff --git a/common/components/ui/Help.tsx b/common/components/ui/Help.tsx
index e7132d06..3cea97b1 100644
--- a/common/components/ui/Help.tsx
+++ b/common/components/ui/Help.tsx
@@ -1,36 +1,18 @@
 import React from 'react';
-import helpIcon from 'assets/images/icon-help.svg';
+import icon from 'assets/images/icon-help-3.svg';
+import './Help.scss';
 
-type sizeType = 'small' | 'medium' | 'large';
+type Size = 'x1' | 'x2' | 'x3';
 
-interface HelpProps {
+interface Props {
   link: string;
-  size?: sizeType;
-  helpText?: string;
+  size?: Size;
 }
 
-const Help = ({ size, link, helpText }: HelpProps) => {
-  let width = 30;
-  let height = 12;
-
-  switch (size) {
-    case 'medium':
-      width = width * 3;
-      height = height * 3;
-      break;
-    case 'large':
-      width = width * 4;
-      height = height * 4;
-      break;
-    default:
-      break;
-  }
-
+const Help = ({ size = 'x1', link }: Props) => {
   return (
-    <a href={link} className={'account-help-icon'} target={'_blank'}>
-      <img src={helpIcon} width={width} height={height} />
-
-      {helpText && <p className="account-help-text">{helpText}</p>}
+    <a href={link} className={`Help Help-${size}`} target={'_blank'}>
+      <img src={icon} />
     </a>
   );
 };
diff --git a/common/containers/Tabs/SendTransaction/components/NonceField.tsx b/common/containers/Tabs/SendTransaction/components/NonceField.tsx
index 0a3f94a0..e1a0ca35 100644
--- a/common/containers/Tabs/SendTransaction/components/NonceField.tsx
+++ b/common/containers/Tabs/SendTransaction/components/NonceField.tsx
@@ -27,17 +27,16 @@ export default class NonceField extends React.Component<PublicProps, {}> {
     return (
       <div className="row form-group">
         <div className="col-xs-11">
+          <label>Nonce</label>
           <Help
-            size={'small'}
             link={
               'https://myetherwallet.github.io/knowledge-base/transactions/what-is-nonce.html'
             }
           />
-          <label>Nonce</label>
           <input
-            className={`form-control ${isValidNonce(strValue)
-              ? 'is-valid'
-              : 'is-invalid'}`}
+            className={`form-control ${
+              isValidNonce(strValue) ? 'is-valid' : 'is-invalid'
+            }`}
             type="number"
             value={strValue}
             placeholder={placeholder}
diff --git a/common/sass/styles/overrides/forms.scss b/common/sass/styles/overrides/forms.scss
index a91b4394..0ab18237 100644
--- a/common/sass/styles/overrides/forms.scss
+++ b/common/sass/styles/overrides/forms.scss
@@ -2,7 +2,6 @@
 @import 'common/sass/variables';
 
 label {
-  margin-top: $space-sm;
   margin-bottom: $space-xs;
   font-size: $font-size-bump-more;
 }
@@ -39,7 +38,7 @@ input[readonly] {
 
 .form-group {
   display: block;
-  margin-top: $form-group-margin-bottom;
+  margin-top: $form-group-margin-bottom * 2;
   margin-bottom: $form-group-margin-bottom;
 }
 

From f9b64d1f2567481dad0ba3a4bd79f5f45d2ed8f4 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2017 13:55:20 -0600
Subject: [PATCH 03/46] chore(package): update @types/react-router to version
 4.0.18 (#440)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8bea70e8..9f4d2c03 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@types/react": "16.0.25",
     "@types/react-dom": "16.0.3",
     "@types/react-redux": "5.0.13",
-    "@types/react-router": "4.0.17",
+    "@types/react-router": "4.0.18",
     "@types/react-router-dom": "4.2.1",
     "@types/react-router-redux": "5.0.10",
     "@types/redux-form": "7.0.9",

From d28f2cee1f89c94b63d80db165e56424b69368a2 Mon Sep 17 00:00:00 2001
From: James Prado <james-prado@users.noreply.github.com>
Date: Tue, 21 Nov 2017 14:55:46 -0500
Subject: [PATCH 04/46] Remove Bity Rates from Local Storage (#435)

* Remove bityRates from localstorage

* Store swap.bityRates in ls as initial value

* Store swap bityrates as empty obj in ls
---
 common/store.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/store.ts b/common/store.ts
index 2016ff3b..28e9524a 100644
--- a/common/store.ts
+++ b/common/store.ts
@@ -111,12 +111,13 @@ const configureStore = () => {
           languageSelection: state.config.languageSelection,
           customNodes: state.config.customNodes
         },
-        swap: state.swap,
+        swap: { ...state.swap, bityRates: {} },
         customTokens: state.customTokens
       });
     }),
     1000
   );
+
   return store;
 };
 

From d8c8a49d7dc7867f389c5f70276f72c34addfacf Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2017 14:29:14 -0600
Subject: [PATCH 05/46] chore(package): update @types/jest to version 21.1.7
 (#438)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9f4d2c03..5c813f92 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@types/classnames": "2.2.3",
     "@types/history": "4.6.1",
-    "@types/jest": "21.1.6",
+    "@types/jest": "21.1.7",
     "@types/lodash": "4.14.85",
     "@types/qrcode": "0.8.0",
     "@types/qrcode.react": "0.6.2",

From a5fd608f17e900156b2660d9589464bc66a687e2 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Tue, 21 Nov 2017 18:32:20 -0600
Subject: [PATCH 06/46] Re-Order Decrypt Options to Match V3 (#445)

---
 common/components/WalletDecrypt/index.tsx | 70 +++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/common/components/WalletDecrypt/index.tsx b/common/components/WalletDecrypt/index.tsx
index 8b7a7dd7..fbb77890 100644
--- a/common/components/WalletDecrypt/index.tsx
+++ b/common/components/WalletDecrypt/index.tsx
@@ -25,38 +25,14 @@ import Web3Decrypt from './Web3';
 import Help from 'components/ui/Help';
 
 const WALLETS = {
-  'keystore-file': {
-    lid: 'x_Keystore2',
-    component: KeystoreDecrypt,
-    initialParams: {
-      file: '',
-      password: ''
-    },
-    unlock: unlockKeystore,
-    disabled: false,
-    helpLink:
-      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
-  },
-  'private-key': {
-    lid: 'x_PrivKey2',
-    component: PrivateKeyDecrypt,
-    initialParams: {
-      key: '',
-      password: ''
-    },
-    unlock: unlockPrivateKey,
-    disabled: false,
-    helpLink:
-      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
-  },
-  'mnemonic-phrase': {
-    lid: 'x_Mnemonic',
-    component: MnemonicDecrypt,
+  web3: {
+    lid: 'x_MetaMask',
+    component: Web3Decrypt,
     initialParams: {},
-    unlock: unlockMnemonic,
+    unlock: unlockWeb3,
     disabled: false,
     helpLink:
-      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
+      'https://myetherwallet.github.io/knowledge-base/migration/moving-from-private-key-to-metamask.html'
   },
   'ledger-nano-s': {
     lid: 'x_Ledger',
@@ -75,14 +51,38 @@ const WALLETS = {
     disabled: false,
     helpLink: 'https://doc.satoshilabs.com/trezor-apps/mew.html'
   },
-  web3: {
-    lid: 'x_MetaMask',
-    component: Web3Decrypt,
-    initialParams: {},
-    unlock: unlockWeb3,
+  'keystore-file': {
+    lid: 'x_Keystore2',
+    component: KeystoreDecrypt,
+    initialParams: {
+      file: '',
+      password: ''
+    },
+    unlock: unlockKeystore,
     disabled: false,
     helpLink:
-      'https://myetherwallet.github.io/knowledge-base/migration/moving-from-private-key-to-metamask.html'
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
+  },
+  'mnemonic-phrase': {
+    lid: 'x_Mnemonic',
+    component: MnemonicDecrypt,
+    initialParams: {},
+    unlock: unlockMnemonic,
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
+  },
+  'private-key': {
+    lid: 'x_PrivKey2',
+    component: PrivateKeyDecrypt,
+    initialParams: {
+      key: '',
+      password: ''
+    },
+    unlock: unlockPrivateKey,
+    disabled: false,
+    helpLink:
+      'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
   'view-only': {
     lid: 'View with Address Only',

From a03a1705456b0f6da40295776cdaa04a7ca40014 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2017 18:32:40 -0600
Subject: [PATCH 07/46] chore(package): update @types/react-router-dom to
 version 4.2.2 (#439)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5c813f92..cbc6dc83 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@types/react-dom": "16.0.3",
     "@types/react-redux": "5.0.13",
     "@types/react-router": "4.0.18",
-    "@types/react-router-dom": "4.2.1",
+    "@types/react-router-dom": "4.2.2",
     "@types/react-router-redux": "5.0.10",
     "@types/redux-form": "7.0.9",
     "@types/redux-logger": "3.0.5",

From 8d9373eee9db985c4e7c616d44e6d988139a6390 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 22 Nov 2017 17:45:31 -0600
Subject: [PATCH 08/46] chore(package): update webpack-dev-middleware to
 version 1.12.1 (#447)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cbc6dc83..720b48f3 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "typescript": "2.5.2",
     "url-loader": "0.6.2",
     "webpack": "3.8.1",
-    "webpack-dev-middleware": "1.12.0",
+    "webpack-dev-middleware": "1.12.1",
     "webpack-hot-middleware": "2.20.0"
   },
   "scripts": {

From 63f8c7b580d6b274b53b340674e52644426d6026 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 23 Nov 2017 12:53:24 -0600
Subject: [PATCH 09/46] chore(package): update @types/jest to version 21.1.8
 (#450)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 720b48f3..f6326651 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@types/classnames": "2.2.3",
     "@types/history": "4.6.1",
-    "@types/jest": "21.1.7",
+    "@types/jest": "21.1.8",
     "@types/lodash": "4.14.85",
     "@types/qrcode": "0.8.0",
     "@types/qrcode.react": "0.6.2",

From f63055bd639b36628536c4843cab55812e3d5aae Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Fri, 24 Nov 2017 13:18:29 -0600
Subject: [PATCH 10/46] chore(package): update copy-webpack-plugin to version
 4.2.3 (#452)

Closes #451
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f6326651..dd0eb1a3 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "bs58": "4.0.1",
     "cache-loader": "1.2.0",
     "check-node-version": "2.1.0",
-    "copy-webpack-plugin": "4.2.1",
+    "copy-webpack-plugin": "4.2.3",
     "css-loader": "0.28.7",
     "empty": "0.10.1",
     "enzyme": "3.2.0",

From b2a3e1e45edda866e85277011fdd0e31c34aecb1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Sun, 26 Nov 2017 17:57:34 -0600
Subject: [PATCH 11/46] chore(package): update webpack-hot-middleware to
 version 2.21.0 (#457)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dd0eb1a3..47e8be6a 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "url-loader": "0.6.2",
     "webpack": "3.8.1",
     "webpack-dev-middleware": "1.12.1",
-    "webpack-hot-middleware": "2.20.0"
+    "webpack-hot-middleware": "2.21.0"
   },
   "scripts": {
     "db": "nodemon ./db",

From 2570abd97795efad8521caf07969f19df7e77242 Mon Sep 17 00:00:00 2001
From: skubakdj <skubakdj@gmail.com>
Date: Mon, 27 Nov 2017 15:31:23 -0500
Subject: [PATCH 12/46] Remove Redux-Form in Generate Wallet (#466)

* remove redux-form from package.json, vendors, reducers

* refactor GenerateWallet components, remove redux-form dependency
---
 .../components/EnterPassword.tsx              | 48 +++++++++----------
 .../components/PasswordInput.tsx              | 18 +++++--
 common/reducers/index.ts                      |  2 -
 common/vendors.js                             |  1 -
 package.json                                  |  1 -
 5 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/common/containers/Tabs/GenerateWallet/components/EnterPassword.tsx b/common/containers/Tabs/GenerateWallet/components/EnterPassword.tsx
index f4d1596f..3f234f97 100644
--- a/common/containers/Tabs/GenerateWallet/components/EnterPassword.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/EnterPassword.tsx
@@ -1,41 +1,37 @@
 import { GenerateNewWalletAction } from 'actions/generateWallet';
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Field, reduxForm } from 'redux-form';
 import translate from 'translations';
 import './EnterPassword.scss';
 import PasswordInput from './PasswordInput';
 import Template from './Template';
+
 // VALIDATORS
-const minLength = min => value => {
-  return value && value.length < min
-    ? `Must be ${min} characters or more`
-    : undefined;
-};
+const minLength = min => value => value && value.length >= min;
 const minLength9 = minLength(9);
-const required = value => (value ? undefined : 'Required');
 
 interface Props {
-  walletPasswordForm: any;
   generateNewWallet(pw: string): GenerateNewWalletAction;
 }
 
 interface State {
   fileName: null | string;
   blobURI: null | string;
+  password: string;
+  isPasswordValid: boolean;
   isPasswordVisible: boolean;
 }
-class EnterPassword extends Component<Props, State> {
+export default class EnterPassword extends Component<Props, State> {
   public state = {
     fileName: null,
     blobURI: null,
+    password: '',
+    isPasswordValid: false,
     isPasswordVisible: false
   };
 
   public render() {
-    const { walletPasswordForm } = this.props;
-    const { isPasswordVisible } = this.state;
-    const AnyField = Field as new () => Field<any>;
+    const { password, isPasswordValid, isPasswordVisible } = this.state;
     const content = (
       <div className="EnterPw">
         <h1 className="EnterPw-title" aria-live="polite">
@@ -44,20 +40,18 @@ class EnterPassword extends Component<Props, State> {
 
         <label className="EnterPw-password">
           <h4 className="EnterPw-password-label">{translate('GEN_Label_1')}</h4>
-          <AnyField
-            className="EnterPw-password-field"
-            validate={[required, minLength9]}
-            component={PasswordInput}
+          <PasswordInput
+            password={password}
+            onPasswordChange={this.onPasswordChange}
             isPasswordVisible={isPasswordVisible}
             togglePassword={this.togglePassword}
-            name="password"
-            type="text"
+            isPasswordValid={isPasswordValid}
           />
         </label>
 
         <button
           onClick={this.onClickGenerateFile}
-          disabled={walletPasswordForm ? walletPasswordForm.syncErrors : true}
+          disabled={!isPasswordValid}
           className="EnterPw-submit btn btn-primary btn-block"
         >
           {translate('NAV_GenerateWallet')}
@@ -131,15 +125,19 @@ class EnterPassword extends Component<Props, State> {
     return <Template content={content} help={help} />;
   }
   private onClickGenerateFile = () => {
-    const form = this.props.walletPasswordForm;
-    this.props.generateNewWallet(form.values.password);
+    this.props.generateNewWallet(this.state.password);
+    this.setState({ password: '' });
   };
 
   private togglePassword = () => {
     this.setState({ isPasswordVisible: !this.state.isPasswordVisible });
   };
-}
 
-export default reduxForm({
-  form: 'walletPasswordForm' // a unique name for this form
-})(EnterPassword as any);
+  private onPasswordChange = (e: any) => {
+    const password = e.target.value;
+    this.setState({
+      isPasswordValid: minLength9(password),
+      password
+    });
+  };
+}
diff --git a/common/containers/Tabs/GenerateWallet/components/PasswordInput.tsx b/common/containers/Tabs/GenerateWallet/components/PasswordInput.tsx
index a115caa8..dafe401f 100644
--- a/common/containers/Tabs/GenerateWallet/components/PasswordInput.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/PasswordInput.tsx
@@ -2,27 +2,35 @@ import React, { Component } from 'react';
 import { translateRaw } from 'translations';
 
 interface Props {
+  password: string;
+  onPasswordChange: any;
   togglePassword: any;
   isPasswordVisible?: boolean;
-  input: any;
-  meta: any;
+  isPasswordValid: boolean;
 }
 
 export default class PasswordInput extends Component<Props, {}> {
   public render() {
-    const { input, meta, isPasswordVisible, togglePassword } = this.props;
+    const {
+      password,
+      isPasswordValid,
+      isPasswordVisible,
+      togglePassword,
+      onPasswordChange
+    } = this.props;
 
     return (
       <div>
         <div>
           <div className="input-group" style={{ width: '100%' }}>
             <input
-              {...input}
+              value={password}
               name="password"
-              className={`form-control ${meta.error ? 'is-invalid' : ''}`}
+              className={`form-control ${!isPasswordValid ? 'is-invalid' : ''}`}
               type={isPasswordVisible ? 'text' : 'password'}
               placeholder={translateRaw('GEN_Placeholder_1')}
               aria-label={translateRaw('GEN_Aria_1')}
+              onChange={onPasswordChange}
             />
             <span
               onClick={togglePassword}
diff --git a/common/reducers/index.ts b/common/reducers/index.ts
index e927c41e..ef3a1c71 100644
--- a/common/reducers/index.ts
+++ b/common/reducers/index.ts
@@ -1,6 +1,5 @@
 import { routerReducer } from 'react-router-redux';
 import { combineReducers } from 'redux';
-import { reducer as formReducer } from 'redux-form';
 import { config, State as ConfigState } from './config';
 import { customTokens, State as CustomTokensState } from './customTokens';
 import {
@@ -39,6 +38,5 @@ export default combineReducers({
   customTokens,
   rates,
   deterministicWallets,
-  form: formReducer,
   routing: routerReducer
 });
diff --git a/common/vendors.js b/common/vendors.js
index 61d3e54d..1b6bf554 100644
--- a/common/vendors.js
+++ b/common/vendors.js
@@ -11,7 +11,6 @@ require('react-redux');
 require('react-router');
 require('react-router-redux');
 require('redux');
-require('redux-form');
 require('redux-logger');
 require('redux-saga');
 require('wallet-address-validator');
diff --git a/package.json b/package.json
index 47e8be6a..bf888786 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "react-router-redux": "4.0.8",
     "react-transition-group": "2.2.1",
     "redux": "3.7.2",
-    "redux-form": "7.1.2",
     "redux-logger": "3.0.6",
     "redux-promise-middleware": "4.4.2",
     "redux-saga": "0.16.0",

From 96cc41b7df2efd80afd16e4b484e42f23cb42550 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2017 14:33:10 -0600
Subject: [PATCH 13/46] chore(package): update webpack-dev-middleware to
 version 1.12.2 (#460)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bf888786..2a900cfd 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "typescript": "2.5.2",
     "url-loader": "0.6.2",
     "webpack": "3.8.1",
-    "webpack-dev-middleware": "1.12.1",
+    "webpack-dev-middleware": "1.12.2",
     "webpack-hot-middleware": "2.21.0"
   },
   "scripts": {

From af5fc98eec4d1761448ee31249ca1b408c6f3e5a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2017 14:33:32 -0600
Subject: [PATCH 14/46] chore(package): update @types/react-router-dom to
 version 4.2.3 (#463)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2a900cfd..e6cd8178 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@types/react-dom": "16.0.3",
     "@types/react-redux": "5.0.13",
     "@types/react-router": "4.0.18",
-    "@types/react-router-dom": "4.2.2",
+    "@types/react-router-dom": "4.2.3",
     "@types/react-router-redux": "5.0.10",
     "@types/redux-form": "7.0.9",
     "@types/redux-logger": "3.0.5",

From c9ad43969cf4bf0e17fb2649fc436c2d53f1e464 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2017 14:34:09 -0600
Subject: [PATCH 15/46] chore(package): update @types/react-router to version
 4.0.19 (#465)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e6cd8178..4b18d56f 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@types/react": "16.0.25",
     "@types/react-dom": "16.0.3",
     "@types/react-redux": "5.0.13",
-    "@types/react-router": "4.0.18",
+    "@types/react-router": "4.0.19",
     "@types/react-router-dom": "4.2.3",
     "@types/react-router-redux": "5.0.10",
     "@types/redux-form": "7.0.9",

From 142ec4adc812487b61ef4b43563649843b8b8b3d Mon Sep 17 00:00:00 2001
From: skubakdj <skubakdj@gmail.com>
Date: Mon, 27 Nov 2017 17:27:49 -0500
Subject: [PATCH 16/46] Redux-Form Refactor - Bugfix (#469)

* remove walletPasswordForm prop

* update GenerateWallet test

* update GenerateWallet snapshot
---
 common/containers/Tabs/GenerateWallet/index.tsx       | 3 ---
 spec/pages/GenerateWallet.spec.tsx                    | 3 ---
 spec/pages/__snapshots__/GenerateWallet.spec.tsx.snap | 1 -
 3 files changed, 7 deletions(-)

diff --git a/common/containers/Tabs/GenerateWallet/index.tsx b/common/containers/Tabs/GenerateWallet/index.tsx
index 9c0bf511..34781466 100644
--- a/common/containers/Tabs/GenerateWallet/index.tsx
+++ b/common/containers/Tabs/GenerateWallet/index.tsx
@@ -21,7 +21,6 @@ interface Props {
   activeStep: string; // FIXME union actual steps
   password: string;
   wallet: IFullWallet | null | undefined;
-  walletPasswordForm: any;
   // Actions
   generateNewWallet: TGenerateNewWallet;
   continueToPaper: TContinueToPaper;
@@ -44,7 +43,6 @@ class GenerateWallet extends Component<Props, {}> {
         case 'password':
           content = (
             <AnyEnterPassword
-              walletPasswordForm={this.props.walletPasswordForm}
               generateNewWallet={this.props.generateNewWallet}
             />
           );
@@ -87,7 +85,6 @@ class GenerateWallet extends Component<Props, {}> {
 
 function mapStateToProps(state: AppState) {
   return {
-    walletPasswordForm: state.form.walletPasswordForm,
     activeStep: state.generateWallet.activeStep,
     password: state.generateWallet.password,
     wallet: state.generateWallet.wallet
diff --git a/spec/pages/GenerateWallet.spec.tsx b/spec/pages/GenerateWallet.spec.tsx
index d47e41ee..0636163c 100644
--- a/spec/pages/GenerateWallet.spec.tsx
+++ b/spec/pages/GenerateWallet.spec.tsx
@@ -9,9 +9,6 @@ Enzyme.configure({ adapter: new Adapter() });
 
 it('render snapshot', () => {
   const testState = {
-    form: {
-      walletPasswordForm: {}
-    },
     generateWallet: {
       activeStep: {},
       password: {},
diff --git a/spec/pages/__snapshots__/GenerateWallet.spec.tsx.snap b/spec/pages/__snapshots__/GenerateWallet.spec.tsx.snap
index fdbba3e6..102337ba 100644
--- a/spec/pages/__snapshots__/GenerateWallet.spec.tsx.snap
+++ b/spec/pages/__snapshots__/GenerateWallet.spec.tsx.snap
@@ -8,6 +8,5 @@ exports[`render snapshot 1`] = `
   password={Object {}}
   resetGenerateWallet={[Function]}
   wallet={Object {}}
-  walletPasswordForm={Object {}}
 />
 `;

From 6bd4cda4ee0cc59f7698cd0647f372574225951a Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2017 18:39:21 -0600
Subject: [PATCH 17/46] chore(package): update @types/react-redux to version
 5.0.14 (#471)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b18d56f..b6f7d585 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@types/qrcode.react": "0.6.2",
     "@types/react": "16.0.25",
     "@types/react-dom": "16.0.3",
-    "@types/react-redux": "5.0.13",
+    "@types/react-redux": "5.0.14",
     "@types/react-router": "4.0.19",
     "@types/react-router-dom": "4.2.3",
     "@types/react-router-redux": "5.0.10",

From 37184e4c4e59947888879bf5b7a3d25a2dceff83 Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Mon, 27 Nov 2017 23:33:38 -0500
Subject: [PATCH 18/46] Remove duplicate transaction.ts file (#468)

---
 common/libs/transaction/transaction.ts | 312 -------------------------
 1 file changed, 312 deletions(-)
 delete mode 100644 common/libs/transaction/transaction.ts

diff --git a/common/libs/transaction/transaction.ts b/common/libs/transaction/transaction.ts
deleted file mode 100644
index 33819fd7..00000000
--- a/common/libs/transaction/transaction.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-import { Token } from 'config/data';
-import EthTx from 'ethereumjs-tx';
-import { addHexPrefix, padToEven, toChecksumAddress } from 'ethereumjs-util';
-import ERC20 from 'libs/erc20';
-import { TransactionWithoutGas } from 'libs/messages';
-import { RPCNode } from 'libs/nodes';
-import { INode } from 'libs/nodes/INode';
-import { UnitKey, Wei, TokenValue, toTokenBase } from 'libs/units';
-import { isValidETHAddress } from 'libs/validators';
-import { stripHexPrefixAndLower, toHexWei, sanitizeHex } from 'libs/values';
-import { IWallet } from 'libs/wallet';
-import { translateRaw } from 'translations';
-
-export interface TransactionInput {
-  token?: Token | null;
-  unit: UnitKey;
-  value: string;
-  to: string;
-  data: string;
-}
-
-export interface BroadcastTransactionStatus {
-  isBroadcasting: boolean;
-  signedTx: string;
-  successfullyBroadcast: boolean;
-}
-
-export interface BaseTransaction {
-  to: string;
-  value: string;
-  data: string;
-  gasLimit: Wei | string;
-  gasPrice: Wei | string;
-  chainId: number;
-}
-
-export interface RawTransaction extends BaseTransaction {
-  nonce: string;
-}
-
-export interface ExtendedRawTransaction extends RawTransaction {
-  // non-standard, legacy
-  from: string;
-}
-
-export interface CompleteTransaction extends RawTransaction {
-  rawTx: string;
-  signedTx: string;
-}
-
-// Get useable fields from an EthTx object.
-export function getTransactionFields(tx: EthTx) {
-  // For some crazy reason, toJSON spits out an array, not keyed values.
-  const [nonce, gasPrice, gasLimit, to, value, data, v, r, s] = tx.toJSON();
-
-  return {
-    // No value comes back as '0x', but most things expect '0x00'
-    value: value === '0x' ? '0x00' : value,
-    // If data is 0x, it might as well not be there
-    data: data === '0x' ? null : data,
-    // To address is unchecksummed, which could cause mismatches in comparisons
-    to: toChecksumAddress(to),
-    from: sanitizeHex(tx.getSenderAddress().toString('hex')),
-    // Everything else is as-is
-    nonce,
-    gasPrice,
-    gasLimit,
-    v,
-    r,
-    s
-  };
-}
-
-function getValue(
-  token: Token | null | undefined,
-  tx: ExtendedRawTransaction
-): Wei {
-  let value;
-  if (token) {
-    value = Wei(ERC20.$transfer(tx.data).value);
-  } else {
-    value = Wei(tx.value);
-  }
-  return value;
-}
-
-async function getBalance(
-  node: INode,
-  tx: ExtendedRawTransaction,
-  token: Token | null | undefined
-) {
-  const { from } = tx;
-  const ETHBalance = await node.getBalance(from);
-  let balance: Wei;
-  if (token) {
-    balance = toTokenBase(
-      await node.getTokenBalance(tx.from, token).toString(),
-      token.decimal
-    );
-  } else {
-    balance = ETHBalance;
-  }
-  return {
-    balance,
-    ETHBalance
-  };
-}
-
-async function balanceCheck(
-  node: INode,
-  tx: ExtendedRawTransaction,
-  token: Token | null | undefined,
-  value: Wei,
-  gasCost: Wei
-) {
-  // Ensure their balance exceeds the amount they're sending
-  const { balance, ETHBalance } = await getBalance(node, tx, token);
-  if (value.gt(balance)) {
-    throw new Error(translateRaw('GETH_Balance'));
-  }
-  // ensure gas cost is not greaterThan current eth balance
-  // TODO check that eth balance is not lesser than txAmount + gasCost
-  if (gasCost.gt(ETHBalance)) {
-    throw new Error(
-      `gasCost: ${gasCost.toString()} greaterThan ETHBalance: ${ETHBalance.toString()}`
-    );
-  }
-}
-
-function generateTxValidation(
-  to: string,
-  token: Token | null | undefined,
-  data: string,
-  gasLimit: Wei | string,
-  gasPrice: Wei | string,
-  skipEthAddressValidation: boolean
-) {
-  // Reject bad addresses
-  if (!isValidETHAddress(to) && !skipEthAddressValidation) {
-    throw new Error(translateRaw('ERROR_5'));
-  }
-  // Reject token transactions without data
-  if (token && !data) {
-    throw new Error('Tokens must be sent with data');
-  }
-  if (typeof gasLimit === 'string' || typeof gasPrice === 'string') {
-    throw Error('Gas Limit and Gas Price should be of type bignumber');
-  }
-  // Reject gas limit under 21000 (Minimum for transaction)
-  // Reject if limit over 5000000
-  // TODO: Make this dynamic, the limit shifts
-  if (gasLimit.ltn(21000)) {
-    throw new Error('Gas limit must be at least 21000 for transactions');
-  }
-  // Reject gasLimit over 5000000gwei
-  if (gasLimit.gtn(5000000)) {
-    throw new Error(translateRaw('GETH_GasLimit'));
-  }
-  // Reject gasPrice over 1000gwei (1000000000000)
-  const gwei = Wei('1000000000000');
-  if (gasPrice.gt(gwei)) {
-    throw new Error(
-      'Gas price too high. Please contact support if this was not a mistake.'
-    );
-  }
-}
-
-export async function generateCompleteTransactionFromRawTransaction(
-  node: INode,
-  tx: ExtendedRawTransaction,
-  wallet: IWallet,
-  token: Token | null | undefined,
-  skipValidation: boolean,
-  offline?: boolean
-): Promise<CompleteTransaction> {
-  const { to, data, gasLimit, gasPrice, chainId, nonce } = tx;
-  // validation
-  generateTxValidation(to, token, data, gasLimit, gasPrice, skipValidation);
-  // duplicated from generateTxValidation -- typescript bug
-  if (typeof gasLimit === 'string' || typeof gasPrice === 'string') {
-    throw Error('Gas Limit and Gas Price should be of type bignumber');
-  }
-  // computed gas cost (gasprice * gaslimit)
-  const gasCost: Wei = Wei(gasPrice.mul(gasLimit));
-  // get amount value (either in ETH or in Token)
-  const value = getValue(token, tx);
-  // if not offline, ensure that balance exceeds costs
-  if (!offline) {
-    await balanceCheck(node, tx, token, value, gasCost);
-  }
-  // Taken from v3's `sanitizeHex`, ensures that the value is a %2 === 0
-  // prefix'd hex value.
-  const cleanHex = hex => addHexPrefix(padToEven(stripHexPrefixAndLower(hex)));
-  const cleanedRawTx = {
-    nonce: cleanHex(nonce),
-    gasPrice: cleanHex(gasPrice.toString(16)),
-    gasLimit: cleanHex(gasLimit.toString(16)),
-    to: toChecksumAddress(cleanHex(to)),
-    value: token ? '0x00' : cleanHex(value.toString(16)),
-    data: data ? cleanHex(data) : '',
-    chainId: chainId || 1
-  };
-
-  // Sign the transaction
-  const rawTxJson = JSON.stringify(cleanedRawTx);
-  const signedTx = await wallet.signRawTransaction(cleanedRawTx);
-
-  return {
-    ...cleanedRawTx,
-    rawTx: rawTxJson,
-    signedTx
-  };
-}
-
-export async function formatTxInput(
-  wallet: IWallet,
-  { token, unit, value, to, data }: TransactionInput
-): Promise<TransactionWithoutGas> {
-  if (unit === 'ether') {
-    return {
-      to,
-      from: await wallet.getAddressString(),
-      value: toHexWei(value), //turn users ether to wei
-      data
-    };
-  } else {
-    if (!token) {
-      throw new Error('No matching token');
-    }
-    const bigAmount = TokenValue(value);
-    const ERC20Data = ERC20.transfer(to, bigAmount);
-    return {
-      to: token.address,
-      from: await wallet.getAddressString(),
-      value: '0x0',
-      data: ERC20Data
-    };
-  }
-}
-
-export async function generateCompleteTransaction(
-  wallet: IWallet,
-  nodeLib: RPCNode,
-  gasPrice: Wei,
-  gasLimit: Wei,
-  chainId: number,
-  transactionInput: TransactionInput,
-  skipValidation: boolean,
-  nonce?: number | null,
-  offline?: boolean
-): Promise<CompleteTransaction> {
-  const { token } = transactionInput;
-  const { from, to, value, data } = await formatTxInput(
-    wallet,
-    transactionInput
-  );
-  const transaction: ExtendedRawTransaction = {
-    nonce: nonce ? `0x${nonce}` : await nodeLib.getTransactionCount(from),
-    from,
-    to,
-    gasLimit,
-    value,
-    data,
-    chainId,
-    gasPrice
-  };
-  return await generateCompleteTransactionFromRawTransaction(
-    nodeLib,
-    transaction,
-    wallet,
-    token,
-    skipValidation,
-    offline
-  );
-}
-
-// TODO determine best place for helper function
-export function getBalanceMinusGasCosts(
-  gasLimit: Wei,
-  gasPrice: Wei,
-  balance: Wei
-): Wei {
-  const weiGasCosts = gasPrice.mul(gasLimit);
-  const weiBalanceMinusGasCosts = balance.sub(weiGasCosts);
-  return Wei(weiBalanceMinusGasCosts);
-}
-
-export function decodeTransaction(transaction: EthTx, token: Token | false) {
-  const { to, value, data, gasPrice, nonce, from } = getTransactionFields(
-    transaction
-  );
-  let fixedValue: TokenValue;
-  let toAddress;
-
-  if (token) {
-    const tokenData = ERC20.$transfer(data);
-    fixedValue = tokenData.value;
-    toAddress = tokenData.to;
-  } else {
-    fixedValue = Wei(value);
-    toAddress = to;
-  }
-
-  return {
-    value: fixedValue,
-    gasPrice: Wei(gasPrice),
-    data,
-    toAddress,
-    nonce,
-    from
-  };
-}

From 34ca5a6d1d1d74ceb81e59957720f6579f4dad2a Mon Sep 17 00:00:00 2001
From: James Prado <james-prado@users.noreply.github.com>
Date: Mon, 27 Nov 2017 23:52:52 -0500
Subject: [PATCH 19/46] Show confirm transaction copy during hardware wallet
 signing (#454)

* Add msg for users to confirm tx on hw

* Update msg
---
 .../containers/Tabs/SendTransaction/index.tsx | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/containers/Tabs/SendTransaction/index.tsx b/common/containers/Tabs/SendTransaction/index.tsx
index 945ae57e..c12d82a5 100644
--- a/common/containers/Tabs/SendTransaction/index.tsx
+++ b/common/containers/Tabs/SendTransaction/index.tsx
@@ -32,7 +32,13 @@ import {
 import { UnitKey, Wei, getDecimal, toWei } from 'libs/units';
 import { isValidETHAddress } from 'libs/validators';
 // LIBS
-import { IWallet, Balance, Web3Wallet } from 'libs/wallet';
+import {
+  IWallet,
+  Balance,
+  Web3Wallet,
+  LedgerWallet,
+  TrezorWallet
+} from 'libs/wallet';
 import pickBy from 'lodash/pickBy';
 import React from 'react';
 // REDUX
@@ -265,6 +271,8 @@ export class SendTransaction extends React.Component<Props, State> {
         ? getDecimal('ether')
         : (this.state.token && this.state.token.decimal) || 0;
     const isWeb3Wallet = this.props.wallet instanceof Web3Wallet;
+    const isLedgerWallet = this.props.wallet instanceof LedgerWallet;
+    const isTrezorWallet = this.props.wallet instanceof TrezorWallet;
     return (
       <TabSection>
         <section className="Tab-content">
@@ -353,7 +361,18 @@ export class SendTransaction extends React.Component<Props, State> {
                     {generateTxProcessing && (
                       <div className="container">
                         <div className="row form-group text-center">
-                          <Spinner size="x5" />
+                          {isLedgerWallet || isTrezorWallet ? (
+                            <div>
+                              <p>
+                                <b>
+                                  Confirm transaction on hardware wallet
+                                </b>
+                              </p>
+                              <Spinner size="x2" />
+                            </div>
+                          ) : (
+                            <Spinner size="x2" />
+                          )}
                         </div>
                       </div>
                     )}

From 2d642f3dc76efda6bb8f91c254c70b316acd8745 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2017 23:00:11 -0600
Subject: [PATCH 20/46] chore(package): update check-node-version to version
 3.0.0 (#449)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b6f7d585..867d7f68 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "babel-minify-webpack-plugin": "0.2.0",
     "bs58": "4.0.1",
     "cache-loader": "1.2.0",
-    "check-node-version": "2.1.0",
+    "check-node-version": "3.0.0",
     "copy-webpack-plugin": "4.2.3",
     "css-loader": "0.28.7",
     "empty": "0.10.1",

From 8d91979e266c3fbaa0f2451d14f9e216eb4dd23c Mon Sep 17 00:00:00 2001
From: James Prado <james-prado@users.noreply.github.com>
Date: Tue, 28 Nov 2017 00:43:30 -0500
Subject: [PATCH 21/46] Refactor & Update Footer to Match V3 (#455)

---
 README.md                                   |  31 ++-
 common/assets/fonts/social-media.eot        | Bin 0 -> 3228 bytes
 common/assets/fonts/social-media.svg        |  36 +++
 common/assets/fonts/social-media.ttf        | Bin 0 -> 3044 bytes
 common/assets/fonts/social-media.woff       | Bin 0 -> 1980 bytes
 common/assets/fonts/social-media.woff2      | Bin 0 -> 1536 bytes
 common/assets/styles/etherwallet-fonts.less |   8 +-
 common/components/Footer/index.scss         |  76 ++++++-
 common/components/Footer/index.tsx          | 239 ++++++++++----------
 common/config/data.ts                       |   4 +
 common/sass/fonts.scss                      |   1 +
 common/sass/fonts/social-media.scss         |  54 +++++
 common/sass/styles.scss                     |   1 +
 13 files changed, 313 insertions(+), 137 deletions(-)
 create mode 100644 common/assets/fonts/social-media.eot
 create mode 100644 common/assets/fonts/social-media.svg
 create mode 100644 common/assets/fonts/social-media.ttf
 create mode 100644 common/assets/fonts/social-media.woff
 create mode 100644 common/assets/fonts/social-media.woff2
 create mode 100644 common/sass/fonts.scss
 create mode 100644 common/sass/fonts/social-media.scss

diff --git a/README.md b/README.md
index d0fe51a7..90841522 100644
--- a/README.md
+++ b/README.md
@@ -334,7 +334,36 @@ When working on a module that has styling in Less, try to do the following:
 * Convert as many `<br/>` tags or `&nbsp;`s to margins
 * Ensure that there has been little to no deviation from screenshot
 
-
+#### Adding Icon-fonts
+1. Download chosen icon-font
+1. Declare css font-family: 
+	``` 
+	@font-face {
+		font-family: 'social-media';
+		src: url('../assets/fonts/social-media.eot');
+		src: url('../assets/fonts/social-media.eot') format('embedded-opentype'),
+			url('../assets/fonts/social-media.woff2') format('woff2'),
+			url('../assets/fonts/social-media.woff') format('woff'),
+			url('../assets/fonts/social-media.ttf') format('truetype'),
+			url('../assets/fonts/social-media.svg') format('svg');
+		font-weight: normal;
+		font-style: normal;
+	}
+	```
+1. Create classes for each icon using their unicode character
+	```  
+	.sm-logo-facebook:before {
+	    content: '\ea02';
+	  }
+	```
+	* [How to get unicode icon values?](https://stackoverflow.com/questions/27247145/get-the-unicode-icon-value-from-a-custom-font)
+1. Write some markup:
+	```
+	<a href="/">
+		<i className={`sm-icon sm-logo-${text} sm-24px`} />
+		Hello World
+	</a>
+	```
 
 ## Thanks & Support
 
diff --git a/common/assets/fonts/social-media.eot b/common/assets/fonts/social-media.eot
new file mode 100644
index 0000000000000000000000000000000000000000..b17b3ff35519fd5501b0fe673fb6d8e4ab94f83f
GIT binary patch
literal 3228
zcmd^B&2JmW6@PDbcV?HnONtb^R4hxPNNI^!7G?3%AF&+Bt=)rx8j0<+LD8C$s1Jt{
zRf%@v_+s=_ATD5_mlkL*J=C{cdg-AkdMI)&+JjM`Iph$a1?%RPQ(>sT+1=Vo5%(YH
zkhAmN?|tmddv9jv=N{2#E)kO;-2_=iL;!irn!0v9=3hP|80;tSxKCc9|Dh)6kOs6)
zJJh8<Ez&OaXd~i?()1R%ExHRymkwYO&@CVbu-Spt9+haBYIFvY|K$f_Jqec{l0j##
zzI}7G^x^ym0M7!w@y)lF>g}7We*^yr{H^uf?*51Q&p*fNOkjWB>fhh|xcsC-WIQ9X
zO545ehWCpT;OSHJ_BH?^Sc3j7`rP*J@O>qY{sr65z?b@i^{(}ic@Oq~0iWCLzQ4~!
zOrCf`%lEpwy+0La|3Ks*y5h?I;Ba_FR=<x4-+=tbdhT%ynU0<xJ!d0fAxxSbAy9ha
zzVpfVGH-lAZfx;%<)1&%I(m$4VNGNw>5CoPv_@9sNhdXhAJI|7$MO^cyh7q@SFYWl
zbiX^?qZ5S4L`}cuIL-Z?tuFk>mJFGeG7u&mA+68!DL;<h_)GdV_zK122jtP}@tT6{
zOYQpR*Ei_Rkr+AA>Wc9iBcF+0>|Vd(=;#>zT=P)TtJLd1jgEQoT4MVhpj!PjMywvV
z85NbDJ@ApEtw$pAq1U8eAfRi)qa>w$M)`-}|GJ@m(e{%VpbAE)DBYtdB1$72eT^Z8
zy6eb|kQLo^Tt}!8-F2o$D(<>&M%tIIDvddD*S1ls({K1R-{aqlZ-~c0bSCk@Fh?|A
zDa$F&2N$?iX*F8ScB5V_L|8*r3XOXEA~(Z-Jas(JxmPMp2IFqtwU^wvvp|?U2a?+h
zldqlNijyiX+>QXa*YnkHc!uMrLvPZza6r*~Gc2pH+9~FPdb=6oEvg#If=aUr%d(IU
ziiP~NsIQ2Nyu#IbkeB7K*;dVVOcrHj`OI>;3anlX8ldYPEvjlQt-_R>uxIAI`Ai{`
zag}E*2su^=)AmG8$=vMgwby5JQY~0YIZFK~l}_Qm=1)!e!m>mv2vR~CQn@Y!KlF1l
zCr&vjAHHnqurQjOa%9f8ebXL08Mtn6a!gw34V6;(50rM6TJU`#O~Y{vOP1mnAPjn6
zAQsOFXMd-hX1&q?ftA&;dX8(n#9_O!Jk2u<ywmQ4)v(p<=*K0E6tUcPr`;$9st^?N
zN~%C-th2(cW{n?K&R3R0%M5%eFn`0g4Cxp``L@IMWIE?Fn}($vH$9hj9c39x`nmL^
zW17|F^7-eL3*}RneYT8(<yunN21vF{Lz{V);bms?X;VqZW`sbQrZNR*$Jh&IGoE2*
zDu%`W<x}Mgm1v34<L~-xn3rmWJ5tpcX)ff8HLgl5yIj?am*wg-H)N$;4I0Q{2eD`~
zjiqhR%#PW4w=l!AXY<N))6PWJ_6+MpZfedk=ND>orCiqkqY_reNg1{?9oVLrdd)jo
zRFcQ149qPba8XzAoWwqe&Z4;1GnA((Y8<clxVRPSzVM=kij`KgiZaEf(D({tKLmv@
zMwXP8etZ;G^G@0y_x+z$g*j;%)p;|QKH=iXjTN-kUmrYpgdjuf(Hj|wsAn!d$l7k!
zpVHgHeDS3*uwV0Z6IFptq0l=ukrvZpMP#@b$PAamB~}U5s;V+7qkV}%)L4(<3I{Wc
zN{PqzG{dIY(c{o9dlmHW`r)~6pH`Fe=iWW7&gUeX5=msMY@z5aWVQfKm@?~vK-Fe#
zVWm<=BzIFRvzB85b+Z!VomnsXEiS@i>^D5;OUMLjChKKo3T0zvrDfQzux6#1f{UC5
ze^%BT(=M!>)GvS#6G-V#DdD?;uMrw$zA8T%)(6xK7b>kw+)@=(P{efF)mC$fTa99;
z@iIU2X(9Z}X%6M0k!$1(7Gw3WeCBv|F8XZTHrO`|UtC{XTQ!Zqz~8)PigDwHzEh0R
z$9lt};fRZ#nij~Gm*57d@q{)(&m^>kThu~AOW^H<P61s_Xcv~dIGx#afK1TCgci8a
z{WPHs;J->}6ZG#A+QJp@X+lfj&k{OCx7bW*mqLE`aIn79?Jw^3Hg>vi^|tQzy9dXi
z<MgfG!Qsweue4k{a~!_f+v^>4hrNx`+Wpeuy{-CixLMjf80?m=4EBb-et%HfKN#HU
ztq*J4!{Pq<rKQaTudNSuUwLi)@|E>fm)lq2UwyrOmG)I!hWDZiahHY|H>iZW+<iO`
z=^if5b)ZAq1iy((^8i^X(Us`pthM|24S?)NvO7T5p<Scx$ZDU?(-MB0|D|7pmi82V
z$937fxJyRNv4_oq4K~?g$%<`u$nOuf28)~B_1@ZG@SYoS2fdAroncIG?F_f?u6YqY
i{K3v}*gJ?#`a65?A=7)QNOaimt|!(y|9ACdi2e=FV3BkH

literal 0
HcmV?d00001

diff --git a/common/assets/fonts/social-media.svg b/common/assets/fonts/social-media.svg
new file mode 100644
index 00000000..a903a42f
--- /dev/null
+++ b/common/assets/fonts/social-media.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <font id="social-media" horiz-adv-x="256">
+    <font-face font-family="social-media"
+      units-per-em="256" ascent="256"
+      descent="0" />
+    <missing-glyph horiz-adv-x="0" />
+    <glyph glyph-name="logo-facebook"
+      unicode="&#xEA02;"
+      horiz-adv-x="256" d="M234.6666666666667 256H21.3333333333333C9.5466666666667 256 0 246.4533333333333 0 234.6666666666667V21.3333333333333C0 9.5466666666667 9.5466666666667 0 21.3333333333333 0H138.6666666666667V96H106.6666666666667V138.6666666666667H138.6666666666667V166.2613333333334C138.6666666666667 199.328 158.8586666666667 217.3333333333334 188.3626666666667 217.3333333333334C202.496 217.3333333333334 214.6346666666667 216.2773333333333 218.176 215.808V181.248L197.7173333333333 181.2373333333334C181.6746666666667 181.2373333333334 178.5706666666667 173.6106666666667 178.5706666666667 162.432V138.6666666666667H225.9306666666667L215.264 96H178.5706666666667V0H234.6666666666667C246.4533333333333 0 256 9.5466666666667 256 21.3333333333333V234.6666666666667C256 246.4533333333333 246.4533333333333 256 234.6666666666667 256z" />
+    <glyph glyph-name="logo-reddit"
+      unicode="&#xEA03;"
+      horiz-adv-x="256" d="M256 130.1333333333333C256 147.2 242.1333333333334 161.0666666666667 225.0666666666667 161.0666666666667C217.6 161.0666666666667 211.2 158.9333333333333 205.8666666666667 154.6666666666667C186.6666666666667 166.4 163.2 173.8666666666667 137.6 174.9333333333333L150.4 216.5333333333333L186.6666666666667 208C187.7333333333334 195.2 198.4 184.5333333333333 212.2666666666667 184.5333333333333C226.1333333333334 184.5333333333333 237.8666666666667 196.2666666666667 237.8666666666667 210.1333333333333C237.8666666666667 224 226.1333333333334 235.7333333333333 212.2666666666667 235.7333333333333C202.6666666666667 235.7333333333333 194.1333333333334 230.4 189.8666666666667 221.8666666666667L147.2 231.4666666666667C144 232.5333333333333 139.7333333333334 230.4 138.6666666666667 227.2L122.6666666666667 174.9333333333333C96 173.8666666666667 69.3333333333333 167.4666666666667 50.1333333333333 154.6666666666667C44.8 158.9333333333333 38.4 161.0666666666667 30.9333333333333 161.0666666666667C13.8666666666667 161.0666666666667 0 147.2 0 130.1333333333333C0 119.4666666666667 5.3333333333333 109.8666666666667 12.8 104.5333333333333C12.8 102.4 12.8 99.2 12.8 97.0666666666667C12.8 75.7333333333333 25.6 56.5333333333333 48 41.6C69.3333333333333 27.7333333333333 98.1333333333333 20.2666666666667 128 20.2666666666667C157.8666666666667 20.2666666666667 186.6666666666667 27.7333333333333 208 41.6C230.4 56.5333333333333 243.2 75.7333333333333 243.2 97.0666666666667C243.2 99.2 243.2 101.3333333333333 243.2 103.4666666666667C250.6666666666667 109.8666666666667 256 119.4666666666667 256 130.1333333333333zM213.3333333333333 221.8666666666667C219.7333333333333 221.8666666666667 225.0666666666667 216.5333333333333 225.0666666666667 210.1333333333333C225.0666666666667 203.7333333333334 219.7333333333333 198.4 213.3333333333333 198.4S201.6 203.7333333333334 201.6 210.1333333333333C201.6 216.5333333333333 206.9333333333333 221.8666666666667 213.3333333333333 221.8666666666667zM72.5333333333333 110.9333333333333C72.5333333333333 120.5333333333333 81.0666666666667 128 89.6 128C99.2 128 106.6666666666667 119.4666666666667 106.6666666666667 110.9333333333333S99.2 93.8666666666667 89.6 93.8666666666667C81.0666666666667 93.8666666666667 72.5333333333333 101.3333333333333 72.5333333333333 110.9333333333333zM170.6666666666667 60.8C162.1333333333333 52.2666666666667 148.2666666666667 48 129.0666666666667 48C129.0666666666667 48 129.0666666666667 48 129.0666666666667 48C129.0666666666667 48 129.0666666666667 48 129.0666666666667 48C109.8666666666667 48 96 52.2666666666667 87.4666666666667 60.8C84.2666666666667 64 84.2666666666667 68.2666666666667 87.4666666666667 70.4C90.6666666666667 73.6 94.9333333333333 73.6 97.0666666666667 70.4C103.4666666666667 64 114.1333333333333 60.8 129.0666666666667 60.8C129.0666666666667 60.8 129.0666666666667 60.8 129.0666666666667 60.8C129.0666666666667 60.8 129.0666666666667 60.8 129.0666666666667 60.8C144 60.8 154.6666666666667 64 161.0666666666667 70.4C164.2666666666667 73.6 168.5333333333333 73.6 170.6666666666667 70.4C172.8 67.2 172.8 62.9333333333333 170.6666666666667 60.8zM166.4 93.8666666666667C156.8 93.8666666666667 148.2666666666667 101.3333333333333 148.2666666666667 110.9333333333333S156.8 128 166.4 128C176 128 183.4666666666667 119.4666666666667 183.4666666666667 110.9333333333333S176 93.8666666666667 166.4 93.8666666666667z" />
+    <glyph glyph-name="logo-github"
+      unicode="&#xEA04;"
+      horiz-adv-x="256" d="M128 252.8C57.6 252.8 0 195.2 0 124.8C0 68.2666666666667 36.2666666666667 20.2666666666667 87.4666666666667 3.2C93.8666666666667 2.1333333333333 96 6.4 96 9.6C96 12.8 96 20.2666666666667 96 30.9333333333333C60.8 23.4666666666667 53.3333333333333 48 53.3333333333333 48C48 62.9333333333333 39.4666666666667 67.2 39.4666666666667 67.2C26.6666666666667 74.6666666666667 39.4666666666667 74.6666666666667 39.4666666666667 74.6666666666667C52.2666666666667 73.6 58.6666666666667 61.8666666666667 58.6666666666667 61.8666666666667C70.4 42.6666666666667 88.5333333333333 48 96 51.2C97.0666666666667 59.7333333333334 100.2666666666667 65.0666666666667 104.5333333333333 68.2666666666667C75.7333333333333 71.4666666666667 45.8666666666667 82.1333333333334 45.8666666666667 131.2C45.8666666666667 145.0666666666667 51.2 156.8 58.6666666666667 165.3333333333334C58.6666666666667 169.6 53.3333333333333 182.4 60.8 199.4666666666667C60.8 199.4666666666667 71.4666666666667 202.6666666666667 96 186.6666666666667C106.6666666666667 189.8666666666667 117.3333333333333 190.9333333333333 128 190.9333333333333C138.6666666666667 190.9333333333333 149.3333333333334 189.8666666666667 160 186.6666666666667C184.5333333333333 203.7333333333334 195.2 199.4666666666667 195.2 199.4666666666667C202.6666666666667 181.3333333333334 197.3333333333333 168.5333333333333 196.2666666666667 165.3333333333334C204.8 156.8 209.0666666666667 145.0666666666667 209.0666666666667 131.2C209.0666666666667 82.1333333333334 179.2 71.4666666666667 150.4 68.2666666666667C154.6666666666667 64 158.9333333333333 56.5333333333334 158.9333333333333 44.8C158.9333333333333 27.7333333333334 158.9333333333333 13.8666666666667 158.9333333333333 9.6C158.9333333333333 6.4 161.0666666666667 2.1333333333334 167.4666666666667 3.2C218.6666666666667 20.2666666666667 254.9333333333334 68.2666666666667 254.9333333333334 124.8C256 195.2 198.4 252.8 128 252.8z" />
+    <glyph glyph-name="logo-twitter"
+      unicode="&#xEA05;"
+      horiz-adv-x="256" d="M256 206.9333333333333C246.4 202.6666666666667 236.8 199.4666666666667 226.1333333333334 198.4C236.8 204.8 245.3333333333333 215.4666666666667 249.6 227.2C238.9333333333334 220.8 228.2666666666667 216.5333333333333 216.5333333333333 214.4C206.9333333333333 225.0666666666667 193.0666666666667 231.4666666666667 178.1333333333333 231.4666666666667C149.3333333333333 231.4666666666667 125.8666666666667 208 125.8666666666667 179.2C125.8666666666667 174.9333333333333 125.8666666666667 170.6666666666667 126.9333333333333 167.4666666666667C82.1333333333333 169.6 43.7333333333333 190.9333333333333 18.1333333333333 222.9333333333333C12.8 214.4 10.6666666666667 205.8666666666667 10.6666666666667 196.2666666666667C10.6666666666667 178.1333333333333 20.2666666666667 162.1333333333333 34.1333333333333 152.5333333333334C25.6 152.5333333333334 17.0666666666667 154.6666666666667 10.6666666666667 158.9333333333333C10.6666666666667 158.9333333333333 10.6666666666667 158.9333333333333 10.6666666666667 157.8666666666667C10.6666666666667 132.2666666666667 28.8 110.9333333333333 52.2666666666667 106.6666666666667C48 105.6 43.7333333333333 104.5333333333334 38.4 104.5333333333334C35.2 104.5333333333334 32 104.5333333333334 28.8 105.6C35.2 84.2666666666667 54.4 69.3333333333334 77.8666666666667 69.3333333333334C59.7333333333333 55.4666666666667 37.3333333333333 46.9333333333334 12.8 46.9333333333334C8.5333333333333 46.9333333333334 4.2666666666667 46.9333333333334 0 48C23.4666666666667 33.0666666666667 51.2 24.5333333333334 80 24.5333333333334C177.0666666666667 24.5333333333334 229.3333333333333 104.5333333333334 229.3333333333333 173.8666666666667C229.3333333333333 176 229.3333333333333 178.1333333333333 229.3333333333333 180.2666666666667C240 187.7333333333334 248.5333333333334 197.3333333333334 256 206.9333333333333z" />
+    <glyph glyph-name="logo-linkedin"
+      unicode="&#xEA06;"
+      horiz-adv-x="256" d="M245.3333333333333 256H10.6666666666667C4.2666666666667 256 0 251.7333333333333 0 245.3333333333334V10.6666666666667C0 4.2666666666667 4.2666666666667 0 10.6666666666667 0H245.3333333333333C251.7333333333333 0 256 4.2666666666667 256 10.6666666666667V245.3333333333334C256 251.7333333333333 251.7333333333334 256 245.3333333333333 256zM75.7333333333333 37.3333333333333H38.4V160H76.8V37.3333333333333zM56.5333333333333 177.0666666666667C44.8 177.0666666666667 34.1333333333333 186.6666666666667 34.1333333333333 199.4666666666667C34.1333333333333 211.2 43.7333333333333 221.8666666666667 56.5333333333333 221.8666666666667C68.2666666666667 221.8666666666667 78.9333333333333 212.2666666666667 78.9333333333333 199.4666666666667C78.9333333333333 186.6666666666667 69.3333333333333 177.0666666666667 56.5333333333333 177.0666666666667zM218.6666666666667 37.3333333333333H180.2666666666667V97.0666666666667C180.2666666666667 110.9333333333333 180.2666666666667 129.0666666666667 161.0666666666667 129.0666666666667C140.8 129.0666666666667 138.6666666666667 114.1333333333333 138.6666666666667 98.1333333333333V37.3333333333333H100.2666666666667V160H136.5333333333333V142.9333333333333H136.5333333333333C141.8666666666667 152.5333333333333 153.6 162.1333333333333 172.8 162.1333333333333C211.2 162.1333333333333 218.6666666666667 136.5333333333334 218.6666666666667 103.4666666666667V37.3333333333333z" />
+    <glyph glyph-name="logo-slack"
+      unicode="&#xEA07;"
+      horiz-adv-x="256" d="M116.2231466666667 106.05504L105.0436266666667 139.43168L139.43168 150.9499733333333L150.6112 117.5733333333334L116.2231466666667 106.05504zM116.2231466666667 106.05504L105.0436266666667 139.43168L139.43168 150.9499733333333L150.6112 117.5733333333334L116.2231466666667 106.05504zM245.3333333333333 163.2C218.6666666666667 250.6666666666667 180.2666666666667 272 92.8 245.3333333333334C5.3333333333333 218.6666666666667 -16 180.2666666666667 10.6666666666667 92.8C37.3333333333333 5.3333333333334 74.6666666666667 -16 163.2 10.6666666666667C250.6666666666667 37.3333333333333 272 75.7333333333334 245.3333333333333 163.2zM200.5333333333333 105.6L183.4666666666667 100.2666666666667L188.8 83.2C190.9333333333333 75.7333333333334 187.7333333333334 68.2666666666667 180.2666666666667 66.1333333333334C179.2 66.1333333333334 177.0666666666667 65.0666666666667 176 65.0666666666667C170.6666666666667 65.0666666666667 165.3333333333334 68.2666666666667 164.2666666666667 73.6L158.9333333333333 90.6666666666667L124.8 78.9333333333333L130.1333333333333 61.8666666666667C132.2666666666667 54.4 129.0666666666667 46.9333333333333 121.6 44.8C120.5333333333333 44.8 118.4 43.7333333333334 117.3333333333333 43.7333333333334C112 43.7333333333334 106.6666666666667 46.9333333333333 105.6 52.2666666666667L100.2666666666667 69.3333333333333L83.2 64C82.1333333333333 64 80 62.9333333333333 78.9333333333333 62.9333333333333C73.6 62.9333333333333 68.2666666666667 66.1333333333333 67.2 71.4666666666667C64 82.1333333333333 67.2 89.6 74.6666666666667 91.7333333333334L91.7333333333333 97.0666666666667L81.0666666666667 130.1333333333334L64 124.8C62.9333333333333 124.8 60.8 123.7333333333334 59.7333333333333 123.7333333333334C54.4 123.7333333333334 49.0666666666667 126.9333333333333 48 132.2666666666667C45.8666666666667 139.7333333333334 49.0666666666667 147.2 56.5333333333333 149.3333333333334L73.6 154.6666666666667L66.1333333333333 172.8C64 179.2 67.2 186.6666666666667 74.6666666666667 189.8666666666667C81.0666666666667 192 88.5333333333333 187.7333333333334 91.7333333333333 181.3333333333334L97.0666666666667 164.2666666666667L131.2 176L125.8666666666667 192C123.7333333333333 199.4666666666667 126.9333333333333 206.9333333333333 134.4 209.0666666666667C141.8666666666667 211.2 149.3333333333334 208 151.4666666666667 200.5333333333333L156.8 183.4666666666667L173.8666666666667 188.8C180.2666666666667 192 187.7333333333334 187.7333333333334 189.8666666666667 181.3333333333334C192 173.8666666666667 188.8 166.4 181.3333333333333 164.2666666666667L164.2666666666667 158.9333333333333L174.9333333333333 125.8666666666667L192 131.2C199.4666666666667 133.3333333333334 206.9333333333333 130.1333333333333 209.0666666666666 122.6666666666667C211.2 116.2666666666667 208 108.8 200.5333333333333 105.6z" />
+    <glyph glyph-name="logo-medium"
+      unicode="&#xEA08;"
+      horiz-adv-x="256" d="M245.3333333333333 256H10.6666666666667A10.666666666666666 10.666666666666666 0 0 1 0 245.3333333333334V10.6666666666667A10.666666666666666 10.666666666666666 0 0 1 10.6666666666667 0H245.3333333333333A10.666666666666666 10.666666666666666 0 0 1 256 10.6666666666667V245.3333333333334A10.666666666666666 10.666666666666666 0 0 1 245.3333333333333 256zM212.672 195.3493333333333L198.944 182.1866666666667A4.010666666666666 4.010666666666666 0 0 1 197.4186666666667 178.336V81.6106666666667A4.010666666666666 4.010666666666666 0 0 1 198.944 77.76L212.352 64.5973333333334V61.7066666666667H144.9173333333333V64.5973333333334L158.784 78.08C160.1493333333333 79.4453333333333 160.1493333333333 79.8506666666667 160.1493333333333 81.9306666666667V160.1066666666667L121.5253333333333 61.9733333333334H116.3093333333333L71.3706666666667 160.1066666666667V94.368A9.066666666666666 9.066666666666666 0 0 1 73.856 86.8266666666667L91.9253333333333 64.9173333333333V62.0266666666666H40.7253333333333V64.9173333333333L58.7626666666667 86.8266666666667A8.746666666666666 8.746666666666666 0 0 1 61.088 94.368V170.3786666666667A6.666666666666666 6.666666666666666 0 0 1 58.9546666666667 176L42.8693333333333 195.3493333333333V198.24H92.7253333333333L131.264 113.7173333333333L165.1413333333333 198.24H212.672z" />
+    <glyph glyph-name="logo-github-2"
+      unicode="&#xEA09;"
+      horiz-adv-x="256" d="M128 252.8C57.6 252.8 0 195.2 0 124.8C0 68.2666666666667 36.2666666666667 20.2666666666667 87.4666666666667 3.2C93.8666666666667 2.1333333333333 96 6.4 96 9.6C96 12.8 96 20.2666666666667 96 30.9333333333333C60.8 23.4666666666667 53.3333333333333 48 53.3333333333333 48C48 62.9333333333333 39.4666666666667 67.2 39.4666666666667 67.2C26.6666666666667 74.6666666666667 39.4666666666667 74.6666666666667 39.4666666666667 74.6666666666667C52.2666666666667 73.6 58.6666666666667 61.8666666666667 58.6666666666667 61.8666666666667C70.4 42.6666666666667 88.5333333333333 48 96 51.2C97.0666666666667 59.7333333333334 100.2666666666667 65.0666666666667 104.5333333333333 68.2666666666667C75.7333333333333 71.4666666666667 45.8666666666667 82.1333333333334 45.8666666666667 131.2C45.8666666666667 145.0666666666667 51.2 156.8 58.6666666666667 165.3333333333334C58.6666666666667 169.6 53.3333333333333 182.4 60.8 199.4666666666667C60.8 199.4666666666667 71.4666666666667 202.6666666666667 96 186.6666666666667C106.6666666666667 189.8666666666667 117.3333333333333 190.9333333333333 128 190.9333333333333C138.6666666666667 190.9333333333333 149.3333333333334 189.8666666666667 160 186.6666666666667C184.5333333333333 203.7333333333334 195.2 199.4666666666667 195.2 199.4666666666667C202.6666666666667 181.3333333333334 197.3333333333333 168.5333333333333 196.2666666666667 165.3333333333334C204.8 156.8 209.0666666666667 145.0666666666667 209.0666666666667 131.2C209.0666666666667 82.1333333333334 179.2 71.4666666666667 150.4 68.2666666666667C154.6666666666667 64 158.9333333333333 56.5333333333334 158.9333333333333 44.8C158.9333333333333 27.7333333333334 158.9333333333333 13.8666666666667 158.9333333333333 9.6C158.9333333333333 6.4 161.0666666666667 2.1333333333334 167.4666666666667 3.2C218.6666666666667 20.2666666666667 254.9333333333334 68.2666666666667 254.9333333333334 124.8C256 195.2 198.4 252.8 128 252.8z" />
+  </font>
+</defs>
+</svg>
diff --git a/common/assets/fonts/social-media.ttf b/common/assets/fonts/social-media.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ea56ac6c1c6cfa03c7a49857a9a2a6836239e994
GIT binary patch
literal 3044
zcmd^B&2JmW6@PDLXJ)@CQsh#REQuneUBr?oiJ!I{%YmHAJp`zc*hU)^ttp9;=uo68
z(P|uDjGhX_1p@Ta9(w7ax#f~e4@HnekZaK%i~zahP@o0t=9W_-sBe~wR4DAfptGEr
zH^28WGw;2bAs_%a@B}!l-g^7)X5oW{_W|$<p?7}p_DZF3ck}NweoEteJBO{K53=8U
z1HcTz{<`0NwD(2vqY?mr4j>8#?bfdQyGa_u*Hjw^1Tcn@=s!`NKR6t`r`Y+wN%wCw
zE_C}lE%C8&O8Q^YICI!~?+EkIBmRWu_gaVTzvSmW2e4e4bL*&oGT4&Q&uGDSi2o~~
zwd>{U_WbPp40$q)vA8i~goHkFn)5$Rz4k3QBaLSp|N6C-(EUi4v;j<DvEInA3ELpz
zu|{qB0M0M)ZCHg3U~g=_c?bM%YtVy9AkV}_PjivRZfCzm_D7bHc$$lZAZQP1d4#X=
z!+6Hu!zVN@!Ki;9T-YQJfY57vLAky6y<K>H$c9$DyZmU6vCTw!WL{5ketv;I(_<3R
zyVSOqsM5M{JJJ0yp;~;2dfGkV2JKnP7#bg1T6@T18+uQA0!Fe1S(Ko(%{czV_`fcc
zzf_JAA5azyDWi0ay+~dfYVT`|e5kAT+>oN8tM==Vazs}hsi7KGoi{^mOJ|kFtWnjv
zajC!`aS2cHGxmM<At5@F)KE7MFkULkY0L)KuwJTH>$OI;lF!9hRh4qpO5-}#!hb%q
zT-Q1+6sCf4C+nCi&ioZZ5L}Bm_ZO#LnZ%N1=NIqC0GZe8)iXSYGBn|J_#w0a7HVNp
zg;6t~4JwUVNVBLYlsV<23X3wA4f46{46AIg>$rhYCCJKRSZk<SV?^d<X>E0_7!g*<
z2UVggP0fn5lomnAOqjC^?m{Y;N;%5qi%gE?Lf@RoD4CgiwfyQ_Myf@jl%>=!ZQrKf
zwl_WPF(H^81U8dgD#szlFT9M*u*;V1ku6hN$aoEHOJ+RNGt99|f#U?1#-#9fm96O4
zSK64p=y^;U+_Jckh0z4$27NBb7iVxApjq@$?=&FC$|#JkVi{L3Y*g1~a25$~Hkx4+
z)@x1O+|Wp#w%cens`)_Wf?QTf73hdHH?UqS<CD^QX)P2+;7La7=ceG&;!Js_h31r>
z@emCzl;!yIzGErDmGm<Hlw}yvT5<iXbgg*#riX&(gd?OfIguy~uGL(@-PByxH<YwY
zBo`>dPzJ;F7`nk+%H?LN#07dcFBh+s;w{F_KlI(OAk_vor79zZIhW0sF_N_HVx%`O
zi_r{LWvLhiRf=Jge9=G{^G(-CkC|B~H;Z#uvdVRQYa(sBTuf%B=PhGlu{>YMq`f~Y
zCQ_EoO=~7F4L1FXdnvCZj!$!1TQ<PF&fs}T=ODg|M!BAXEKEc7V#be>TT$NUzRRI}
zsa}gHP3cf*d;{q`1i5dALQ0{VkHaWy`QEta{WfC8l;F{Vk?|)Tx^hPXTI#FEkDrp0
zN$TlqDM?;WU4NW5owPTtkA?BwOT+2BX5lVn1sw`SwOM99n_(L)h510Huo$kON~n6I
zij*0R8%RVMbsuhEFpHEaqrNeNq?2#ze&7_{64jr0;ng24si}pl?<}eHj6_3H5K$Bb
zCB2}?=4iwWnRbYvtWBFt*fx*(j*T)cEQ3%dEvbJn=f>aiGFcqi4X=8Vc#Lu;?WUzo
zX=9|N;HJaGoHT4Qkr8B1q}?%XLS&?#fS9xZTR){h?*_d_R3P=D_@q!@P_vjT)o);3
zl_-PaL9-FnYb#i<=9|_3#%IB2%)9AhD3^Jrn&HUCDq(T;Vsx&1$nSIXIQQ7??d?s2
z2b_M!n+6-_cl3XXG5A6sSSobI#jU0pMaxZaPSkip8${10w4i@ciwP|WZzQx$=w?DY
zq<KiUGa42l6YwOV8Tjy<gyw|*A)yVTKTT)>0X$1+N%-@Gw&5Nc3GG0L@0|2^I<4;V
zVSBgJdaJ$vu-iJm2wkM_wU19a{a#_Mym}G7)$X;ATZ8s)Vf#_x<aEC>80;1Hj{Ap&
zt$uIN?sofyqvQUA_RgSuFc=)IudM7PczLIP2q(~o9q7=#--Tt`ZyR>w(OX3A!$U$_
zaQsrKmucT4ZLQTI>pdvI8oe*8FST-uq<gVO3kKBhlEyYXqV@z%X%!Vh2e3!uJ+j)T
zRTf|?wydSQ^z{ijig^zR*&*pN9K>2junsHq?fs8@nWVI(_#M}2qu=uv784nAG*F;K
zg(h0yb^H7M<-OKUd%NF%*NI2R?cLqZU_|eC1_uwf-54MIyfYZIk4GxqPVZfcbkB}i
QC*9UgqOIfqP%j4HKXvze*#H0l

literal 0
HcmV?d00001

diff --git a/common/assets/fonts/social-media.woff b/common/assets/fonts/social-media.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d4d0e518360e7fb682727a1ce5a6278d98966036
GIT binary patch
literal 1980
zcmY+Ec|6qX7stOd))CSr49VECUX5fc{4xnqLoXyte8)1zGR#cWaJgnIgSeULrnuQE
zOGrkjgc5S?YnQBzgb3NQ&;7dH-yiq9UZ2-<&igs%InVR_ac<aJSO72pGJzW4!2WvR
z^N)Dn|F2ovJ7NF;CJ52fkQ`7+D&e;F$4@}a{9kri-w`wIMZ}RHMuS)owDu-REG+m2
zhT$Q95de5H0DuqGq*$Ot@WFXQelnD&14&;vQ$~pZL5S5su`DEII2^`LAcjyOHUh<m
zA)y4|-0i?%ul>ALDE?_*d{23=6LD0iFaQ4i<oEMnQb14;j_3n1HK?~P0KhGJq!b!S
z!Pi2d_qstjAf(?c_*Kc&3@^|d1Ua5)knIIh$SVjOr|rB}ix<-q#L)nz@rnC7s=6jD
zI!_Z%YZ=W?6orpTfCI-)^H~A^)KcpV>GV`O9e1b!k17<-E0(58XGlw@Nnc4vvZHAy
z2PF98oi3CbBF)^$776GyIPiuoSPIq7vsy%GXklK}#@MrW>SLm*mtdg<h{d5h^gQPl
zCCwBOH2kkYxfsf&?u;OtjaHd4!%t10x0j8xVtQ{R9ogyMdDoO{U^9{Z^YY$v=S-Cz
z&x_1*^Nuy0OQp3cTZN`7%^e7e4JHy+Ly@`xK>djJwUp21Vp&-pzvZ$nKRdY`R$J}v
z=Tx+kHL&ill1Z$2U9bL@&+@RCUDG*p42EU+AVF|}kBV@QOOBPwq21~Baj7P`)e%mP
z_KnV_FMJb+Me{5w=wjAyy4^yRIdw~19DOnzo|@<CT5_|(y>fu9&D}V+{d#Zx3xV*x
zrtuoKcF?8*Sken$kZkZ3up=0_ju1uC+~+z`QMXlQnl+aZo6*e8SM83@q0XL8^RF81
z9UNO7_;Om^@)J9Hy)QV)hKtBPzO2s*s|xz-)o5Y5R%ch|iV(55z5j9Pt1-v5OOb+1
z>c{l<-LN#qgMx_XITYqydbzwN(l+~ewyjs8Bu2gD{lOs4ry7GttOppo0hfE$$5N*s
zO#C9=mUc8?0Mxeh&j}QHdbf-$e1ku}e`Rj`%uSBXq(+8Ev1xiWnql2pfyW%37p>Db
zHX;79WaTd2I|*A&bqRd(q;(d4mn7ulnw^4!6TS^SebR~_U2D4-+`=At9`Loj=zV_T
z?bh{#P+3C1&BoK0TAem;OIQ-$x{kcf#XBG^V|0Z*dFs;bh7REA1*xF*ABNKYoy99V
z%VjTHQ-VbV?+V#kO`;vlNc~Y$2d3itlsVS^0&KpU*WRg{^DNGvTum33yg;im=`6iT
zOdOsxpfIl3RMN3UDiS6YgFk5``b;}|)U+4tynoiL>8iw#TYt!RLhwkoC6DS-FXDp7
zvDWYKT6rT=ae*a5{$@m3hTJ>Wrt_sk{`ZW+1Ld%mT{{gI&VP{Asd4pG_=+_CU8c0*
zBiTe5fn;q(HhpU@VSb-EE$VZw{3$bEx_8)s#*Mki-MVU}zBO6!%sK>IPu?th7@>AW
zZ<<Wv_@Sz4zizILkN>QXd^Gl}nDtyZbyv*D-P>X}bfa&gPYDgi9*TRhCGAZAUtIkQ
z*IwGK83u#tjKsKSMQ>RKXrwCX4#}SJLDXs)fU4cQn!`Gv_w&?`)G80oc9r^Z)5r&m
zm835B$8A^O_XHIa+)y)oiuXU=q9DT_qXLxTg$8_F-%Lj*$4(K}6cd+=3*SUyvFHiy
z;4qx>mKx>QveJwqk*dsh%~&J<c6FMfWSXt{UXHDT=b$_d+tc=1eib3WIg`96kS(?~
z&)fU3if(bZIcGjUpco%1bTKn@Eo!5k$GU?E<Qe10a=JM&j_KL8DV>$D>wngv@n61f
zZyz)&7gpsa^qH(rb$mQ$mSFSm3<5q)j!bDR?dW?TUz)*%g$L%wu#6rqcaPiF+}<qw
znSw^s&0)Gy2j-#S^`iz*<QLoIe&fDLZnx8hLqpI-j~DUJ9teW56I?FqLzGzrpyS97
zmHe<1z)P4G>^iItZUtxl{~VA5T6uy#0PGlQ3Xb7ta6wZZKwK5ZfX)g{sl_&+CE{#{
zDiS0Wl$9G9s*>+leZeoy-3xN3*j0sn`PQG*$eN)OI#l@47?veRohpcJm($1{y1h2q
zHSInK1TDq^9YUnZE_@~F?QF_$uIo5+2Q^|QZ(DzL%Xj?fd=e=;(@2$fT&2TgEY|g9
zQ#I-S-dRKCD4`pq_~3Ev-4xQnHk8By)S-l!F&oIdA6g`ZFYgKoEy9NR6`iV#ld*hc
zZ(<NvSfLwGd8%lOoo;yVaqhFKKL+d5waSa0%yl+u51n$t#y6NpNDLp*)AG#iZboyW
zMEYO5F!ew5`8)X9Pw(7*ACgydJO^zN+cUVD;jkepGF?(HWSONW8u2c+Ujdhi_8Kfi
zul#;Lq>1Qf9rfZ-;*3&Yq*J0gW2EIxM5Bc2E*yE;j|~0U)ui*HG?W;x@5n&GhMHI-
zLM>5rX<Mc{DRgEQD|5msVzc0_@HH)VqfkH~JFX{eqTpP+OL*}12hkD<GUaRyzmfTL
eQra3z`_}d1!}C`I3&dBp$FlSS0fSW|RL9?cMsGd<

literal 0
HcmV?d00001

diff --git a/common/assets/fonts/social-media.woff2 b/common/assets/fonts/social-media.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f2acafc8912888bfecb7463cdafbe37a5684d8b0
GIT binary patch
literal 1536
zcmV+b2LJhYPew8T0RR9100sa63jhEB01M;*00poB0RR9100000000000000000000
z0000SR0dW6gHj5LAcz(LHUcCAAPW)z1Rw>3MhAfn8~zDVlrB=A?B{^n9({up^nye=
znQvrInHfAeVb;9ycKOf0Q$1H?NiSi6V<)Ttu;VhgD=^v{%Nq+yI3)N(_)5}EowZLq
z{}h;uW2YyYa93;@NI6?6@bGzif7`mIfd}4sAYow;%`Jh5lI6d(&(N{t&jQP%Pshls
zkE&H$(!fe&UR9!{GWIFJ&X$bxE+BxaK_6~^`T8AQb>K9*CD11mME$8-4Wkn-M5q`@
zWJD_1?|ZsY1)TMQ67Sddx)3$uh#C5>Q=ex!x*O@|MgU+sj^R=O*j64;vz!Rsg{k@W
z16bo>wJ3F<p?YNj!OzM?{LDG_#V!XB4o@I*|9AmB&;%W)fU~((hMzf04+KB+2w5Tk
z0Yn4>hy(<X01!ZAAb=={f}db-02zQRpbz@#VoMtl(Ia~`Zmm~ZP&pPiVl#x2I&gCe
zR!p@WAnr0oDltmj#gaO*W-M0)OZv2}7fak}Yj?I4w8q_}pYY0-)!IA<h36mEJp1;J
zN7fO)<B3O-k3Dr4k?+q=x^c($68=on5e}W@sFWbv@KOogWl}I{=A%#p8$UE=zx_Po
zpR~GDbv|!+29akEHawq^>*~6>tZVw_t;VgCFbxmT%s{=Lm+?)X=|?oUh+B^30&&-T
z>@!Nd_-@S6eBV5;dAF*ITSkBM%_=8;M7NDa`b!;GdE^duyZVJEShD-B`um9dU2tr-
z-%OPlW-krST6%ZGvo!}OTGqdfC39TF^4s%Ttn<fCKKts&PoMtenO8o0?%YT#$8|K#
z_KZ+Vkf4wiZ+O00p6}aePsr}&yLwK$0Z%!sjY3u)IqD*U5iP!)u0ti$q?zh$mQk6g
z_Kg{>7$P<+#(uuI@|0qoap&T~>cVi&9Y*%)5{>Ov&H6j7#T_ME;bI~+Gq~f2fhWeQ
zzv{mm&&2|dmEN8)jsNHF{Cr0+GgV$cL(T|`cAYJTGo+ats+Nf>)s+g_a@EGbku=<J
zN!8nV0P^0>ltzeIhYbM6;Vj9L76tA|yQA_rI5gPaTvc4v5S<@s;q{qs&eXZTJ62q{
zJ<4P1<t16`pWl2L+kW<|{37igUXqmd!pM?KZ~e&n=+?`Yh=q$6(OX7Q{#R$ON-yDC
z8rC;NtBON6<Knyjf56XnD1UD@rvGNhJnipTm;30gX;)D8er`)jVdR#qS1hGrbah?Z
zzYAH?>-g6YXNlAn_k3BluY6y2Qu#XTo$R-%B@ZXdd(!o;@Yu5S-lA<wGuuOHq0`sq
zVcVM1;rpw}Z5GtLJ@3jnp+{DS=1jQq67Pz~^{HaVv<6{09|=eFagm6yOqe=KSk9SU
z(}dH^@t0MOn<{S6#@*~#k?<6K>^Vo6CJtQQIj$lgOe4pb(I-y)I)h)#XS~gi;J>D+
zrAwrmB~hVR=bL%Gn4c(Q{+*jjXB5q7K<DdR!mp5YC>i*X&Isq<<6`hxyR|62=f9Z|
z0N~SpyM^*!95VRC_X8k<>yMJ}sBr%=TsoEOI4$c$!y+`4wDY}XEJX#raRI1C6}SjJ
zmw{Kupeb$p0vrNJi69@)Y%m0lf&w67s(~a$8&Fk??$2b~U>_9)Bq&Y*PMX7j7j!E_
z;5-XNhEIVc=vSbc9l};jSzLvLg)oUI-PyiT4*_y|1o@qR%*9fw7Ih7IS9`^T85m{N
z?W(fYOJ-H6OtE^QM4T%Gs`^Y01y2ogznayrWKKO56h{RSED%g=fMlZUH>3^n%s_51
zE-Lj8J3!0LT~cXOr=cO^6{p52zy%hlmfEQrYuXYDrdC@iBT;4aptgoE7?5PVxwzpV
zL8YcvcWCrh>Wzt3Hcd?}8^rNceeg!5Z!ZT&JP9O{L;;dXL24&W69oc0B7dIfl~GE|
mtgg0fhVG&_Z!9zB`h{SVzpPL?L!|@|9c@=w9O7sM0002wQ`uku

literal 0
HcmV?d00001

diff --git a/common/assets/styles/etherwallet-fonts.less b/common/assets/styles/etherwallet-fonts.less
index 43481768..dae83ee5 100755
--- a/common/assets/styles/etherwallet-fonts.less
+++ b/common/assets/styles/etherwallet-fonts.less
@@ -1,7 +1,7 @@
 @font-face {
   font-family: 'Lato';
   src: url('../fonts/Lato-Light.woff') format('woff'),
-  url('../fonts/Lato-Light.ttf') format('truetype');
+    url('../fonts/Lato-Light.ttf') format('truetype');
   font-style: normal;
   font-weight: 300;
 }
@@ -9,7 +9,7 @@
 @font-face {
   font-family: 'Lato';
   src: url('../fonts/Lato-Regular.woff') format('woff'),
-  url('../fonts/Lato-Regular.ttf') format('truetype');
+    url('../fonts/Lato-Regular.ttf') format('truetype');
   font-style: normal;
   font-weight: 400;
 }
@@ -17,8 +17,8 @@
 @font-face {
   font-family: 'Lato';
   src: url('../fonts/Lato-Bold.woff') format('woff'),
-  url('../fonts/Lato-Bold.ttf') format('truetype');
+    url('../fonts/Lato-Bold.ttf') format('truetype');
 
   font-style: normal;
   font-weight: 700;
-}
+}
\ No newline at end of file
diff --git a/common/components/Footer/index.scss b/common/components/Footer/index.scss
index 0f8bd4a7..866f031e 100644
--- a/common/components/Footer/index.scss
+++ b/common/components/Footer/index.scss
@@ -8,7 +8,7 @@
   padding-bottom: $space-sm;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
+  justify-content: space-around;
   text-align: center;
   align-items: center;
 
@@ -18,26 +18,74 @@
     align-items: flex-start;
   }
 
+  & > div {
+    padding: 8px 16px;
+  }
+
+  &-social-media-wrap {
+    margin-top: 32px;
+    & .Footer-social-media-link {
+      transition: opacity 0.3s;
+      color: white;
+      margin: 1rem;
+      margin-left: 0;
+      &:hover {
+        opacity: 0.8;
+        color: white;
+      }
+      &:focus {
+        opacity: 0.8;
+        color: white;
+      }
+    }
+  }
+
+  &-affiliate-wrap {
+    & .Footer-affiliate-tag {
+      background-color: #0e97c0;
+      display: inline-block;
+      padding: 4px 12px;
+      border-radius: 30px;
+      margin: 0rem 0.5rem 0.5rem 0px;
+      transition: color 0.3s, background-color 0.3s;
+      &:hover {
+        background-color: white;
+        color: #0e97c0;
+      }
+      & a {
+        transition: color 0s;
+        color: inherit;
+        &:hover {
+          color: inherit;
+        }
+      }
+    }
+  }
+
   &-column {
     padding: 1rem 2rem;
   }
 
   &-about {
-    max-width: 22rem;
-
     &-logo {
       width: 100%;
       height: auto;
       max-width: 20rem;
     }
+    &-text {
+      max-width: 50ch;
+    }
   }
 
+  &-about,
+  &-links,
   &-info {
-    max-width: 34rem;
-  }
-
-  &-links {
-    max-width: 28rem;
+    & > a {
+      display: block;
+      font-size: 0.9rem;
+      margin-top: 0.5rem;
+      margin-bottom: 0.5rem;
+    }
   }
 
   &-modal-button {
@@ -58,10 +106,14 @@
     margin: $space-xs 0 $space-sm;
   }
 
-  a {
-    color: #4ac8ed;
+  a,
+  .Footer-modal-button {
+    color: #7fe5ff;
+    font-weight: 400;
+    transition: color 0.3s;
     &:hover,
     &:focus {
+      opacity: 1;
       color: darken(#4ac8ed, 5%);
     }
   }
@@ -81,7 +133,7 @@
 
   ul {
     list-style: none;
-    padding-left: $space-sm;
+    padding-left: 0;
     margin: 0 0 $space-xs 0;
   }
 
@@ -101,4 +153,4 @@
 
 .Modal {
   color: #000;
-}
\ No newline at end of file
+}
diff --git a/common/components/Footer/index.tsx b/common/components/Footer/index.tsx
index e8eb76c4..9ebd4c97 100644
--- a/common/components/Footer/index.tsx
+++ b/common/components/Footer/index.tsx
@@ -1,100 +1,105 @@
 import logo from 'assets/images/logo-myetherwallet.svg';
-import { bityReferralURL, donationAddressMap } from 'config/data';
+import {
+  bityReferralURL,
+  ledgerReferralURL,
+  trezorReferralURL,
+  bitboxReferralURL,
+  donationAddressMap
+} from 'config/data';
 import React from 'react';
 import translate from 'translations';
 import './index.scss';
 import PreFooter from './PreFooter';
 import Modal, { IButton } from 'components/ui/Modal';
+import { NewTabLink } from 'components/ui';
 
-const LINKS_LEFT = [
+const AffiliateTag = ({ link, text }) => {
+  return (
+    <li className="Footer-affiliate-tag" key={link}>
+      <NewTabLink href={link}>{text}</NewTabLink>
+    </li>
+  );
+};
+
+const SocialMediaLink = ({ link, text }) => {
+  return (
+    <NewTabLink className="Footer-social-media-link" key={link} href={link}>
+      <i className={`sm-icon sm-logo-${text} sm-24px`} />
+    </NewTabLink>
+  );
+};
+
+const SOCIAL_MEDIA: Link[] = [
   {
-    text: 'Knowledge Base',
-    href: 'https://myetherwallet.groovehq.com/help_center'
+    link: 'https://myetherwallet.herokuapp.com/',
+    text: 'slack'
   },
+
   {
-    text: 'Helpers & ENS Debugging',
-    href: 'https://www.myetherwallet.com/helpers.html'
+    link: 'https://www.reddit.com/r/MyEtherWallet/',
+    text: 'reddit'
   },
+
   {
-    text: 'Sign Message',
-    href: 'https://www.myetherwallet.com/signmsg.html'
+    link: 'https://twitter.com/myetherwallet',
+    text: 'twitter'
+  },
+
+  {
+    link: 'https://www.facebook.com/MyEtherWallet',
+    text: 'facebook'
+  },
+
+  {
+    link: 'https://medium.com/@myetherwallet',
+    text: 'medium'
+  },
+
+  {
+    link: 'https://www.linkedin.com/company/myetherwallet/',
+    text: 'linkedin'
+  },
+
+  {
+    link: 'https://github.com/MyEtherWallet',
+    text: 'github'
   }
 ];
 
-const LINKS_SUPPORT = [
+const PRODUCT_INFO: Link[] = [
   {
-    href: bityReferralURL,
-    text: 'Swap ETH/BTC/EUR/CHF via Bity.com'
-  },
-  {
-    href: 'https://www.ledgerwallet.com/r/fa4b?path=/products/',
-    text: 'Buy a Ledger Nano S'
-  },
-  {
-    href: 'https://trezor.io/?a=myetherwallet.com',
-    text: 'Buy a TREZOR'
-  },
-  {
-    href: 'https://digitalbitbox.com/?ref=mew',
-    text: 'Buy a Digital Bitbox'
-  }
-];
-
-const LINKS_RIGHT = [
-  {
-    href: 'https://www.MyEtherWallet.com',
-    text: 'MyEtherWallet.com'
-  },
-  {
-    href: 'https://github.com/MyEtherWallet/MyEtherWallet',
+    link: 'https://github.com/MyEtherWallet/MyEtherWallet',
     text: 'Github: Current Site'
   },
   {
-    href: 'https://github.com/MyEtherWallet',
+    link: 'https://github.com/MyEtherWallet',
     text: 'Github: MEW Org'
   },
   {
-    href: 'https://github.com/MyEtherWallet/MyEtherWallet/releases/latest',
+    link: 'https://github.com/MyEtherWallet/MyEtherWallet/releases/latest',
     text: 'Github: Latest Release'
   },
+
   {
-    href:
+    link:
       'https://chrome.google.com/webstore/detail/myetherwallet-cx/nlbmnnijcnlegkjjpcfjclmcfggfefdm?hl=en',
-    text: 'MyEtherWallet CX'
+    text: 'MyEtherWallet Extension'
   },
   {
-    href:
+    link:
       'https://chrome.google.com/webstore/detail/etheraddresslookup/pdknmigbbbhmllnmgdfalmedcmcefdfn',
-    text: 'Anti-Phishing CX'
+    text: 'Anti - Phishing Extension'
   }
 ];
 
-const LINKS_SOCIAL = [
-  {
-    href: 'https://myetherwallet.herokuapp.com/',
-    text: 'Slack'
-  },
-  {
-    href: 'https://www.reddit.com/r/MyEtherWallet/',
-    text: 'Reddit'
-  },
-  {
-    href: 'https://twitter.com/myetherwallet',
-    text: 'Twitter'
-  },
-  {
-    href: 'https://www.facebook.com/MyEtherWallet/',
-    text: 'Facebook'
-  },
-  {
-    href: 'https://medium.com/@myetherwallet',
-    text: 'Medium'
-  }
-];
+interface Link {
+  link: string;
+  text: string;
+}
 
 interface Props {
   latestBlock: string;
-};
+}
 
 interface State {
   isOpen: boolean;
@@ -122,9 +127,9 @@ export default class Footer extends React.Component<Props, State> {
       <div>
         <PreFooter />
         <footer className="Footer" role="contentinfo" aria-label="footer">
-          <div className="Footer-column Footer-about">
+          <div className="Footer-about">
             <p aria-hidden="true">
-              <a href="/">
+              <NewTabLink href="/">
                 <img
                   className="Footer-about-logo"
                   src={logo}
@@ -132,22 +137,15 @@ export default class Footer extends React.Component<Props, State> {
                   width="auto"
                   alt="MyEtherWallet"
                 />
-              </a>
+              </NewTabLink>
             </p>
-            <p className="Footer-about-text">
-              <span>{translate('FOOTER_1')}</span>
-              <span>{translate('FOOTER_1b')}</span>
-            </p>
-
-            {LINKS_LEFT.map(link => {
-              return (
-                <p key={link.href}>
-                  <a href={link.href} target="_blank" rel="noopener">
-                    {link.text}
-                  </a>
-                </p>
-              );
-            })}
+            <p className="Footer-about-text">{translate('FOOTER_1')}</p>
+            <NewTabLink href="https://myetherwallet.github.io/knowledge-base">
+              Knowledge Base
+            </NewTabLink>
+            <NewTabLink href="https://www.myetherwallet.com/helpers.html">
+              Helpers & ENS Debugging
+            </NewTabLink>
 
             <button className="Footer-modal-button" onClick={this.openModal}>
               Disclaimer
@@ -160,11 +158,11 @@ export default class Footer extends React.Component<Props, State> {
             >
               <p>
                 <b>Be safe & secure: </b>
-                <a href="https://myetherwallet.groovehq.com/knowledge_base/topics/protecting-yourself-and-your-funds">
+                <NewTabLink href="https://myetherwallet.groovehq.com/knowledge_base/topics/protecting-yourself-and-your-funds">
                   We highly recommend that you read our guide on How to Prevent
                   Loss & Theft for some recommendations on how to be proactive
                   about your security.
-                </a>
+                </NewTabLink>
               </p>
               <p>
                 <b>Always backup your keys: </b>
@@ -220,36 +218,44 @@ export default class Footer extends React.Component<Props, State> {
                 OTHER DEALINGS IN THE SOFTWARE.
               </b>
             </Modal>
-
+            <p>Latest Block#: {this.props.latestBlock}</p>
             <p>&copy; 2017 MyEtherWallet, LLC</p>
           </div>
 
-          <div className="Footer-column Footer-info">
+          <div className="Footer-info">
             <h5>
               <i aria-hidden="true">👫</i>
               You can support us by supporting our blockchain-family.
             </h5>
-            <p>Consider using our affiliate links to...</p>
-            <ul>
-              {LINKS_SUPPORT.map(link => {
-                return (
-                  <li key={link.href}>
-                    <a href={link.href} target="_blank">
-                      {link.text}
-                    </a>
-                  </li>
-                );
-              })}
+            <p>Consider using our affiliate links to</p>
+            <ul className="Footer-affiliate-wrap">
+              <AffiliateTag
+                link={bityReferralURL}
+                text="Swap ETH/BTC/EUR/CHF via Bity.com"
+              />
+            </ul>
+            <p>Buy a</p>
+            <ul className="Footer-affiliate-wrap">
+              <AffiliateTag link={ledgerReferralURL} text="Ledger Nano S" />
+              <AffiliateTag link={trezorReferralURL} text="TREZOR" />
+              <AffiliateTag link={bitboxReferralURL} text="Digital Bitbox" />
             </ul>
-
             <h5>
               <i aria-hidden="true">💝</i>
               {translate('FOOTER_2')}
             </h5>
             <ul>
               <li>
-                {' '}
-                ETH: <span className="mono wrap">{donationAddressMap.ETH}</span>
+                ETH: mewtopia.eth{' '}
+                <span className="mono wrap">
+                  <NewTabLink
+                    href={`https://etherscan.io/address/${
+                      donationAddressMap.ETH
+                    }`}
+                  >
+                    {donationAddressMap.ETH}
+                  </NewTabLink>
+                </span>
               </li>
               <li>
                 {' '}
@@ -258,29 +264,22 @@ export default class Footer extends React.Component<Props, State> {
             </ul>
           </div>
 
-          <div className="Footer-column Footer-links">
-            {LINKS_RIGHT.map(link => {
-              return (
-                <p key={link.href}>
-                  <a href={link.href} target="_blank">
-                    {link.text}
-                  </a>
-                </p>
-              );
-            })}
-            <p>
-              {LINKS_SOCIAL.map((link, i) => {
-                return (
-                  <span key={link.href}>
-                    <a key={link.href} href={link.href} target="_blank">
-                      {link.text}
-                    </a>
-                    {i !== LINKS_SOCIAL.length - 1 && ' · '}
-                  </span>
-                );
-              })}
-            </p>
-            <p>Latest Block#: {this.props.latestBlock}</p>
+          <div className="Footer-links">
+            {PRODUCT_INFO.map((productInfoItem, idx) => (
+              <NewTabLink target="_blank" key={idx} href={productInfoItem.link}>
+                {productInfoItem.text}
+              </NewTabLink>
+            ))}
+
+            <div className="Footer-social-media-wrap">
+              {SOCIAL_MEDIA.map((socialMediaItem, idx) => (
+                <SocialMediaLink
+                  link={socialMediaItem.link}
+                  key={idx}
+                  text={socialMediaItem.text}
+                />
+              ))}
+            </div>
           </div>
         </footer>
       </div>
diff --git a/common/config/data.ts b/common/config/data.ts
index 0cb20c92..be69ac04 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -40,6 +40,10 @@ export const gasPriceDefaults = {
 };
 
 export const bityReferralURL = 'https://bity.com/af/jshkb37v';
+export const ledgerReferralURL =
+  'https://www.ledgerwallet.com/r/fa4b?path=/products/';
+export const trezorReferralURL = 'https://trezor.io/?a=myetherwallet.com';
+export const bitboxReferralURL = 'https://digitalbitbox.com/?ref=mew';
 
 export interface BlockExplorerConfig {
   name: string;
diff --git a/common/sass/fonts.scss b/common/sass/fonts.scss
new file mode 100644
index 00000000..c99d6156
--- /dev/null
+++ b/common/sass/fonts.scss
@@ -0,0 +1 @@
+@import './fonts/social-media'
\ No newline at end of file
diff --git a/common/sass/fonts/social-media.scss b/common/sass/fonts/social-media.scss
new file mode 100644
index 00000000..4b2dd126
--- /dev/null
+++ b/common/sass/fonts/social-media.scss
@@ -0,0 +1,54 @@
+@font-face {
+  font-family: 'social-media';
+  src: url('../assets/fonts/social-media.eot');
+  src: url('../assets/fonts/social-media.eot') format('embedded-opentype'),
+    url('../assets/fonts/social-media.woff2') format('woff2'),
+    url('../assets/fonts/social-media.woff') format('woff'),
+    url('../assets/fonts/social-media.ttf') format('truetype'),
+    url('../assets/fonts/social-media.svg') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.sm-icon {
+  display: inline-block;
+  font: normal normal normal 32px/1 'social-media';
+  text-transform: none;
+  /* Better Font Rendering */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  &.sm-16px {
+    font-size: 16px;
+  }
+  &.sm-24px {
+    font-size: 24px;
+  }
+  &.sm-32px {
+    font-size: 32px;
+  }
+  &.sm-48px {
+    font-size: 48px;
+  }
+  // Refer to docs for updating icon-fonts
+  &.sm-logo-facebook:before {
+    content: '\ea02';
+  }
+  &.sm-logo-reddit:before {
+    content: '\ea03';
+  }
+  &.sm-logo-github:before {
+    content: '\ea04';
+  }
+  &.sm-logo-twitter:before {
+    content: '\ea05';
+  }
+  &.sm-logo-linkedin:before {
+    content: '\ea06';
+  }
+  &.sm-logo-slack:before {
+    content: '\ea07';
+  }
+  &.sm-logo-medium:before {
+    content: '\ea08';
+  }
+}
diff --git a/common/sass/styles.scss b/common/sass/styles.scss
index 68bbfff0..ab6955db 100644
--- a/common/sass/styles.scss
+++ b/common/sass/styles.scss
@@ -27,3 +27,4 @@
 @import "./styles/overrides";
 @import "./styles/scaffolding";
 @import "./styles/tab";
+@import "./fonts";

From a16964f9f91d34d25dedaa897bfeb1cbe8159cba Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 07:29:28 -0600
Subject: [PATCH 22/46] chore(package): update redux-test-utils to version
 0.2.2 (#475)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 867d7f68..ca894a2b 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "react-hot-loader": "3.1.3",
     "react-test-renderer": "16.1.1",
     "redux-devtools-extension": "2.13.2",
-    "redux-test-utils": "0.2.1",
+    "redux-test-utils": "0.2.2",
     "resolve-url-loader": "2.2.0",
     "rimraf": "2.6.2",
     "sass-loader": "6.0.6",

From 1eb687c6705373dfb73524ebbd7972261eba1dfa Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 12:15:27 -0600
Subject: [PATCH 23/46] chore(package): update @types/lodash to version 4.14.86
 (#477)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ca894a2b..de1884dc 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@types/classnames": "2.2.3",
     "@types/history": "4.6.1",
     "@types/jest": "21.1.8",
-    "@types/lodash": "4.14.85",
+    "@types/lodash": "4.14.86",
     "@types/qrcode": "0.8.0",
     "@types/qrcode.react": "0.6.2",
     "@types/react": "16.0.25",

From 1221a73a46009ed86f8e28963b9189113a796713 Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Tue, 28 Nov 2017 19:17:26 -0500
Subject: [PATCH 24/46] Better Offline Detection / Handling (#478)

* Change navigator.onLine to actually pinging the network. Refactor notifications to take Infinity instead of 'infinity'

* Stop polling when forced offline.

* Show spinners if unit display balance is null, show offline text if were actually offline.

* Fix issue with typescript and connected union-prop components.

* Only ping the node when navigator.onLine changes.
---
 .../actions/notifications/actionCreators.ts   |  2 +-
 common/actions/notifications/actionTypes.ts   |  3 +-
 common/components/ui/UnitDisplay.tsx          | 78 +++++++++++++------
 common/libs/nodes/INode.ts                    |  1 +
 common/libs/nodes/rpc/index.ts                |  7 ++
 common/libs/nodes/rpc/requests.ts             |  8 +-
 common/libs/nodes/web3/index.ts               |  4 +
 common/sagas/config.ts                        | 73 +++++++++++++++--
 common/sagas/notifications.ts                 |  7 +-
 common/sagas/swap/orders.ts                   |  6 +-
 common/selectors/config.ts                    |  8 ++
 11 files changed, 158 insertions(+), 39 deletions(-)

diff --git a/common/actions/notifications/actionCreators.ts b/common/actions/notifications/actionCreators.ts
index 75c0a735..bfda0fa3 100644
--- a/common/actions/notifications/actionCreators.ts
+++ b/common/actions/notifications/actionCreators.ts
@@ -6,7 +6,7 @@ export type TShowNotification = typeof showNotification;
 export function showNotification(
   level: types.NOTIFICATION_LEVEL = 'info',
   msg: ReactElement<any> | string,
-  duration?: number | types.INFINITY
+  duration?: number
 ): types.ShowNotificationAction {
   return {
     type: TypeKeys.SHOW_NOTIFICATION,
diff --git a/common/actions/notifications/actionTypes.ts b/common/actions/notifications/actionTypes.ts
index 16de73a2..f6b70117 100644
--- a/common/actions/notifications/actionTypes.ts
+++ b/common/actions/notifications/actionTypes.ts
@@ -2,13 +2,12 @@ import { ReactElement } from 'react';
 import { TypeKeys } from './constants';
 /*** Shared types ***/
 export type NOTIFICATION_LEVEL = 'danger' | 'warning' | 'success' | 'info';
-export type INFINITY = 'infinity';
 
 export interface Notification {
   level: NOTIFICATION_LEVEL;
   msg: ReactElement<any> | string;
   id: number;
-  duration?: number | INFINITY;
+  duration?: number;
 }
 
 /*** Close notification ***/
diff --git a/common/components/ui/UnitDisplay.tsx b/common/components/ui/UnitDisplay.tsx
index 1bce8bb0..8ef88a50 100644
--- a/common/components/ui/UnitDisplay.tsx
+++ b/common/components/ui/UnitDisplay.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import {
   fromTokenBase,
   getDecimal,
@@ -7,6 +8,9 @@ import {
   TokenValue
 } from 'libs/units';
 import { formatNumber as format } from 'utils/formatters';
+import Spinner from 'components/ui/Spinner';
+import { getOffline } from 'selectors/config';
+import { AppState } from 'reducers';
 
 interface Props {
   /**
@@ -41,33 +45,63 @@ const isEthereumUnit = (param: EthProps | TokenProps): param is EthProps =>
 
 const UnitDisplay: React.SFC<EthProps | TokenProps> = params => {
   const { value, symbol, displayShortBalance } = params;
+  let element;
 
   if (!value) {
-    return <span>Balance isn't available offline</span>;
-  }
-
-  const convertedValue = isEthereumUnit(params)
-    ? fromTokenBase(value, getDecimal(params.unit))
-    : fromTokenBase(value, params.decimal);
-
-  let formattedValue;
-
-  if (displayShortBalance) {
-    const digits =
-      typeof displayShortBalance === 'number' && displayShortBalance;
-    formattedValue = digits
-      ? format(convertedValue, digits)
-      : format(convertedValue);
+    element = <Spinner size="x1" />;
   } else {
-    formattedValue = convertedValue;
+    const convertedValue = isEthereumUnit(params)
+      ? fromTokenBase(value, getDecimal(params.unit))
+      : fromTokenBase(value, params.decimal);
+
+    let formattedValue;
+
+    if (displayShortBalance) {
+      const digits =
+        typeof displayShortBalance === 'number' && displayShortBalance;
+      formattedValue = digits
+        ? format(convertedValue, digits)
+        : format(convertedValue);
+    } else {
+      formattedValue = convertedValue;
+    }
+
+    element = (
+      <span>
+        {formattedValue}
+        {symbol ? ` ${symbol}` : ''}
+      </span>
+    );
   }
 
-  return (
-    <span>
-      {formattedValue}
-      {symbol ? ` ${symbol}` : ''}
-    </span>
-  );
+  return <ConnectedOfflineDisplay>{element}</ConnectedOfflineDisplay>;
 };
 
 export default UnitDisplay;
+
+/**
+ * @description Helper component for displaying alternate text when offline.
+ * Circumvents typescript issue with union props on connected components.
+ */
+interface OfflineProps {
+  offline: AppState['config']['offline'];
+  children: React.ReactElement<string>;
+}
+
+class OfflineDisplay extends React.Component<OfflineProps> {
+  public render() {
+    if (this.props.offline) {
+      return <span>Balance isn't available offline</span>;
+    } else {
+      return this.props.children;
+    }
+  }
+}
+
+function mapStateToOfflineProps(state: AppState) {
+  return {
+    offline: getOffline(state)
+  };
+}
+
+const ConnectedOfflineDisplay = connect(mapStateToOfflineProps)(OfflineDisplay);
diff --git a/common/libs/nodes/INode.ts b/common/libs/nodes/INode.ts
index 669728ea..653c2c9a 100644
--- a/common/libs/nodes/INode.ts
+++ b/common/libs/nodes/INode.ts
@@ -7,6 +7,7 @@ export interface TxObj {
   data: string;
 }
 export interface INode {
+  ping(): Promise<boolean>;
   getBalance(address: string): Promise<Wei>;
   getTokenBalance(address: string, token: Token): Promise<TokenValue>;
   getTokenBalances(address: string, tokens: Token[]): Promise<TokenValue[]>;
diff --git a/common/libs/nodes/rpc/index.ts b/common/libs/nodes/rpc/index.ts
index 26229d56..af5acd82 100644
--- a/common/libs/nodes/rpc/index.ts
+++ b/common/libs/nodes/rpc/index.ts
@@ -23,6 +23,13 @@ export default class RpcNode implements INode {
     this.requests = new RPCRequests();
   }
 
+  public ping(): Promise<boolean> {
+    return this.client
+      .call(this.requests.getNetVersion())
+      .then(() => true)
+      .catch(() => false);
+  }
+
   public sendCallRequest(txObj: TxObj): Promise<string> {
     return this.client.call(this.requests.ethCall(txObj)).then(r => {
       if (r.error) {
diff --git a/common/libs/nodes/rpc/requests.ts b/common/libs/nodes/rpc/requests.ts
index 848459c7..ba11c1fc 100644
--- a/common/libs/nodes/rpc/requests.ts
+++ b/common/libs/nodes/rpc/requests.ts
@@ -7,11 +7,15 @@ import {
   GetTokenBalanceRequest,
   GetTransactionCountRequest,
   SendRawTxRequest,
-  GetCurrentBlockRequest,
+  GetCurrentBlockRequest
 } from './types';
 import { hexEncodeData } from './utils';
 import { TxObj } from '../INode';
 export default class RPCRequests {
+  public getNetVersion() {
+    return { method: 'net_version' };
+  }
+
   public sendRawTx(signedTx: string): SendRawTxRequest | any {
     return {
       method: 'eth_sendRawTransaction',
@@ -67,7 +71,7 @@ export default class RPCRequests {
 
   public getCurrentBlock(): GetCurrentBlockRequest | any {
     return {
-      method: 'eth_blockNumber',
+      method: 'eth_blockNumber'
     };
   }
 }
diff --git a/common/libs/nodes/web3/index.ts b/common/libs/nodes/web3/index.ts
index 925c507c..47a4de75 100644
--- a/common/libs/nodes/web3/index.ts
+++ b/common/libs/nodes/web3/index.ts
@@ -11,6 +11,10 @@ export default class Web3Node implements INode {
     this.web3 = web3;
   }
 
+  public ping(): Promise<boolean> {
+    return Promise.resolve(true);
+  }
+
   public sendCallRequest(txObj: TxObj): Promise<string> {
     return new Promise((resolve, reject) => {
       this.web3.eth.call(txObj, 'pending', (err, res) => {
diff --git a/common/sagas/config.ts b/common/sagas/config.ts
index 9693b80b..b97031a4 100644
--- a/common/sagas/config.ts
+++ b/common/sagas/config.ts
@@ -16,7 +16,13 @@ import {
   getCustomNodeConfigFromId,
   makeNodeConfigFromCustomConfig
 } from 'utils/node';
-import { getNode, getNodeConfig, getCustomNodeConfigs } from 'selectors/config';
+import {
+  getNode,
+  getNodeConfig,
+  getCustomNodeConfigs,
+  getOffline,
+  getForceOffline
+} from 'selectors/config';
 import { AppState } from 'reducers';
 import { TypeKeys } from 'actions/config/constants';
 import {
@@ -38,15 +44,58 @@ import {
 
 export const getConfig = (state: AppState): ConfigState => state.config;
 
+let hasCheckedOnline = false;
 export function* pollOfflineStatus(): SagaIterator {
   while (true) {
-    const offline = !navigator.onLine;
-    const config = yield select(getConfig);
-    const offlineState = config.offline;
-    if (offline !== offlineState) {
-      yield put(toggleOfflineConfig());
+    const node = yield select(getNodeConfig);
+    const isOffline = yield select(getOffline);
+    const isForcedOffline = yield select(getForceOffline);
+
+    // If they're forcing themselves offline, exit the loop. It will be
+    // kicked off again if they toggle it in handleTogglePollOfflineStatus.
+    if (isForcedOffline) {
+      return;
+    }
+
+    // If our offline state disagrees with the browser, run a check
+    // Don't check if the user is in another tab or window
+    const shouldPing = !hasCheckedOnline || navigator.onLine === isOffline;
+    if (shouldPing && !document.hidden) {
+      hasCheckedOnline = true;
+      const { pingSucceeded } = yield race({
+        pingSucceeded: call(node.lib.ping.bind(node.lib)),
+        timeout: call(delay, 5000)
+      });
+
+      if (pingSucceeded && isOffline) {
+        // If we were able to ping but redux says we're offline, mark online
+        yield put(
+          showNotification(
+            'success',
+            'Your connection to the network has been restored!',
+            3000
+          )
+        );
+        yield put(toggleOfflineConfig());
+      } else if (!pingSucceeded && !isOffline) {
+        // If we were unable to ping but redux says we're online, mark offline
+        yield put(
+          showNotification(
+            'danger',
+            `You’ve lost your connection to the network, check your internet
+            connection or try changing networks from the dropdown at the
+            top right of the page.`,
+            Infinity
+          )
+        );
+        yield put(toggleOfflineConfig());
+      } else {
+        // If neither case was true, try again in 5s
+        yield call(delay, 5000);
+      }
+    } else {
+      yield call(delay, 1000);
     }
-    yield call(delay, 250);
   }
 }
 
@@ -57,6 +106,15 @@ function* handlePollOfflineStatus(): SagaIterator {
   yield cancel(pollOfflineStatusTask);
 }
 
+function* handleTogglePollOfflineStatus(): SagaIterator {
+  const isForcedOffline = yield select(getForceOffline);
+  if (isForcedOffline) {
+    yield fork(handlePollOfflineStatus);
+  } else {
+    yield call(handlePollOfflineStatus);
+  }
+}
+
 // @HACK For now we reload the app when doing a language swap to force non-connected
 // data to reload. Also the use of timeout to avoid using additional actions for now.
 function* reload(): SagaIterator {
@@ -164,6 +222,7 @@ export default function* configSaga(): SagaIterator {
     TypeKeys.CONFIG_POLL_OFFLINE_STATUS,
     handlePollOfflineStatus
   );
+  yield takeEvery(TypeKeys.CONFIG_FORCE_OFFLINE, handleTogglePollOfflineStatus);
   yield takeEvery(TypeKeys.CONFIG_NODE_CHANGE_INTENT, handleNodeChangeIntent);
   yield takeEvery(TypeKeys.CONFIG_LANGUAGE_CHANGE, reload);
   yield takeEvery(TypeKeys.CONFIG_ADD_CUSTOM_NODE, switchToNewNode);
diff --git a/common/sagas/notifications.ts b/common/sagas/notifications.ts
index d90bcd7b..c21521da 100644
--- a/common/sagas/notifications.ts
+++ b/common/sagas/notifications.ts
@@ -1,11 +1,14 @@
-import { closeNotification, ShowNotificationAction } from 'actions/notifications';
+import {
+  closeNotification,
+  ShowNotificationAction
+} from 'actions/notifications';
 import { delay, SagaIterator } from 'redux-saga';
 import { call, put, takeEvery } from 'redux-saga/effects';
 
 function* handleNotification(action: ShowNotificationAction): SagaIterator {
   const { duration } = action.payload;
   // show forever
-  if (duration === 0 || duration === 'infinity') {
+  if (duration === 0 || duration === Infinity) {
     return;
   }
 
diff --git a/common/sagas/swap/orders.ts b/common/sagas/swap/orders.ts
index 334d6c0b..c78754c1 100644
--- a/common/sagas/swap/orders.ts
+++ b/common/sagas/swap/orders.ts
@@ -146,7 +146,7 @@ export function* bityTimeRemaining(): SagaIterator {
             if (!hasShownNotification) {
               hasShownNotification = true;
               yield put(
-                showNotification('danger', BITY_TIMEOUT_MESSAGE, 'infinity')
+                showNotification('danger', BITY_TIMEOUT_MESSAGE, Infinity)
               );
             }
             break;
@@ -156,7 +156,7 @@ export function* bityTimeRemaining(): SagaIterator {
             if (!hasShownNotification) {
               hasShownNotification = true;
               yield put(
-                showNotification('danger', BITY_TIMEOUT_MESSAGE, 'infinity')
+                showNotification('danger', BITY_TIMEOUT_MESSAGE, Infinity)
               );
             }
             break;
@@ -164,7 +164,7 @@ export function* bityTimeRemaining(): SagaIterator {
             if (!hasShownNotification) {
               hasShownNotification = true;
               yield put(
-                showNotification('warning', BITY_TIMEOUT_MESSAGE, 'infinity')
+                showNotification('warning', BITY_TIMEOUT_MESSAGE, Infinity)
               );
             }
             break;
diff --git a/common/selectors/config.ts b/common/selectors/config.ts
index 1c4e8fab..55ee44ff 100644
--- a/common/selectors/config.ts
+++ b/common/selectors/config.ts
@@ -39,3 +39,11 @@ export function getLanguageSelection(state: AppState): string {
 export function getCustomNodeConfigs(state: AppState): CustomNodeConfig[] {
   return state.config.customNodes;
 }
+
+export function getOffline(state: AppState): boolean {
+  return state.config.offline;
+}
+
+export function getForceOffline(state: AppState): boolean {
+  return state.config.forceOffline;
+}

From 2451f817d4992064021155973f11c5da785c4719 Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Tue, 28 Nov 2017 19:28:30 -0500
Subject: [PATCH 25/46] Display less than for low balances (#485)

* Display less than for short balances.

* show 4 decimals places for short value
---
 common/components/ui/UnitDisplay.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/components/ui/UnitDisplay.tsx b/common/components/ui/UnitDisplay.tsx
index 8ef88a50..5bfc5218 100644
--- a/common/components/ui/UnitDisplay.tsx
+++ b/common/components/ui/UnitDisplay.tsx
@@ -58,10 +58,16 @@ const UnitDisplay: React.SFC<EthProps | TokenProps> = params => {
 
     if (displayShortBalance) {
       const digits =
-        typeof displayShortBalance === 'number' && displayShortBalance;
-      formattedValue = digits
-        ? format(convertedValue, digits)
-        : format(convertedValue);
+        typeof displayShortBalance === 'number' ? displayShortBalance : 4;
+      formattedValue = format(convertedValue, digits);
+      // If the formatted value was too low, display something like < 0.01
+      if (
+        parseFloat(formattedValue) === 0 &&
+        parseFloat(convertedValue) !== 0
+      ) {
+        const padding = digits !== 0 ? `.${'0'.repeat(digits - 1)}1` : '';
+        formattedValue = `< 0${padding}`;
+      }
     } else {
       formattedValue = convertedValue;
     }

From 6da5fac1d1ab511819dd0482b712fd0e2f8cc9a9 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 18:47:29 -0600
Subject: [PATCH 26/46] =?UTF-8?q?Update=20@types/history=20to=20the=20late?=
 =?UTF-8?q?st=20version=20=F0=9F=9A=80=20(#389)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(package): update @types/history to version 4.6.2

* Rework type to newly added history overrides.
---
 .../SendTransaction/components/NavigationPrompt.tsx  | 12 ++++--------
 package.json                                         |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/containers/Tabs/SendTransaction/components/NavigationPrompt.tsx b/common/containers/Tabs/SendTransaction/components/NavigationPrompt.tsx
index 9a965ee0..a3fdc446 100644
--- a/common/containers/Tabs/SendTransaction/components/NavigationPrompt.tsx
+++ b/common/containers/Tabs/SendTransaction/components/NavigationPrompt.tsx
@@ -1,13 +1,7 @@
 import React from 'react';
 import { withRouter } from 'react-router-dom';
 import Modal, { IButton } from 'components/ui/Modal';
-import { Location, History as H } from 'history';
-
-type UnregisterCallback = () => void;
-type BooleanCallback = (arg?: any) => boolean;
-interface History extends H {
-  block(prompt?: boolean | BooleanCallback): UnregisterCallback;
-}
+import { Location, History } from 'history';
 
 interface Props {
   when: boolean;
@@ -50,7 +44,9 @@ class NavigationPrompt extends React.Component<Props, State> {
           nextLocation
         });
       }
-      return !this.props.when;
+      if (this.props.when) {
+        return false;
+      }
     });
   }
 
diff --git a/package.json b/package.json
index de1884dc..54da109d 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@types/classnames": "2.2.3",
-    "@types/history": "4.6.1",
+    "@types/history": "4.6.2",
     "@types/jest": "21.1.8",
     "@types/lodash": "4.14.86",
     "@types/qrcode": "0.8.0",

From 01f020ff597f74ca3f274242657e7eda1751012e Mon Sep 17 00:00:00 2001
From: Eddie Wang <eddie@eddiewang.me>
Date: Tue, 28 Nov 2017 19:56:16 -0500
Subject: [PATCH 27/46] Strip hex prefix from raw private key displayed during
 wallet generation (#388)

---
 common/components/PrintableWallet/index.tsx                    | 3 ++-
 .../containers/Tabs/GenerateWallet/components/PaperWallet.tsx  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/components/PrintableWallet/index.tsx b/common/components/PrintableWallet/index.tsx
index bbabe064..c6d38252 100644
--- a/common/components/PrintableWallet/index.tsx
+++ b/common/components/PrintableWallet/index.tsx
@@ -3,6 +3,7 @@ import { IFullWallet } from 'ethereumjs-wallet';
 import React from 'react';
 import translate from 'translations';
 import printElement from 'utils/printElement';
+import { stripHexPrefix } from 'libs/values';
 
 const print = (address: string, privateKey: string) => () =>
   address &&
@@ -27,7 +28,7 @@ const print = (address: string, privateKey: string) => () =>
 
 const PrintableWallet: React.SFC<{ wallet: IFullWallet }> = ({ wallet }) => {
   const address = wallet.getAddressString();
-  const privateKey = wallet.getPrivateKeyString();
+  const privateKey = stripHexPrefix(wallet.getPrivateKeyString());
 
   if (!address || !privateKey) {
     return null;
diff --git a/common/containers/Tabs/GenerateWallet/components/PaperWallet.tsx b/common/containers/Tabs/GenerateWallet/components/PaperWallet.tsx
index 4f1afd24..708860ed 100644
--- a/common/containers/Tabs/GenerateWallet/components/PaperWallet.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/PaperWallet.tsx
@@ -4,6 +4,7 @@ import { NewTabLink } from 'components/ui';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import translate from 'translations';
+import { stripHexPrefix } from 'libs/values';
 import './PaperWallet.scss';
 import Template from './Template';
 
@@ -13,7 +14,7 @@ const content = (wallet: IFullWallet) => (
     <h1 className="GenPaper-title">{translate('GEN_Label_5')}</h1>
     <input
       className="GenPaper-private form-control"
-      value={wallet.getPrivateKeyString()}
+      value={stripHexPrefix(wallet.getPrivateKeyString())}
       aria-label={translate('x_PrivKey')}
       aria-describedby="x_PrivKeyDesc"
       type="text"

From 080f2e0adb6f0192a01d01448974fcc097cbfcd2 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 21:39:43 -0600
Subject: [PATCH 28/46] chore(package): update react-test-renderer to version
 16.2.0 (#487)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54da109d..553fce42 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "prettier": "1.8.2",
     "progress": "2.0.0",
     "react-hot-loader": "3.1.3",
-    "react-test-renderer": "16.1.1",
+    "react-test-renderer": "16.2.0",
     "redux-devtools-extension": "2.13.2",
     "redux-test-utils": "0.2.2",
     "resolve-url-loader": "2.2.0",

From 03583ee4f8b42900f74b133d7ad8b8437b0a9227 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 21:43:31 -0600
Subject: [PATCH 29/46] fix(package): update react-dom to version 16.2.0 (#488)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 553fce42..08120207 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "qrcode.react": "0.7.2",
     "query-string": "5.0.1",
     "react": "16.1.1",
-    "react-dom": "16.1.1",
+    "react-dom": "16.2.0",
     "react-markdown": "2.5.1",
     "react-redux": "5.0.6",
     "react-router-dom": "4.2.2",

From a3f35f565f7eee62dc5e0a4952f6b9c92f51625b Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Tue, 28 Nov 2017 21:48:08 -0600
Subject: [PATCH 30/46] fix(package): update react to version 16.2.0 (#489)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 08120207..9146a6c0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "qrcode": "1.0.0",
     "qrcode.react": "0.7.2",
     "query-string": "5.0.1",
-    "react": "16.1.1",
+    "react": "16.2.0",
     "react-dom": "16.2.0",
     "react-markdown": "2.5.1",
     "react-redux": "5.0.6",

From 51db31b9fa3a56cde2a29dec9acb8e248dcb2d2f Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2017 12:42:54 -0600
Subject: [PATCH 31/46] fix(package): update moment to version 2.19.3 (#491)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9146a6c0..ec36ba6a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "hdkey": "0.7.1",
     "idna-uts46": "1.1.0",
     "lodash": "4.17.4",
-    "moment": "2.19.2",
+    "moment": "2.19.3",
     "qrcode": "1.0.0",
     "qrcode.react": "0.7.2",
     "query-string": "5.0.1",

From 5b07395ee440af17376f653f9c16c05f95127f9c Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Wed, 29 Nov 2017 11:45:38 -0800
Subject: [PATCH 32/46] Throw on CryptoCompare API error (#486)

* Throw properly on API error.
---
 common/actions/rates/actionPayloads.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/actions/rates/actionPayloads.ts b/common/actions/rates/actionPayloads.ts
index 9256049a..7ba9d9cf 100644
--- a/common/actions/rates/actionPayloads.ts
+++ b/common/actions/rates/actionPayloads.ts
@@ -26,6 +26,11 @@ export const fetchRates = (symbols: string[] = []): Promise<CCResponse> =>
   fetch(CCRates(symbols))
     .then(response => handleJSONResponse(response, ERROR_MESSAGE))
     .then(rates => {
+      // API errors come as 200s, so check the json for error
+      if (rates.Response && rates.Response === 'Error') {
+        throw new Error('Failed to fetch rates');
+      }
+
       // All currencies are in ETH right now. We'll do token -> eth -> value to
       // do it all in one request
       // to their respective rates via ETH.

From 2030b605508ca9d1465f7ac811e0f329b0891781 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Wed, 29 Nov 2017 13:46:00 -0600
Subject: [PATCH 33/46] chore(package): update check-node-version to version
 3.1.1 (#492)

Closes #490
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec36ba6a..7d9ac89e 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "babel-minify-webpack-plugin": "0.2.0",
     "bs58": "4.0.1",
     "cache-loader": "1.2.0",
-    "check-node-version": "3.0.0",
+    "check-node-version": "3.1.1",
     "copy-webpack-plugin": "4.2.3",
     "css-loader": "0.28.7",
     "empty": "0.10.1",

From 5d3e461301718a04e845ba96de1e469ee812086c Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Wed, 29 Nov 2017 15:14:57 -0800
Subject: [PATCH 34/46] Read-Only Address Wallet (#386)

* Check in.

* Add read only wallet and new types for that. Convert some components to require full wallet.

* Fix readonly property, fix uncaught throw.

* Disable address only on some tabs.

* Use FullWalletOnly render callback to handle signing.

* Work around uncertain wallet type.

* Fix function args.

* Undo bug fix that should be done in another branch.

* Disable button while address is bad.

* Remove log.

* Convert anonymous functions to class functions.
---
 .../Header/components/CustomNodeModal.tsx     | 130 ++++++++++--------
 common/components/WalletDecrypt/ViewOnly.tsx  |  61 ++++++--
 common/components/WalletDecrypt/index.tsx     |  20 ++-
 .../components/renderCbs/FullWalletOnly.tsx   |  27 ++++
 common/components/ui/UnlockHeader.tsx         |   5 +-
 common/containers/TabSection/index.tsx        |  10 +-
 .../Deploy/components/DeployHoc/index.tsx     |   8 ++
 .../Deploy/components/DeployHoc/types.ts      |   5 +-
 .../Tabs/Contracts/components/withTx.tsx      |   4 +-
 .../containers/Tabs/SendTransaction/index.tsx |  14 +-
 .../components/SignMessage/SignButton.tsx     |  46 +++++++
 .../components/SignMessage/index.tsx          |  77 ++++-------
 common/libs/contracts/index.ts                |  37 ++---
 common/libs/nodes/etherscan/requests.ts       |   2 +-
 common/libs/nodes/rpc/client.ts               |   4 +-
 common/libs/nodes/rpc/types.ts                |   2 +-
 common/libs/transaction.ts                    |   8 +-
 common/libs/wallet/IWallet.ts                 |  13 +-
 common/libs/wallet/deterministic/ledger.ts    |   4 +-
 common/libs/wallet/deterministic/trezor.ts    |  10 +-
 common/libs/wallet/index.ts                   |   2 +-
 .../libs/wallet/non-deterministic/address.ts  |  14 ++
 .../libs/wallet/non-deterministic/helpers.ts  |   2 +-
 .../libs/wallet/non-deterministic/wallets.ts  |   4 +-
 common/libs/wallet/non-deterministic/web3.ts  |   4 +-
 common/reducers/config.ts                     |  27 ++--
 common/typescript/ethereumjs-wallet.d.ts      | 120 ++++++++--------
 common/utils/node.ts                          |  12 +-
 28 files changed, 400 insertions(+), 272 deletions(-)
 create mode 100644 common/components/renderCbs/FullWalletOnly.tsx
 create mode 100644 common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/SignButton.tsx
 create mode 100644 common/libs/wallet/non-deterministic/address.ts

diff --git a/common/components/Header/components/CustomNodeModal.tsx b/common/components/Header/components/CustomNodeModal.tsx
index d4b63800..fae273eb 100644
--- a/common/components/Header/components/CustomNodeModal.tsx
+++ b/common/components/Header/components/CustomNodeModal.tsx
@@ -35,7 +35,7 @@ export default class CustomNodeModal extends React.Component<Props, State> {
     network: NETWORK_KEYS[0],
     hasAuth: false,
     username: '',
-    password: '',
+    password: ''
   };
 
   public render() {
@@ -43,15 +43,18 @@ export default class CustomNodeModal extends React.Component<Props, State> {
     const isHttps = window.location.protocol.includes('https');
     const invalids = this.getInvalids();
 
-    const buttons: IButton[] = [{
-      type: 'primary',
-      text: translate('NODE_CTA'),
-      onClick: this.saveAndAdd,
-      disabled: !!Object.keys(invalids).length,
-    }, {
-      text: translate('x_Cancel'),
-      onClick: handleClose
-    }];
+    const buttons: IButton[] = [
+      {
+        type: 'primary',
+        text: translate('NODE_CTA'),
+        onClick: this.saveAndAdd,
+        disabled: !!Object.keys(invalids).length
+      },
+      {
+        text: translate('x_Cancel'),
+        onClick: handleClose
+      }
+    ];
 
     return (
       <Modal
@@ -61,20 +64,23 @@ export default class CustomNodeModal extends React.Component<Props, State> {
         handleClose={handleClose}
       >
         <div>
-          {isHttps &&
+          {isHttps && (
             <div className="alert alert-danger small">
               {translate('NODE_Warning')}
             </div>
-          }
+          )}
 
           <form>
             <div className="row">
               <div className="col-sm-7">
                 <label>{translate('NODE_Name')}</label>
-                {this.renderInput({
-                  name: 'name',
-                  placeholder: 'My Node',
-                }, invalids)}
+                {this.renderInput(
+                  {
+                    name: 'name',
+                    placeholder: 'My Node'
+                  },
+                  invalids
+                )}
               </div>
               <div className="col-sm-5">
                 <label>Network</label>
@@ -84,9 +90,11 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                   value={this.state.network}
                   onChange={this.handleChange}
                 >
-                  {NETWORK_KEYS.map((net) =>
-                    <option key={net} value={net}>{net}</option>
-                  )}
+                  {NETWORK_KEYS.map(net => (
+                    <option key={net} value={net}>
+                      {net}
+                    </option>
+                  ))}
                 </select>
               </div>
             </div>
@@ -94,19 +102,25 @@ export default class CustomNodeModal extends React.Component<Props, State> {
             <div className="row">
               <div className="col-sm-9">
                 <label>URL</label>
-                {this.renderInput({
-                  name: 'url',
-                  placeholder: 'http://127.0.0.1/',
-                }, invalids)}
+                {this.renderInput(
+                  {
+                    name: 'url',
+                    placeholder: 'http://127.0.0.1/'
+                  },
+                  invalids
+                )}
               </div>
 
               <div className="col-sm-3">
                 <label>{translate('NODE_Port')}</label>
-                {this.renderInput({
-                  name: 'port',
-                  placeholder: '8545',
-                  type: 'number',
-                }, invalids)}
+                {this.renderInput(
+                  {
+                    name: 'port',
+                    placeholder: '8545',
+                    type: 'number'
+                  },
+                  invalids
+                )}
               </div>
             </div>
             <div className="row">
@@ -117,13 +131,12 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                     name="hasAuth"
                     checked={this.state.hasAuth}
                     onChange={this.handleCheckbox}
-                  />
-                  {' '}
+                  />{' '}
                   <span>HTTP Basic Authentication</span>
                 </label>
               </div>
             </div>
-            {this.state.hasAuth &&
+            {this.state.hasAuth && (
               <div className="row">
                 <div className="col-sm-6">
                   <label>Username</label>
@@ -131,13 +144,16 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                 </div>
                 <div className="col-sm-6">
                   <label>Password</label>
-                  {this.renderInput({
-                    name: 'password',
-                    type: 'password',
-                  }, invalids)}
+                  {this.renderInput(
+                    {
+                      name: 'password',
+                      type: 'password'
+                    },
+                    invalids
+                  )}
                 </div>
               </div>
-            }
+            )}
           </form>
         </div>
       </Modal>
@@ -145,30 +161,26 @@ export default class CustomNodeModal extends React.Component<Props, State> {
   }
 
   private renderInput(input: Input, invalids: { [key: string]: boolean }) {
-    return <input
-      className={classnames({
-        'form-control': true,
-        'is-invalid': this.state[input.name] && invalids[input.name],
-      })}
-      value={this.state[name]}
-      onChange={this.handleChange}
-      {...input}
-    />;
+    return (
+      <input
+        className={classnames({
+          'form-control': true,
+          'is-invalid': this.state[input.name] && invalids[input.name]
+        })}
+        value={this.state[name]}
+        onChange={this.handleChange}
+        {...input}
+      />
+    );
   }
 
   private getInvalids(): { [key: string]: boolean } {
-    const {
-      url,
-      port,
-      hasAuth,
-      username,
-      password,
-    } = this.state;
-    const required = ["name", "url", "port", "network"];
+    const { url, port, hasAuth, username, password } = this.state;
+    const required = ['name', 'url', 'port', 'network'];
     const invalids: { [key: string]: boolean } = {};
 
     // Required fields
-    required.forEach((field) => {
+    required.forEach(field => {
       if (!this.state[field]) {
         invalids[field] = true;
       }
@@ -198,9 +210,9 @@ export default class CustomNodeModal extends React.Component<Props, State> {
     return invalids;
   }
 
-  private handleChange = (ev: React.FormEvent<
-    HTMLInputElement | HTMLSelectElement
-  >) => {
+  private handleChange = (
+    ev: React.FormEvent<HTMLInputElement | HTMLSelectElement>
+  ) => {
     const { name, value } = ev.currentTarget;
     this.setState({ [name as any]: value });
   };
@@ -215,13 +227,13 @@ export default class CustomNodeModal extends React.Component<Props, State> {
       name: this.state.name.trim(),
       url: this.state.url.trim(),
       port: parseInt(this.state.port, 10),
-      network: this.state.network,
+      network: this.state.network
     };
 
     if (this.state.hasAuth) {
       node.auth = {
         username: this.state.username,
-        password: this.state.password,
+        password: this.state.password
       };
     }
 
diff --git a/common/components/WalletDecrypt/ViewOnly.tsx b/common/components/WalletDecrypt/ViewOnly.tsx
index d19dfa0a..aa0cefe5 100644
--- a/common/components/WalletDecrypt/ViewOnly.tsx
+++ b/common/components/WalletDecrypt/ViewOnly.tsx
@@ -1,29 +1,60 @@
 import React, { Component } from 'react';
 import translate from 'translations';
+import { donationAddressMap } from 'config/data';
+import { isValidETHAddress } from 'libs/validators';
+import { AddressOnlyWallet } from 'libs/wallet';
+
+interface Props {
+  onUnlock(param: any): void;
+}
+
+interface State {
+  address: string;
+}
+
+export default class ViewOnlyDecrypt extends Component<Props, State> {
+  public state = {
+    address: ''
+  };
 
-export default class ViewOnlyDecrypt extends Component {
   public render() {
+    const { address } = this.state;
+    const isValid = isValidETHAddress(address);
+
     return (
       <section className="col-md-4 col-sm-6">
         <div id="selectedUploadKey">
-          <h4>
-            {translate('ADD_Radio_2_alt')}
-          </h4>
+          <h4>{translate('MYWAL_Address')}</h4>
 
-          <div className="form-group">
-            <input type="file" id="fselector" />
+          <form className="form-group" onSubmit={this.openWallet}>
+            <input
+              className={`form-control
+                ${isValid ? 'is-valid' : 'is-invalid'}
+              `}
+              onChange={this.changeAddress}
+              value={address}
+              placeholder={donationAddressMap.ETH}
+            />
 
-            <a
-              className="btn-file marg-v-sm"
-              id="aria1"
-              tabIndex={0}
-              role="button"
-            >
-              {translate('ADD_Radio_2_short')}
-            </a>
-          </div>
+            <button className="btn btn-primary btn-block" disabled={!isValid}>
+              {translate('NAV_ViewWallet')}
+            </button>
+          </form>
         </div>
       </section>
     );
   }
+
+  private changeAddress = (ev: React.FormEvent<HTMLInputElement>) => {
+    this.setState({ address: ev.currentTarget.value });
+  };
+
+  private openWallet = (ev: React.SyntheticEvent<HTMLFormElement>) => {
+    const { address } = this.state;
+    ev.preventDefault();
+    if (isValidETHAddress(address)) {
+      const wallet = new AddressOnlyWallet(address);
+      this.props.onUnlock(wallet);
+    }
+  };
 }
diff --git a/common/components/WalletDecrypt/index.tsx b/common/components/WalletDecrypt/index.tsx
index fbb77890..9531010b 100644
--- a/common/components/WalletDecrypt/index.tsx
+++ b/common/components/WalletDecrypt/index.tsx
@@ -30,7 +30,6 @@ const WALLETS = {
     component: Web3Decrypt,
     initialParams: {},
     unlock: unlockWeb3,
-    disabled: false,
     helpLink:
       'https://myetherwallet.github.io/knowledge-base/migration/moving-from-private-key-to-metamask.html'
   },
@@ -39,7 +38,6 @@ const WALLETS = {
     component: LedgerNanoSDecrypt,
     initialParams: {},
     unlock: setWallet,
-    disabled: false,
     helpLink:
       'https://ledger.zendesk.com/hc/en-us/articles/115005200009-How-to-use-MyEtherWallet-with-Ledger'
   },
@@ -48,7 +46,6 @@ const WALLETS = {
     component: TrezorDecrypt,
     initialParams: {},
     unlock: setWallet,
-    disabled: false,
     helpLink: 'https://doc.satoshilabs.com/trezor-apps/mew.html'
   },
   'keystore-file': {
@@ -59,7 +56,6 @@ const WALLETS = {
       password: ''
     },
     unlock: unlockKeystore,
-    disabled: false,
     helpLink:
       'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
@@ -68,7 +64,6 @@ const WALLETS = {
     component: MnemonicDecrypt,
     initialParams: {},
     unlock: unlockMnemonic,
-    disabled: false,
     helpLink:
       'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
@@ -80,14 +75,14 @@ const WALLETS = {
       password: ''
     },
     unlock: unlockPrivateKey,
-    disabled: false,
     helpLink:
       'https://myetherwallet.github.io/knowledge-base/private-keys-passwords/difference-beween-private-key-and-keystore-file.html'
   },
   'view-only': {
     lid: 'View with Address Only',
     component: ViewOnlyDecrypt,
-    disabled: true,
+    initialParams: {},
+    unlock: setWallet,
     helpLink: ''
   }
 };
@@ -100,6 +95,7 @@ interface Props {
     UnlockKeystoreAction | UnlockMnemonicAction | UnlockPrivateKeyAction
   >;
   offline: boolean;
+  allowReadOnly?: boolean;
 }
 
 interface State {
@@ -139,8 +135,12 @@ export class WalletDecrypt extends Component<Props, State> {
 
   public buildWalletOptions() {
     return map(WALLETS, (wallet, key) => {
-      const isSelected = this.state.selectedWalletKey === key;
       const { helpLink } = wallet;
+      const isSelected = this.state.selectedWalletKey === key;
+      const isDisabled =
+        this.isOnlineRequiredWalletAndOffline(key) ||
+        (!this.props.allowReadOnly && wallet.component === ViewOnlyDecrypt);
+
       return (
         <label className="radio" key={key}>
           <input
@@ -150,10 +150,8 @@ export class WalletDecrypt extends Component<Props, State> {
             name="decryption-choice-radio-group"
             value={key}
             checked={isSelected}
+            disabled={isDisabled}
             onChange={this.handleDecryptionChoiceChange}
-            disabled={
-              wallet.disabled || this.isOnlineRequiredWalletAndOffline(key)
-            }
           />
           <span id={`${key}-label`}>{translate(wallet.lid)}</span>
           {helpLink ? <Help link={helpLink} /> : null}
diff --git a/common/components/renderCbs/FullWalletOnly.tsx b/common/components/renderCbs/FullWalletOnly.tsx
new file mode 100644
index 00000000..7c94c675
--- /dev/null
+++ b/common/components/renderCbs/FullWalletOnly.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { connect } from 'react-redux';
+import { AppState } from 'reducers';
+import { IWallet, IFullWallet } from 'libs/wallet';
+
+interface Props {
+  wallet: IWallet;
+  withFullWallet(wallet: IFullWallet): React.ReactElement<any>;
+  withoutFullWallet(): React.ReactElement<any>;
+}
+
+class FullWalletOnly extends React.Component<Props, {}> {
+  public render() {
+    const { wallet, withFullWallet, withoutFullWallet } = this.props;
+    if (!wallet || wallet.isReadOnly) {
+      if (withoutFullWallet) {
+        return withoutFullWallet();
+      }
+      return null;
+    }
+    return withFullWallet(wallet);
+  }
+}
+
+export default connect((state: AppState) => ({
+  wallet: state.wallet.inst
+}))(FullWalletOnly);
diff --git a/common/components/ui/UnlockHeader.tsx b/common/components/ui/UnlockHeader.tsx
index ac86da03..104f2e05 100644
--- a/common/components/ui/UnlockHeader.tsx
+++ b/common/components/ui/UnlockHeader.tsx
@@ -7,6 +7,7 @@ import { AppState } from 'reducers';
 interface Props {
   title: React.ReactElement<any>;
   wallet: IWallet;
+  allowReadOnly?: boolean;
 }
 interface State {
   expanded: boolean;
@@ -28,7 +29,7 @@ export class UnlockHeader extends React.Component<Props, State> {
   }
 
   public render() {
-    const { title } = this.props;
+    const { title, allowReadOnly } = this.props;
     return (
       <article className="collapse-container">
         <div>
@@ -37,7 +38,7 @@ export class UnlockHeader extends React.Component<Props, State> {
           </a>
           <h1>{title}</h1>
         </div>
-        {this.state.expanded && <WalletDecrypt />}
+        {this.state.expanded && <WalletDecrypt allowReadOnly={allowReadOnly} />}
         {this.state.expanded && <hr />}
       </article>
     );
diff --git a/common/containers/TabSection/index.tsx b/common/containers/TabSection/index.tsx
index 72f3f30c..b50a69dd 100644
--- a/common/containers/TabSection/index.tsx
+++ b/common/containers/TabSection/index.tsx
@@ -8,7 +8,7 @@ import {
   TChangeLanguage,
   TChangeNodeIntent,
   TAddCustomNode,
-  TRemoveCustomNode,
+  TRemoveCustomNode
 } from 'actions/config';
 import { AlphaAgreement, Footer, Header } from 'components';
 import React, { Component } from 'react';
@@ -52,7 +52,7 @@ class TabSection extends Component<Props, {}> {
       changeNodeIntent,
       changeGasPrice,
       addCustomNode,
-      removeCustomNode,
+      removeCustomNode
     } = this.props;
 
     const headerProps = {
@@ -67,7 +67,7 @@ class TabSection extends Component<Props, {}> {
       changeNodeIntent,
       changeGasPrice,
       addCustomNode,
-      removeCustomNode,
+      removeCustomNode
     };
 
     return (
@@ -92,7 +92,7 @@ function mapStateToProps(state: AppState) {
     languageSelection: state.config.languageSelection,
     gasPriceGwei: state.config.gasPriceGwei,
     customNodes: state.config.customNodes,
-    latestBlock: state.config.latestBlock,
+    latestBlock: state.config.latestBlock
   };
 }
 
@@ -101,5 +101,5 @@ export default connect(mapStateToProps, {
   changeLanguage: dChangeLanguage,
   changeNodeIntent: dChangeNodeIntent,
   addCustomNode: dAddCustomNode,
-  removeCustomNode: dRemoveCustomNode,
+  removeCustomNode: dRemoveCustomNode
 })(TabSection);
diff --git a/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/index.tsx b/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/index.tsx
index b554882e..a982acd3 100644
--- a/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/index.tsx
+++ b/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/index.tsx
@@ -127,6 +127,10 @@ export const deployHOC = PassedComponent => {
         value
       };
 
+      if (!props.wallet || props.wallet.isReadOnly) {
+        return;
+      }
+
       return makeAndSignTx(
         props.wallet,
         props.nodeLib,
@@ -139,6 +143,10 @@ export const deployHOC = PassedComponent => {
     };
 
     private getAddressAndNonce = async () => {
+      if (!this.props.wallet || this.props.wallet.isReadOnly) {
+        return;
+      }
+
       const address = await this.props.wallet.getAddressString();
       const nonce = await this.props.nodeLib
         .getTransactionCount(address)
diff --git a/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/types.ts b/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/types.ts
index 218c111b..171f69de 100644
--- a/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/types.ts
+++ b/common/containers/Tabs/Contracts/components/Deploy/components/DeployHoc/types.ts
@@ -1,12 +1,13 @@
 import { Wei } from 'libs/units';
-import { IWallet, Balance } from 'libs/wallet';
+import { Balance } from 'libs/wallet';
 import { RPCNode } from 'libs/nodes';
 import { NodeConfig, NetworkConfig } from 'config/data';
 import { TBroadcastTx } from 'actions/wallet';
 import { TShowNotification } from 'actions/notifications';
+import { AppState } from 'reducers';
 
 export interface Props {
-  wallet: IWallet;
+  wallet: AppState['wallet']['inst'];
   balance: Balance;
   node: NodeConfig;
   nodeLib: RPCNode;
diff --git a/common/containers/Tabs/Contracts/components/withTx.tsx b/common/containers/Tabs/Contracts/components/withTx.tsx
index b3718805..d1c1b625 100644
--- a/common/containers/Tabs/Contracts/components/withTx.tsx
+++ b/common/containers/Tabs/Contracts/components/withTx.tsx
@@ -4,12 +4,12 @@ import { toWei, Wei, getDecimal } from 'libs/units';
 import { connect } from 'react-redux';
 import { showNotification, TShowNotification } from 'actions/notifications';
 import { broadcastTx, TBroadcastTx } from 'actions/wallet';
-import { IWallet, Balance } from 'libs/wallet';
+import { IFullWallet, Balance } from 'libs/wallet';
 import { RPCNode } from 'libs/nodes';
 import { NodeConfig, NetworkConfig } from 'config/data';
 
 export interface IWithTx {
-  wallet: IWallet;
+  wallet: IFullWallet;
   balance: Balance;
   node: NodeConfig;
   nodeLib: RPCNode;
diff --git a/common/containers/Tabs/SendTransaction/index.tsx b/common/containers/Tabs/SendTransaction/index.tsx
index c12d82a5..e4664814 100644
--- a/common/containers/Tabs/SendTransaction/index.tsx
+++ b/common/containers/Tabs/SendTransaction/index.tsx
@@ -285,6 +285,7 @@ export class SendTransaction extends React.Component<Props, State> {
                 ) : null}
               </div>
             }
+            allowReadOnly={true}
           />
           <NavigationPrompt
             when={unlocked}
@@ -364,9 +365,7 @@ export class SendTransaction extends React.Component<Props, State> {
                           {isLedgerWallet || isTrezorWallet ? (
                             <div>
                               <p>
-                                <b>
-                                  Confirm transaction on hardware wallet
-                                </b>
+                                <b>Confirm transaction on hardware wallet</b>
                               </p>
                               <Spinner size="x2" />
                             </div>
@@ -512,6 +511,10 @@ export class SendTransaction extends React.Component<Props, State> {
 
   public async getFormattedTxFromState(): Promise<TransactionWithoutGas> {
     const { wallet } = this.props;
+    if (wallet.isReadOnly) {
+      throw new Error('Wallet is read-only');
+    }
+
     const { token, unit, value, to, data } = this.state;
     const transactionInput: TransactionInput = {
       token,
@@ -694,6 +697,7 @@ export class SendTransaction extends React.Component<Props, State> {
     await this.resetJustTx();
     const { nodeLib, wallet, gasPrice, network, offline } = this.props;
     const { token, unit, value, to, data, gasLimit, nonce } = this.state;
+
     const chainId = network.chainId;
     const transactionInput = {
       token,
@@ -704,6 +708,10 @@ export class SendTransaction extends React.Component<Props, State> {
     };
     const bigGasLimit = Wei(gasLimit);
     try {
+      if (wallet.isReadOnly) {
+        throw new Error('Wallet is read-only');
+      }
+
       const signedTx = await generateCompleteTransaction(
         wallet,
         nodeLib,
diff --git a/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/SignButton.tsx b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/SignButton.tsx
new file mode 100644
index 00000000..7a1940b2
--- /dev/null
+++ b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/SignButton.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import translate from 'translations';
+import { ISignedMessage } from 'libs/signing';
+import { IFullWallet } from 'libs/wallet';
+import { TShowNotification } from 'actions/notifications';
+
+interface Props {
+  wallet: IFullWallet;
+  message: string;
+  showNotification: TShowNotification;
+  onSignMessage(msg: ISignedMessage): any;
+}
+
+export default class SignMessageButton extends React.Component<Props, {}> {
+  public render() {
+    return (
+      <button
+        className="SignMessage-sign btn btn-primary btn-lg"
+        onClick={this.handleSignMessage}
+      >
+        {translate('NAV_SignMsg')}
+      </button>
+    );
+  }
+
+  private handleSignMessage = async () => {
+    const { wallet, message, showNotification, onSignMessage } = this.props;
+
+    try {
+      const signedMessage: ISignedMessage = {
+        address: await wallet.getAddressString(),
+        message,
+        signature: await wallet.signMessage(message),
+        version: '2'
+      };
+
+      onSignMessage(signedMessage);
+      showNotification(
+        'success',
+        `Successfully signed message with address ${signedMessage.address}.`
+      );
+    } catch (err) {
+      showNotification('danger', `Error signing message: ${err.message}`);
+    }
+  };
+}
diff --git a/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
index 252de313..1237db3e 100644
--- a/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
+++ b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
@@ -1,28 +1,26 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import classnames from 'classnames';
-import { IWallet } from 'libs/wallet/IWallet';
 import WalletDecrypt from 'components/WalletDecrypt';
 import translate from 'translations';
 import { showNotification, TShowNotification } from 'actions/notifications';
 import { ISignedMessage } from 'libs/signing';
-import { AppState } from 'reducers';
+import { IFullWallet } from 'libs/wallet';
+import FullWalletOnly from 'components/renderCbs/FullWalletOnly';
+import SignButton from './SignButton';
 import './index.scss';
 
 interface Props {
-  wallet: IWallet;
   showNotification: TShowNotification;
 }
 
 interface State {
   message: string;
-  signMessageError: string;
   signedMessage: ISignedMessage | null;
 }
 
 const initialState: State = {
   message: '',
-  signMessageError: '',
   signedMessage: null
 };
 
@@ -33,7 +31,6 @@ export class SignMessage extends Component<Props, State> {
   public state: State = initialState;
 
   public render() {
-    const { wallet } = this.props;
     const { message, signedMessage } = this.state;
 
     const messageBoxClass = classnames([
@@ -56,14 +53,10 @@ export class SignMessage extends Component<Props, State> {
             <div className="SignMessage-help">{translate('MSG_info2')}</div>
           </div>
 
-          {!!wallet && (
-            <button
-              className="SignMessage-sign btn btn-primary btn-lg"
-              onClick={this.handleSignMessage}
-            >
-              {translate('NAV_SignMsg')}
-            </button>
-          )}
+          <FullWalletOnly
+            withFullWallet={this.renderSignButton}
+            withoutFullWallet={this.renderUnlock}
+          />
 
           {!!signedMessage && (
             <div>
@@ -79,53 +72,33 @@ export class SignMessage extends Component<Props, State> {
             </div>
           )}
         </div>
-
-        {!wallet && <WalletDecrypt />}
       </div>
     );
   }
 
-  private handleSignMessage = async () => {
-    const { wallet } = this.props;
-    const { message } = this.state;
-
-    if (!wallet) {
-      return;
-    }
-
-    try {
-      const signedMessage: ISignedMessage = {
-        address: await wallet.getAddressString(),
-        message,
-        signature: await wallet.signMessage(message),
-        version: '2'
-      };
-
-      this.setState({ signedMessage });
-      this.props.showNotification(
-        'success',
-        `Successfully signed message with address ${signedMessage.address}.`
-      );
-    } catch (err) {
-      this.props.showNotification(
-        'danger',
-        `Error signing message: ${err.message}`
-      );
-    }
-  };
-
   private handleMessageChange = (e: React.FormEvent<HTMLTextAreaElement>) => {
     const message = e.currentTarget.value;
     this.setState({ message });
   };
-}
 
-function mapStateToProps(state: AppState) {
-  return {
-    wallet: state.wallet.inst
+  private onSignMessage = (signedMessage: ISignedMessage) => {
+    this.setState({ signedMessage });
   };
+
+  private renderSignButton(fullWallet: IFullWallet) {
+    return (
+      <SignButton
+        wallet={fullWallet}
+        message={this.state.message}
+        showNotification={this.props.showNotification}
+        onSignMessage={this.onSignMessage}
+      />
+    );
+  }
+
+  private renderUnlock() {
+    return <WalletDecrypt />;
+  }
 }
 
-export default connect(mapStateToProps, {
-  showNotification
-})(SignMessage);
+export default connect(null, { showNotification })(SignMessage);
diff --git a/common/libs/contracts/index.ts b/common/libs/contracts/index.ts
index 07378f10..8c32ef05 100644
--- a/common/libs/contracts/index.ts
+++ b/common/libs/contracts/index.ts
@@ -1,5 +1,5 @@
 import AbiFunction, { IUserSendParams, ISendParams } from './ABIFunction';
-import { IWallet } from 'libs/wallet/IWallet';
+import { IFullWallet } from 'libs/wallet/IWallet';
 import { RPCNode } from 'libs/nodes';
 import { ContractOutputMappings } from './types';
 import { Wei } from 'libs/units';
@@ -12,7 +12,7 @@ const ABIFUNC_METHOD_NAMES = [
 ];
 
 export interface ISetConfigForTx {
-  wallet: IWallet;
+  wallet: IFullWallet;
   nodeLib: RPCNode;
   chainId: number;
   gasPrice: Wei;
@@ -36,25 +36,26 @@ export default class Contract {
       .setGasPrice(gasPrice);
 
   public static getFunctions = (contract: Contract) =>
-    Object.getOwnPropertyNames(
-      contract
-    ).reduce((accu, currContractMethodName) => {
-      const currContractMethod = contract[currContractMethodName];
-      const methodNames = Object.getOwnPropertyNames(currContractMethod);
+    Object.getOwnPropertyNames(contract).reduce(
+      (accu, currContractMethodName) => {
+        const currContractMethod = contract[currContractMethodName];
+        const methodNames = Object.getOwnPropertyNames(currContractMethod);
 
-      const isFunc = ABIFUNC_METHOD_NAMES.reduce(
-        (isAbiFunc, currAbiFuncMethodName) =>
-          isAbiFunc && methodNames.includes(currAbiFuncMethodName),
-        true
-      );
-      return isFunc
-        ? { ...accu, [currContractMethodName]: currContractMethod }
-        : accu;
-    }, {});
+        const isFunc = ABIFUNC_METHOD_NAMES.reduce(
+          (isAbiFunc, currAbiFuncMethodName) =>
+            isAbiFunc && methodNames.includes(currAbiFuncMethodName),
+          true
+        );
+        return isFunc
+          ? { ...accu, [currContractMethodName]: currContractMethod }
+          : accu;
+      },
+      {}
+    );
 
   public address: string;
   public abi;
-  private wallet: IWallet;
+  private wallet: IFullWallet;
   private gasPrice: Wei;
   private chainId: number;
   private node: RPCNode;
@@ -68,7 +69,7 @@ export default class Contract {
     return this;
   };
 
-  public setWallet = (w: IWallet) => {
+  public setWallet = (w: IFullWallet) => {
     this.wallet = w;
     return this;
   };
diff --git a/common/libs/nodes/etherscan/requests.ts b/common/libs/nodes/etherscan/requests.ts
index 1cf353ba..036cb60c 100644
--- a/common/libs/nodes/etherscan/requests.ts
+++ b/common/libs/nodes/etherscan/requests.ts
@@ -71,7 +71,7 @@ export default class EtherscanRequests extends RPCRequests {
   public getCurrentBlock(): GetCurrentBlockRequest {
     return {
       module: 'proxy',
-      action: 'eth_blockNumber',
+      action: 'eth_blockNumber'
     };
   }
 }
diff --git a/common/libs/nodes/rpc/client.ts b/common/libs/nodes/rpc/client.ts
index eb6a8d9b..144fd2cb 100644
--- a/common/libs/nodes/rpc/client.ts
+++ b/common/libs/nodes/rpc/client.ts
@@ -24,7 +24,7 @@ export default class RPCClient {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        ...this.headers,
+        ...this.headers
       },
       body: JSON.stringify(this.decorateRequest(request))
     }).then(r => r.json());
@@ -35,7 +35,7 @@ export default class RPCClient {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        ...this.headers,
+        ...this.headers
       },
       body: JSON.stringify(requests.map(this.decorateRequest))
     }).then(r => r.json());
diff --git a/common/libs/nodes/rpc/types.ts b/common/libs/nodes/rpc/types.ts
index ec21b521..cc5a3f7e 100644
--- a/common/libs/nodes/rpc/types.ts
+++ b/common/libs/nodes/rpc/types.ts
@@ -70,7 +70,7 @@ export interface GetTransactionCountRequest extends RPCRequestBase {
 }
 
 export interface GetCurrentBlockRequest extends RPCRequestBase {
-  method: 'eth_blockNumber'
+  method: 'eth_blockNumber';
 }
 
 export type RPCRequest =
diff --git a/common/libs/transaction.ts b/common/libs/transaction.ts
index bb1b4b37..40514f29 100644
--- a/common/libs/transaction.ts
+++ b/common/libs/transaction.ts
@@ -8,7 +8,7 @@ import { INode } from 'libs/nodes/INode';
 import { UnitKey, Wei, TokenValue, toTokenBase } from 'libs/units';
 import { isValidETHAddress } from 'libs/validators';
 import { stripHexPrefixAndLower, sanitizeHex, toHexWei } from 'libs/values';
-import { IWallet, Web3Wallet } from 'libs/wallet';
+import { IFullWallet, Web3Wallet } from 'libs/wallet';
 import { translateRaw } from 'translations';
 
 export interface TransactionInput {
@@ -168,7 +168,7 @@ function generateTxValidation(
 export async function generateCompleteTransactionFromRawTransaction(
   node: INode,
   tx: ExtendedRawTransaction,
-  wallet: IWallet,
+  wallet: IFullWallet,
   token: Token | null | undefined,
   skipValidation: boolean,
   offline?: boolean
@@ -213,7 +213,7 @@ export async function generateCompleteTransactionFromRawTransaction(
 }
 
 export async function formatTxInput(
-  wallet: IWallet,
+  wallet: IFullWallet,
   { token, unit, value, to, data }: TransactionInput
 ): Promise<TransactionWithoutGas> {
   if (unit === 'ether') {
@@ -265,7 +265,7 @@ export async function confirmAndSendWeb3Transaction(
 }
 
 export async function generateCompleteTransaction(
-  wallet: IWallet,
+  wallet: IFullWallet,
   nodeLib: RPCNode,
   gasPrice: Wei,
   gasLimit: Wei,
diff --git a/common/libs/wallet/IWallet.ts b/common/libs/wallet/IWallet.ts
index 975478cf..78423edc 100644
--- a/common/libs/wallet/IWallet.ts
+++ b/common/libs/wallet/IWallet.ts
@@ -1,7 +1,18 @@
 import { RawTransaction } from 'libs/transaction';
 
-export interface IWallet {
+interface IBaseWallet {
+  isReadOnly?: boolean;
   getAddressString(): Promise<string> | string;
+}
+
+export interface IReadOnlyWallet extends IBaseWallet {
+  isReadOnly: true;
+}
+
+export interface IFullWallet extends IBaseWallet {
+  isReadOnly?: false;
   signRawTransaction(tx: RawTransaction): Promise<string> | string;
   signMessage(msg: string): Promise<string> | string;
 }
+
+export type IWallet = IReadOnlyWallet | IFullWallet;
diff --git a/common/libs/wallet/deterministic/ledger.ts b/common/libs/wallet/deterministic/ledger.ts
index 552302d2..cd9ec06c 100644
--- a/common/libs/wallet/deterministic/ledger.ts
+++ b/common/libs/wallet/deterministic/ledger.ts
@@ -3,10 +3,10 @@ import LedgerEth from 'vendor/ledger-eth';
 import EthTx from 'ethereumjs-tx';
 import { addHexPrefix, rlp } from 'ethereumjs-util';
 import { DeterministicWallet } from './deterministic';
-import { IWallet } from '../IWallet';
+import { IFullWallet } from '../IWallet';
 import { RawTransaction } from 'libs/transaction';
 
-export class LedgerWallet extends DeterministicWallet implements IWallet {
+export class LedgerWallet extends DeterministicWallet implements IFullWallet {
   private ledger: any;
   private ethApp: any;
 
diff --git a/common/libs/wallet/deterministic/trezor.ts b/common/libs/wallet/deterministic/trezor.ts
index fd561cca..4a78d520 100644
--- a/common/libs/wallet/deterministic/trezor.ts
+++ b/common/libs/wallet/deterministic/trezor.ts
@@ -5,9 +5,9 @@ import { RawTransaction } from 'libs/transaction';
 import { stripHexPrefixAndLower } from 'libs/values';
 import TrezorConnect from 'vendor/trezor-connect';
 import { DeterministicWallet } from './deterministic';
-import { IWallet } from '../IWallet';
+import { IFullWallet } from '../IWallet';
 
-export class TrezorWallet extends DeterministicWallet implements IWallet {
+export class TrezorWallet extends DeterministicWallet implements IFullWallet {
   public signRawTransaction(tx: RawTransaction): Promise<string> {
     return new Promise((resolve, reject) => {
       (TrezorConnect as any).ethereumSignTx(
@@ -51,12 +51,12 @@ export class TrezorWallet extends DeterministicWallet implements IWallet {
   public signMessage = (message: string): Promise<string> => {
     return new Promise((resolve, reject) => {
       (TrezorConnect as any).ethereumSignMessage(
-        this.getPath(), 
-        message, 
+        this.getPath(),
+        message,
         response => {
           if (response.success) {
             resolve(addHexPrefix(response.signature))
-          } else{ 
+          } else{
             console.error(response.error)
             reject(response.error)
           }
diff --git a/common/libs/wallet/index.ts b/common/libs/wallet/index.ts
index 52e71ba3..2e70fd03 100644
--- a/common/libs/wallet/index.ts
+++ b/common/libs/wallet/index.ts
@@ -1,4 +1,4 @@
-export { IWallet } from './IWallet';
+export { IWallet, IReadOnlyWallet, IFullWallet } from './IWallet';
 export { Balance } from './balance';
 export * from './deterministic';
 export * from './non-deterministic';
diff --git a/common/libs/wallet/non-deterministic/address.ts b/common/libs/wallet/non-deterministic/address.ts
new file mode 100644
index 00000000..0c8410a4
--- /dev/null
+++ b/common/libs/wallet/non-deterministic/address.ts
@@ -0,0 +1,14 @@
+import { IReadOnlyWallet } from '../IWallet';
+
+export default class AddressOnlyWallet implements IReadOnlyWallet {
+  public address = '';
+  public readonly isReadOnly = true;
+
+  constructor(address: string) {
+    this.address = address;
+  }
+
+  public getAddressString() {
+    return this.address;
+  }
+}
diff --git a/common/libs/wallet/non-deterministic/helpers.ts b/common/libs/wallet/non-deterministic/helpers.ts
index c3d205a0..65ff59d0 100644
--- a/common/libs/wallet/non-deterministic/helpers.ts
+++ b/common/libs/wallet/non-deterministic/helpers.ts
@@ -23,7 +23,7 @@ interface ISignWrapper {
   unlock();
 }
 
-type WrappedWallet = IFullWallet & ISignWrapper;
+export type WrappedWallet = IFullWallet & ISignWrapper;
 
 export const signWrapper = (walletToWrap: IFullWallet): WrappedWallet =>
   Object.assign(walletToWrap, {
diff --git a/common/libs/wallet/non-deterministic/wallets.ts b/common/libs/wallet/non-deterministic/wallets.ts
index 7da76112..26beb6cb 100644
--- a/common/libs/wallet/non-deterministic/wallets.ts
+++ b/common/libs/wallet/non-deterministic/wallets.ts
@@ -3,6 +3,7 @@ import { fromEtherWallet } from 'ethereumjs-wallet/thirdparty';
 import { signWrapper } from './helpers';
 import { decryptPrivKey } from 'libs/decrypt';
 import Web3Wallet from './web3';
+import AddressOnlyWallet from './address';
 
 const EncryptedPrivateKeyWallet = (
   encryptedPrivateKey: string,
@@ -26,5 +27,6 @@ export {
   MewV1Wallet,
   PrivKeyWallet,
   UtcWallet,
-  Web3Wallet
+  Web3Wallet,
+  AddressOnlyWallet
 };
diff --git a/common/libs/wallet/non-deterministic/web3.ts b/common/libs/wallet/non-deterministic/web3.ts
index d32837fc..2447ab97 100644
--- a/common/libs/wallet/non-deterministic/web3.ts
+++ b/common/libs/wallet/non-deterministic/web3.ts
@@ -1,9 +1,9 @@
-import { IWallet } from '../IWallet';
+import { IFullWallet } from '../IWallet';
 import { ExtendedRawTransaction } from 'libs/transaction';
 import { networkIdToName } from 'libs/values';
 import { bufferToHex } from 'ethereumjs-util';
 
-export default class Web3Wallet implements IWallet {
+export default class Web3Wallet implements IFullWallet {
   private web3: any;
   private address: string;
   private network: string;
diff --git a/common/reducers/config.ts b/common/reducers/config.ts
index db87e129..6e122dc5 100644
--- a/common/reducers/config.ts
+++ b/common/reducers/config.ts
@@ -5,14 +5,10 @@ import {
   AddCustomNodeAction,
   RemoveCustomNodeAction,
   SetLatestBlockAction,
-  ConfigAction,
+  ConfigAction
 } from 'actions/config';
 import { TypeKeys } from 'actions/config/constants';
-import {
-  NODES,
-  NodeConfig,
-  CustomNodeConfig,
-} from '../config/data';
+import { NODES, NodeConfig, CustomNodeConfig } from '../config/data';
 import { makeCustomNodeId } from 'utils/node';
 
 export interface State {
@@ -38,7 +34,7 @@ export const INITIAL_STATE: State = {
   offline: false,
   forceOffline: false,
   customNodes: [],
-  latestBlock: "???",
+  latestBlock: '???'
 };
 
 function changeLanguage(state: State, action: ChangeLanguageAction): State {
@@ -53,14 +49,14 @@ function changeNode(state: State, action: ChangeNodeAction): State {
     ...state,
     nodeSelection: action.payload.nodeSelection,
     node: action.payload.node,
-    isChangingNode: false,
+    isChangingNode: false
   };
 }
 
 function changeNodeIntent(state: State): State {
   return {
     ...state,
-    isChangingNode: true,
+    isChangingNode: true
   };
 }
 
@@ -88,10 +84,7 @@ function forceOffline(state: State): State {
 function addCustomNode(state: State, action: AddCustomNodeAction): State {
   return {
     ...state,
-    customNodes: [
-      ...state.customNodes,
-      action.payload,
-    ],
+    customNodes: [...state.customNodes, action.payload]
   };
 }
 
@@ -99,16 +92,16 @@ function removeCustomNode(state: State, action: RemoveCustomNodeAction): State {
   const id = makeCustomNodeId(action.payload);
   return {
     ...state,
-    customNodes: state.customNodes.filter((cn) => cn !== action.payload),
-    nodeSelection: id === state.nodeSelection ?
-      defaultNode : state.nodeSelection,
+    customNodes: state.customNodes.filter(cn => cn !== action.payload),
+    nodeSelection:
+      id === state.nodeSelection ? defaultNode : state.nodeSelection
   };
 }
 
 function setLatestBlock(state: State, action: SetLatestBlockAction): State {
   return {
     ...state,
-    latestBlock: action.payload,
+    latestBlock: action.payload
   };
 }
 
diff --git a/common/typescript/ethereumjs-wallet.d.ts b/common/typescript/ethereumjs-wallet.d.ts
index af40601b..502c63da 100644
--- a/common/typescript/ethereumjs-wallet.d.ts
+++ b/common/typescript/ethereumjs-wallet.d.ts
@@ -16,34 +16,34 @@ declare module 'ethereumjs-wallet/thirdparty' {
     IEtherWalletUnlocked
   } from 'ethereumjs-wallet';
   /**
-      * @description import a brain wallet used by Ether.Camp
-      * @param input 
-      * @param password 
-      */
+   * @description import a brain wallet used by Ether.Camp
+   * @param input
+   * @param password
+   */
   function fromEtherCamp(passphrase: string): IFullWallet;
 
   /**
-     * @description import a wallet generated by EtherWallet
-     * @param input 
-     * @param password 
-     */
+   * @description import a wallet generated by EtherWallet
+   * @param input
+   * @param password
+   */
   function fromEtherWallet(
     input: IEtherWalletLocked | IEtherWalletUnlocked | string,
     password: string
   ): IFullWallet;
 
   /**
-     * @description  import a wallet from a KryptoKit seed 
-     * @param entropy 
-     * @param seed 
-     */
+   * @description  import a wallet from a KryptoKit seed
+   * @param entropy
+   * @param seed
+   */
   function fromKryptoKit(entropy: string, seed: string): IFullWallet;
 
   /**
-     * @description import a brain wallet used by Quorum Wallet
-     * @param passphrase 
-     * @param userid 
-     */
+   * @description import a brain wallet used by Quorum Wallet
+   * @param passphrase
+   * @param userid
+   */
   function fromQuorumWallet(passphrase: string, userid: string): IFullWallet;
 }
 
@@ -68,14 +68,14 @@ declare module 'ethereumjs-wallet/hdkey' {
     deriveChild(index): IHDNodePublic;
 
     /**
-     * @description return a Wallet instance 
+     * @description return a Wallet instance
      */
     getWallet(): IPublicKeyOnlyWallet;
   }
 
   /**
-   * 
-   * 
+   *
+   *
    * @interface IHDNodePrivate
    */
   interface IHDNodePrivate {
@@ -100,19 +100,19 @@ declare module 'ethereumjs-wallet/hdkey' {
     deriveChild(index): IHDNodePrivate | IHDNodePublic;
 
     /**
-     * @description return a Wallet instance 
+     * @description return a Wallet instance
      */
     getWallet(): IFullWallet;
   }
 
   /**
-     * @description create an instance based on a seed
-     */
+   * @description create an instance based on a seed
+   */
   function fromMasterSeed(seed: Buffer): IHDNodePrivate;
 
   /**
-     * @description create an instance based on a BIP32 extended private or public key
-     */
+   * @description create an instance based on a BIP32 extended private or public key
+   */
   function fromExtendedKey(key: string): IHDNodePrivate | IHDNodePublic;
 }
 
@@ -227,7 +227,7 @@ declare module 'ethereumjs-wallet' {
     getAddress(): Buffer;
 
     /**
-     * 
+     *
      * @description return the address
      */
     getAddressString(): string;
@@ -262,61 +262,61 @@ declare module 'ethereumjs-wallet' {
   }
 
   /**
-     * 
-     * @param icap
-     * @description create an instance based on a new random key (setting icap to true will generate an address suitable for the ICAP Direct mode
-     */
+   *
+   * @param icap
+   * @description create an instance based on a new random key (setting icap to true will generate an address suitable for the ICAP Direct mode
+   */
   function generate(icap?: boolean): IFullWallet;
 
   /**
-     * 
-     * @param pattern
-     * @description create an instance where the address is valid against the supplied pattern (this will be very slow)
-     */
+   *
+   * @param pattern
+   * @description create an instance where the address is valid against the supplied pattern (this will be very slow)
+   */
   function generateVanityAddress(pattern: string | RegExp): IFullWallet;
 
   /**
-     * @description create an instance based on a raw private key
-     * @param input
-     *
-     */
+   * @description create an instance based on a raw private key
+   * @param input
+   *
+   */
   function fromPrivateKey(input: Buffer): IFullWallet;
 
   /**
-     * @description create an instance based on a BIP32 extended private key (xprv)
-     * @param input 
-     */
+   * @description create an instance based on a BIP32 extended private key (xprv)
+   * @param input
+   */
   function fromExtendedPrivateKey(input: Buffer): IFullWallet;
 
   /**
-     * @description create an instance based on a public key (certain methods will not be available)
-     * @param input 
-     * @param nonStrict 
-     */
+   * @description create an instance based on a public key (certain methods will not be available)
+   * @param input
+   * @param nonStrict
+   */
   function fromPublicKey(
     input: Buffer,
     nonStrict?: boolean
   ): IPublicKeyOnlyWallet;
 
   /**
-     * @description  create an instance based on a BIP32 extended public key (xpub)
-     * @param input 
-     */
+   * @description  create an instance based on a BIP32 extended public key (xpub)
+   * @param input
+   */
   function fromExtendedPublicKey(input: string): IPublicKeyOnlyWallet;
 
   /**
-     * @description import a wallet (Version 1 of the Ethereum wallet format)
-     * @param input 
-     * @param password 
-     */
+   * @description import a wallet (Version 1 of the Ethereum wallet format)
+   * @param input
+   * @param password
+   */
   function fromV1(input: IV1Wallet | string, password: string): IFullWallet;
 
   /**
-     * @description import a wallet (Version 3 of the Ethereum wallet format). Set nonStrict true to accept files with mixed-caps.
-     * @param input 
-     * @param password
-     * @param nonStrict
-     */
+   * @description import a wallet (Version 3 of the Ethereum wallet format). Set nonStrict true to accept files with mixed-caps.
+   * @param input
+   * @param password
+   * @param nonStrict
+   */
   function fromV3(
     input: IV3Wallet | string,
     password: string,
@@ -324,10 +324,10 @@ declare module 'ethereumjs-wallet' {
   ): IFullWallet;
 
   /**
-     * @description import an Ethereum Pre Sale wallet
-     * @param input 
-     * @param password 
-     */
+   * @description import an Ethereum Pre Sale wallet
+   * @param input
+   * @param password
+   */
   function fromEthSale(
     input: IPresaleWallet | string,
     password: string
diff --git a/common/utils/node.ts b/common/utils/node.ts
index 34612e3e..629f7cd1 100644
--- a/common/utils/node.ts
+++ b/common/utils/node.ts
@@ -6,13 +6,15 @@ export function makeCustomNodeId(config: CustomNodeConfig): string {
 }
 
 export function getCustomNodeConfigFromId(
-  id: string, configs: CustomNodeConfig[]
+  id: string,
+  configs: CustomNodeConfig[]
 ): CustomNodeConfig | undefined {
-  return configs.find((node) => makeCustomNodeId(node) === id);
+  return configs.find(node => makeCustomNodeId(node) === id);
 }
 
 export function getNodeConfigFromId(
-  id: string, configs: CustomNodeConfig[]
+  id: string,
+  configs: CustomNodeConfig[]
 ): NodeConfig | undefined {
   if (NODES[id]) {
     return NODES[id];
@@ -30,7 +32,7 @@ export function makeNodeConfigFromCustomConfig(
   return {
     network: config.network,
     lib: new CustomNode(config),
-    service: "your custom node",
-    estimateGas: true,
+    service: 'your custom node',
+    estimateGas: true
   };
 }

From 31963b334c79181b743a1fc03214abcf271afc6c Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Wed, 29 Nov 2017 15:20:24 -0800
Subject: [PATCH 35/46] CI & Commit Hook Improvements (#411)

* Add tscheck command, add more stuff to prepush and precommit hooks, clean up travis output.

* Move tscheck to prepush, remove running tests entirely.

* Put tslint on prepush as well.
---
 .travis.yml  | 4 +++-
 package.json | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0c9554a..2d64e8d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
+install:
+  - npm install --silent
 
 notifications:
   email:
@@ -16,4 +18,4 @@ notifications:
 script:
 - npm run test
 - npm run tslint
-- tsc --noEmit
+- npm run tscheck
diff --git a/package.json b/package.json
index 7d9ac89e..5f64fa4b 100644
--- a/package.json
+++ b/package.json
@@ -123,9 +123,11 @@
     "predev:https": "check-node-version --package",
     "derivation-checker": "webpack --config=./webpack_config/webpack.derivation-checker.js && node ./dist/derivation-checker.js",
     "tslint": "tslint --project . --exclude common/vendor/**/*",
+    "tscheck": "tsc --noEmit",
     "postinstall": "webpack --config=./webpack_config/webpack.dll.js",
     "start": "npm run dev",
-    "precommit": "lint-staged"
+    "precommit": "lint-staged",
+    "prepush": "npm run tslint && npm run tscheck"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

From 6c09e7160a94e289d367a57433d1f51cb7706bc7 Mon Sep 17 00:00:00 2001
From: skubakdj <skubakdj@gmail.com>
Date: Wed, 29 Nov 2017 23:07:16 -0500
Subject: [PATCH 36/46] Saga Testing (#415)

* add exports to config saga, refactor

* add config saga tests

* add exports to necessary files

* add remaining saga test & snapshots

* update orders saga spec to use Infinity constant

* update dWallet saga spec snapshot

* refactor config saga slightly

* update config saga spec

* update config saga snapshot

* update rates saga spec

* remove unused vars from config saga spec
---
 common/actions/swap/actionTypes.ts            |   4 +-
 common/sagas/config.ts                        |  32 +-
 common/sagas/deterministicWallets.ts          |   6 +-
 common/sagas/notifications.ts                 |   4 +-
 common/sagas/swap/orders.ts                   |   4 +-
 common/sagas/swap/rates.ts                    |   2 +-
 common/sagas/wallet.tsx                       |  12 +-
 spec/sagas/__snapshots__/config.spec.ts.snap  |  99 +++++
 .../deterministicWallets.spec.ts.snap         | 216 +++++++++
 spec/sagas/__snapshots__/wallet.spec.tsx.snap | 228 ++++++++++
 spec/sagas/config.spec.ts                     | 417 ++++++++++++++++++
 spec/sagas/deterministicWallets.spec.ts       | 220 +++++++++
 spec/sagas/notifications.spec.ts              |  44 ++
 spec/sagas/swap/orders.spec.ts                | 371 ++++++++++++++++
 spec/sagas/swap/rates.spec.ts                 |  86 ++++
 spec/sagas/wallet.spec.tsx                    | 327 ++++++++++++++
 16 files changed, 2043 insertions(+), 29 deletions(-)
 create mode 100644 spec/sagas/__snapshots__/config.spec.ts.snap
 create mode 100644 spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
 create mode 100644 spec/sagas/__snapshots__/wallet.spec.tsx.snap
 create mode 100644 spec/sagas/config.spec.ts
 create mode 100644 spec/sagas/deterministicWallets.spec.ts
 create mode 100644 spec/sagas/notifications.spec.ts
 create mode 100644 spec/sagas/swap/orders.spec.ts
 create mode 100644 spec/sagas/swap/rates.spec.ts
 create mode 100644 spec/sagas/wallet.spec.tsx

diff --git a/common/actions/swap/actionTypes.ts b/common/actions/swap/actionTypes.ts
index 75ef19f4..6f81de04 100644
--- a/common/actions/swap/actionTypes.ts
+++ b/common/actions/swap/actionTypes.ts
@@ -69,14 +69,14 @@ export interface BityOrderCreateRequestedSwapAction {
   };
 }
 
-interface BityOrderInput {
+export interface BityOrderInput {
   amount: string;
   currency: string;
   reference: string;
   status: string;
 }
 
-interface BityOrderOutput {
+export interface BityOrderOutput {
   amount: string;
   currency: string;
   reference: string;
diff --git a/common/sagas/config.ts b/common/sagas/config.ts
index b97031a4..294713c7 100644
--- a/common/sagas/config.ts
+++ b/common/sagas/config.ts
@@ -30,7 +30,8 @@ import {
   changeNode,
   changeNodeIntent,
   setLatestBlock,
-  AddCustomNodeAction
+  AddCustomNodeAction,
+  ChangeNodeIntentAction
 } from 'actions/config';
 import { showNotification } from 'actions/notifications';
 import translate from 'translations';
@@ -100,13 +101,13 @@ export function* pollOfflineStatus(): SagaIterator {
 }
 
 // Fork our recurring API call, watch for the need to cancel.
-function* handlePollOfflineStatus(): SagaIterator {
+export function* handlePollOfflineStatus(): SagaIterator {
   const pollOfflineStatusTask = yield fork(pollOfflineStatus);
   yield take('CONFIG_STOP_POLL_OFFLINE_STATE');
   yield cancel(pollOfflineStatusTask);
 }
 
-function* handleTogglePollOfflineStatus(): SagaIterator {
+export function* handleTogglePollOfflineStatus(): SagaIterator {
   const isForcedOffline = yield select(getForceOffline);
   if (isForcedOffline) {
     yield fork(handlePollOfflineStatus);
@@ -117,14 +118,15 @@ function* handleTogglePollOfflineStatus(): SagaIterator {
 
 // @HACK For now we reload the app when doing a language swap to force non-connected
 // data to reload. Also the use of timeout to avoid using additional actions for now.
-function* reload(): SagaIterator {
+export function* reload(): SagaIterator {
   setTimeout(() => location.reload(), 250);
 }
 
-function* handleNodeChangeIntent(action): SagaIterator {
+export function* handleNodeChangeIntent(
+  action: ChangeNodeIntentAction
+): SagaIterator {
   const currentNode = yield select(getNode);
   const currentConfig = yield select(getNodeConfig);
-  const currentWallet = yield select(getWalletInst);
   const currentNetwork = currentConfig.network;
 
   let actionConfig = NODES[action.payload];
@@ -173,6 +175,8 @@ function* handleNodeChangeIntent(action): SagaIterator {
   yield put(setLatestBlock(latestBlock));
   yield put(changeNode(action.payload, actionConfig));
 
+  const currentWallet = yield select(getWalletInst);
+
   // if there's no wallet, do not reload as there's no component state to resync
   if (currentWallet && currentNetwork !== actionConfig.network) {
     yield call(reload);
@@ -185,7 +189,7 @@ export function* switchToNewNode(action: AddCustomNodeAction): SagaIterator {
 }
 
 // unset web3 as the selected node if a non-web3 wallet has been selected
-function* unsetWeb3Node(action): SagaIterator {
+export function* unsetWeb3Node(action): SagaIterator {
   const node = yield select(getNode);
   const nodeConfig = yield select(getNodeConfig);
   const newWallet = action.payload;
@@ -196,7 +200,11 @@ function* unsetWeb3Node(action): SagaIterator {
   }
 
   // switch back to a node with the same network as MetaMask/Mist
-  const equivalentNode = Object.keys(NODES)
+  yield put(changeNodeIntent(equivalentNodeOrDefault(nodeConfig)));
+}
+
+export const equivalentNodeOrDefault = nodeConfig => {
+  const node = Object.keys(NODES)
     .filter(key => key !== 'web3')
     .reduce((found, key) => {
       const config = NODES[key];
@@ -210,12 +218,8 @@ function* unsetWeb3Node(action): SagaIterator {
     }, '');
 
   // if no equivalent node was found, use the app default
-  const newNode = equivalentNode.length
-    ? equivalentNode
-    : configInitialState.nodeSelection;
-
-  yield put(changeNodeIntent(newNode));
-}
+  return node.length ? node : configInitialState.nodeSelection;
+};
 
 export default function* configSaga(): SagaIterator {
   yield takeLatest(
diff --git a/common/sagas/deterministicWallets.ts b/common/sagas/deterministicWallets.ts
index 4bc4e637..b7ac41e4 100644
--- a/common/sagas/deterministicWallets.ts
+++ b/common/sagas/deterministicWallets.ts
@@ -25,7 +25,7 @@ import { getTokens } from 'selectors/wallet';
 import translate from 'translations';
 import { TokenValue } from 'libs/units';
 
-function* getDeterministicWallets(
+export function* getDeterministicWallets(
   action: GetDeterministicWalletsAction
 ): SagaIterator {
   const { seed, dPath, publicKey, chainCode, limit, offset } = action.payload;
@@ -64,7 +64,7 @@ function* getDeterministicWallets(
 }
 
 // Grab each wallet's main network token, and update it with it
-function* updateWalletValues(): SagaIterator {
+export function* updateWalletValues(): SagaIterator {
   const node: INode = yield select(getNodeLib);
   const wallets: DeterministicWalletData[] = yield select(getWallets);
 
@@ -87,7 +87,7 @@ function* updateWalletValues(): SagaIterator {
 }
 
 // Grab the current desired token, and update the wallet with it
-function* updateWalletTokenValues(): SagaIterator {
+export function* updateWalletTokenValues(): SagaIterator {
   const desiredToken: string = yield select(getDesiredToken);
   if (!desiredToken) {
     return;
diff --git a/common/sagas/notifications.ts b/common/sagas/notifications.ts
index c21521da..e9686dc7 100644
--- a/common/sagas/notifications.ts
+++ b/common/sagas/notifications.ts
@@ -5,7 +5,9 @@ import {
 import { delay, SagaIterator } from 'redux-saga';
 import { call, put, takeEvery } from 'redux-saga/effects';
 
-function* handleNotification(action: ShowNotificationAction): SagaIterator {
+export function* handleNotification(
+  action: ShowNotificationAction
+): SagaIterator {
   const { duration } = action.payload;
   // show forever
   if (duration === 0 || duration === Infinity) {
diff --git a/common/sagas/swap/orders.ts b/common/sagas/swap/orders.ts
index c78754c1..3b111d5f 100644
--- a/common/sagas/swap/orders.ts
+++ b/common/sagas/swap/orders.ts
@@ -31,7 +31,7 @@ import {
 export const getSwap = (state: AppState): SwapState => state.swap;
 const ONE_SECOND = 1000;
 const TEN_SECONDS = ONE_SECOND * 10;
-const BITY_TIMEOUT_MESSAGE = `
+export const BITY_TIMEOUT_MESSAGE = `
     Time has run out.
     If you have already sent, please wait 1 hour.
     If your order has not be processed after 1 hour,
@@ -81,7 +81,7 @@ export function* pollBityOrderStatusSaga(): SagaIterator {
   }
 }
 
-function* postBityOrderCreate(
+export function* postBityOrderCreate(
   action: BityOrderCreateRequestedSwapAction
 ): SagaIterator {
   const payload = action.payload;
diff --git a/common/sagas/swap/rates.ts b/common/sagas/swap/rates.ts
index 640508b9..f5532ddc 100644
--- a/common/sagas/swap/rates.ts
+++ b/common/sagas/swap/rates.ts
@@ -20,7 +20,7 @@ export function* loadBityRates(): SagaIterator {
 }
 
 // Fork our recurring API call, watch for the need to cancel.
-function* handleBityRates(): SagaIterator {
+export function* handleBityRates(): SagaIterator {
   const loadBityRatesTask = yield fork(loadBityRates);
   yield take(TypeKeys.SWAP_STOP_LOAD_BITY_RATES);
   yield cancel(loadBityRatesTask);
diff --git a/common/sagas/wallet.tsx b/common/sagas/wallet.tsx
index f20b3e56..c3bd1e9c 100644
--- a/common/sagas/wallet.tsx
+++ b/common/sagas/wallet.tsx
@@ -39,7 +39,7 @@ import { getNetworkConfig, getNodeLib } from 'selectors/config';
 import { getTokens, getWalletInst } from 'selectors/wallet';
 import translate from 'translations';
 
-function* updateAccountBalance(): SagaIterator {
+export function* updateAccountBalance(): SagaIterator {
   try {
     yield put(setBalancePending());
     const wallet: null | IWallet = yield select(getWalletInst);
@@ -56,7 +56,7 @@ function* updateAccountBalance(): SagaIterator {
   }
 }
 
-function* updateTokenBalances(): SagaIterator {
+export function* updateTokenBalances(): SagaIterator {
   try {
     const node: INode = yield select(getNodeLib);
     const wallet: null | IWallet = yield select(getWalletInst);
@@ -87,7 +87,7 @@ function* updateTokenBalances(): SagaIterator {
   }
 }
 
-function* updateBalances(): SagaIterator {
+export function* updateBalances(): SagaIterator {
   yield fork(updateAccountBalance);
   yield fork(updateTokenBalances);
 }
@@ -122,7 +122,7 @@ export function* unlockKeystore(action: UnlockKeystoreAction): SagaIterator {
   yield put(setWallet(wallet));
 }
 
-function* unlockMnemonic(action: UnlockMnemonicAction): SagaIterator {
+export function* unlockMnemonic(action: UnlockMnemonicAction): SagaIterator {
   let wallet;
   const { phrase, pass, path, address } = action.payload;
 
@@ -139,7 +139,7 @@ function* unlockMnemonic(action: UnlockMnemonicAction): SagaIterator {
 
 // inspired by v3:
 // https://github.com/kvhnuke/etherwallet/blob/417115b0ab4dd2033d9108a1a5c00652d38db68d/app/scripts/controllers/decryptWalletCtrl.js#L311
-function* unlockWeb3(): SagaIterator {
+export function* unlockWeb3(): SagaIterator {
   const failMsg1 = 'Could not connect to MetaMask / Mist.';
   const failMsg2 = 'No accounts found in MetaMask / Mist.';
   const { web3 } = window as any;
@@ -170,7 +170,7 @@ function* unlockWeb3(): SagaIterator {
   }
 }
 
-function* broadcastTx(action: BroadcastTxRequestedAction): SagaIterator {
+export function* broadcastTx(action: BroadcastTxRequestedAction): SagaIterator {
   const signedTx = action.payload.signedTx;
   try {
     const node: INode = yield select(getNodeLib);
diff --git a/spec/sagas/__snapshots__/config.spec.ts.snap b/spec/sagas/__snapshots__/config.spec.ts.snap
new file mode 100644
index 00000000..d67f1a3a
--- /dev/null
+++ b/spec/sagas/__snapshots__/config.spec.ts.snap
@@ -0,0 +1,99 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`handleNodeChangeIntent* should race getCurrentBlock and delay 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "RACE": Object {
+    "lb": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+    "to": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [
+          5000,
+        ],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+  },
+}
+`;
+
+exports[`handleNodeChangeIntent* should select getCustomNodeConfig and match race snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "RACE": Object {
+    "lb": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+    "to": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [
+          5000,
+        ],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+  },
+}
+`;
+
+exports[`pollOfflineStatus* should put showNotification and put toggleOfflineConfig if !pingSucceeded && !isOffline 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Object {
+        "duration": Infinity,
+        "id": 0.001,
+        "level": "danger",
+        "msg": "You’ve lost your connection to the network, check your internet
+            connection or try changing networks from the dropdown at the
+            top right of the page.",
+      },
+      "type": "SHOW_NOTIFICATION",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`pollOfflineStatus* should race pingSucceeded and timeout 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "RACE": Object {
+    "pingSucceeded": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+    "timeout": Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [
+          5000,
+        ],
+        "context": null,
+        "fn": [Function],
+      },
+    },
+  },
+}
+`;
diff --git a/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap b/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
new file mode 100644
index 00000000..45760707
--- /dev/null
+++ b/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
@@ -0,0 +1,216 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getDeterministicWallets* starting from publicKey & chainCode should match put snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Array [
+        Object {
+          "address": "0xa3fA2e024bf9964bb64bDf0afdCa8E3c374a6e41",
+          "index": 0,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x9bbC617740413CDCc41fB69901b252e20fd6Ef61",
+          "index": 1,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xE5297818aEee60385306b7087B024af20524C0FD",
+          "index": 2,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x111789ac11B69fE7EbC307c908Efe7677fd347A2",
+          "index": 3,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x315857914bEd907e0Cf33b5883e599dD6ACc45d2",
+          "index": 4,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xEA316E5BFd9FDeCD81489929ae56DBE6ffaDD22C",
+          "index": 5,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x5De67797cEeCeD707A6868bbE96331ED6f811F06",
+          "index": 6,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xd0cb2Fe67f66DF4D6610E99dDE2ad1B0B5bf4054",
+          "index": 7,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xC7D3A4101bf3Ac1A5aE898784F80D2F9A1E67B62",
+          "index": 8,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x12228Ec03f6aFd6Dad66ceD9C8B9762b3080e319",
+          "index": 9,
+          "tokenValues": Object {},
+        },
+      ],
+      "type": "DW_SET_WALLETS",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`getDeterministicWallets* starting from seed should match put snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Array [
+        Object {
+          "address": "0x2e516E79F439469AA3DD43a93429ee45cBeb77Aa",
+          "index": 0,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x4aE493688184D612aF70C0B04aA7f2C8eE03a1dE",
+          "index": 1,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xbd208C37C747f784EFfA379aA417d867216Ace19",
+          "index": 2,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0x85FF91929287F6cdC801280EAf8fa899e22a02F6",
+          "index": 3,
+          "tokenValues": Object {},
+        },
+        Object {
+          "address": "0xDF5acC09CDf1f966CEc6eFAB3523804E1de65c7f",
+          "index": 4,
+          "tokenValues": Object {},
+        },
+      ],
+      "type": "DW_SET_WALLETS",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`updateWalletTokenValues* should match snapshot for put wallet1 update 1`] = `
+Object {
+  "done": false,
+  "value": Object {
+    "@@redux-saga/IO": true,
+    "PUT": Object {
+      "action": Object {
+        "payload": Object {
+          "address": "0x0",
+          "index": 0,
+          "tokenValues": Object {
+            "OMG": Object {
+              "decimal": 16,
+              "value": "64",
+            },
+          },
+          "value": "64",
+        },
+        "type": "DW_UPDATE_WALLET",
+      },
+      "channel": null,
+    },
+  },
+}
+`;
+
+exports[`updateWalletTokenValues* should match snapshot for put wallet2 update 1`] = `
+Object {
+  "done": false,
+  "value": Object {
+    "@@redux-saga/IO": true,
+    "PUT": Object {
+      "action": Object {
+        "payload": Object {
+          "address": "0x1",
+          "index": 1,
+          "tokenValues": Object {
+            "BAT": Object {
+              "decimal": 16,
+              "value": "64",
+            },
+            "OMG": Object {
+              "decimal": 16,
+              "value": "c8",
+            },
+          },
+          "value": "64",
+        },
+        "type": "DW_UPDATE_WALLET",
+      },
+      "channel": null,
+    },
+  },
+}
+`;
+
+exports[`updateWalletTokenValues* should match snapshot of wallet token balances 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "ALL": Array [
+    Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [
+          "0x0",
+          Object {
+            "address": "0x2",
+            "decimal": 16,
+            "symbol": "OMG",
+          },
+        ],
+        "context": RpcNode {
+          "client": RPCClient {
+            "batch": [Function],
+            "call": [Function],
+            "decorateRequest": [Function],
+            "endpoint": "",
+            "headers": Object {},
+          },
+          "requests": RPCRequests {},
+        },
+        "fn": [Function],
+      },
+    },
+    Object {
+      "@@redux-saga/IO": true,
+      "CALL": Object {
+        "args": Array [
+          "0x1",
+          Object {
+            "address": "0x2",
+            "decimal": 16,
+            "symbol": "OMG",
+          },
+        ],
+        "context": RpcNode {
+          "client": RPCClient {
+            "batch": [Function],
+            "call": [Function],
+            "decorateRequest": [Function],
+            "endpoint": "",
+            "headers": Object {},
+          },
+          "requests": RPCRequests {},
+        },
+        "fn": [Function],
+      },
+    },
+  ],
+}
+`;
diff --git a/spec/sagas/__snapshots__/wallet.spec.tsx.snap b/spec/sagas/__snapshots__/wallet.spec.tsx.snap
new file mode 100644
index 00000000..b5273d10
--- /dev/null
+++ b/spec/sagas/__snapshots__/wallet.spec.tsx.snap
@@ -0,0 +1,228 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`broadcastTx* should match put showNotifiction snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Object {
+        "duration": 0,
+        "id": 0.001,
+        "level": "success",
+        "msg": <TransactionSucceeded
+          blockExplorer="foo"
+          txHash="txHash"
+        />,
+      },
+      "type": "SHOW_NOTIFICATION",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`unlockKeystore* should match put setWallet snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Wallet {
+        "_privKey": Object {
+          "data": Array [
+            139,
+            203,
+            68,
+            86,
+            239,
+            3,
+            86,
+            206,
+            6,
+            44,
+            133,
+            124,
+            239,
+            221,
+            62,
+            209,
+            186,
+            180,
+            84,
+            50,
+            207,
+            118,
+            214,
+            213,
+            52,
+            8,
+            153,
+            207,
+            208,
+            247,
+            2,
+            232,
+          ],
+          "type": "Buffer",
+        },
+        "_pubKey": undefined,
+        "signMessage": [Function],
+        "signRawTransaction": [Function],
+        "unlock": [Function],
+      },
+      "type": "WALLET_SET",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`unlockMnemonic* should match put setWallet snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Wallet {
+        "_privKey": Object {
+          "data": Array [
+            49,
+            233,
+            127,
+            57,
+            92,
+            171,
+            198,
+            250,
+            163,
+            125,
+            138,
+            157,
+            107,
+            177,
+            133,
+            24,
+            124,
+            53,
+            112,
+            78,
+            123,
+            151,
+            108,
+            122,
+            17,
+            14,
+            47,
+            14,
+            171,
+            55,
+            195,
+            68,
+          ],
+          "type": "Buffer",
+        },
+        "_pubKey": undefined,
+        "signMessage": [Function],
+        "signRawTransaction": [Function],
+        "unlock": [Function],
+      },
+      "type": "WALLET_SET",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`unlockPrivateKey should match put setWallet snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Wallet {
+        "_privKey": Object {
+          "data": Array [
+            49,
+            233,
+            127,
+            57,
+            92,
+            171,
+            198,
+            250,
+            163,
+            125,
+            138,
+            157,
+            107,
+            177,
+            133,
+            24,
+            124,
+            53,
+            112,
+            78,
+            123,
+            151,
+            108,
+            122,
+            17,
+            14,
+            47,
+            14,
+            171,
+            55,
+            195,
+            68,
+          ],
+          "type": "Buffer",
+        },
+        "_pubKey": undefined,
+        "signMessage": [Function],
+        "signRawTransaction": [Function],
+        "unlock": [Function],
+      },
+      "type": "WALLET_SET",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`unlockWeb3* should match setWallet snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Web3Wallet {
+        "address": "0xe2EdC95134bbD88443bc6D55b809F7d0C2f0C854",
+        "network": "ETH",
+        "web3": Object {
+          "eth": Object {
+            "getAccounts": [Function],
+          },
+          "network": "1",
+          "version": Object {
+            "getNetwork": [Function],
+          },
+        },
+      },
+      "type": "WALLET_SET",
+    },
+    "channel": null,
+  },
+}
+`;
+
+exports[`updateTokenBalances* should match put setTokenBalances snapshot 1`] = `
+Object {
+  "@@redux-saga/IO": true,
+  "PUT": Object {
+    "action": Object {
+      "payload": Object {
+        "BAT": "c8",
+        "OMG": "64",
+      },
+      "type": "WALLET_SET_TOKEN_BALANCES",
+    },
+    "channel": null,
+  },
+}
+`;
diff --git a/spec/sagas/config.spec.ts b/spec/sagas/config.spec.ts
new file mode 100644
index 00000000..ba622fe3
--- /dev/null
+++ b/spec/sagas/config.spec.ts
@@ -0,0 +1,417 @@
+import { configuredStore } from 'store';
+import { delay } from 'redux-saga';
+import { call, cancel, fork, put, take, select } from 'redux-saga/effects';
+import { cloneableGenerator, createMockTask } from 'redux-saga/utils';
+import {
+  toggleOfflineConfig,
+  changeNode,
+  changeNodeIntent,
+  setLatestBlock
+} from 'actions/config';
+import {
+  pollOfflineStatus,
+  handlePollOfflineStatus,
+  handleNodeChangeIntent,
+  handleTogglePollOfflineStatus,
+  reload,
+  unsetWeb3Node,
+  equivalentNodeOrDefault
+} from 'sagas/config';
+import { NODES } from 'config/data';
+import {
+  getNode,
+  getNodeConfig,
+  getOffline,
+  getForceOffline,
+  getCustomNodeConfigs
+} from 'selectors/config';
+import { INITIAL_STATE as configInitialState } from 'reducers/config';
+import { getWalletInst } from 'selectors/wallet';
+import { Web3Wallet } from 'libs/wallet';
+import { RPCNode } from 'libs/nodes';
+import { showNotification } from 'actions/notifications';
+import translate from 'translations';
+
+// init module
+configuredStore.getState();
+
+describe('pollOfflineStatus*', () => {
+  const nav = navigator as any;
+  const doc = document as any;
+  const data = {} as any;
+  data.gen = cloneableGenerator(pollOfflineStatus)();
+  const node = {
+    lib: {
+      ping: jest.fn()
+    }
+  };
+  const isOffline = true;
+  const isForcedOffline = true;
+  const raceSuccess = {
+    pingSucceeded: true
+  };
+  const raceFailure = {
+    pingSucceeded: false
+  };
+
+  let originalHidden;
+  let originalOnLine;
+  let originalRandom;
+
+  beforeAll(() => {
+    // backup global config
+    originalHidden = document.hidden;
+    originalOnLine = navigator.onLine;
+    originalRandom = Math.random;
+
+    // mock config
+    Object.defineProperty(document, 'hidden', { value: false, writable: true });
+    Object.defineProperty(navigator, 'onLine', { value: true, writable: true });
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    // restore global config
+    Object.defineProperty(document, 'hidden', {
+      value: originalHidden,
+      writable: false
+    });
+    Object.defineProperty(navigator, 'onLine', {
+      value: originalOnLine,
+      writable: false
+    });
+    Math.random = originalRandom;
+  });
+
+  it('should select getNodeConfig', () => {
+    expect(data.gen.next().value).toEqual(select(getNodeConfig));
+  });
+
+  it('should select getOffline', () => {
+    expect(data.gen.next(node).value).toEqual(select(getOffline));
+  });
+
+  it('should select getForceOffline', () => {
+    data.isOfflineClone = data.gen.clone();
+    expect(data.gen.next(isOffline).value).toEqual(select(getForceOffline));
+  });
+
+  it('should be done if isForcedOffline', () => {
+    data.clone1 = data.gen.clone();
+    expect(data.clone1.next(isForcedOffline).done).toEqual(true);
+  });
+
+  it('should call delay if document is hidden', () => {
+    data.clone2 = data.gen.clone();
+    doc.hidden = true;
+
+    expect(data.clone2.next(!isForcedOffline).value).toEqual(call(delay, 1000));
+  });
+
+  it('should race pingSucceeded and timeout', () => {
+    doc.hidden = false;
+    expect(data.gen.next(!isForcedOffline).value).toMatchSnapshot();
+  });
+
+  it('should put showNotification and put toggleOfflineConfig if pingSucceeded && isOffline', () => {
+    expect(data.gen.next(raceSuccess).value).toEqual(
+      put(
+        showNotification(
+          'success',
+          'Your connection to the network has been restored!',
+          3000
+        )
+      )
+    );
+    expect(data.gen.next().value).toEqual(put(toggleOfflineConfig()));
+  });
+
+  it('should put showNotification and put toggleOfflineConfig if !pingSucceeded && !isOffline', () => {
+    nav.onLine = !isOffline;
+
+    data.isOfflineClone.next(!isOffline);
+    data.isOfflineClone.next(!isForcedOffline);
+
+    data.clone3 = data.isOfflineClone.clone();
+
+    expect(data.isOfflineClone.next(raceFailure).value).toMatchSnapshot();
+    expect(data.isOfflineClone.next().value).toEqual(
+      put(toggleOfflineConfig())
+    );
+  });
+
+  it('should call delay when neither case is true', () => {
+    expect(data.clone3.next(raceSuccess).value).toEqual(call(delay, 5000));
+  });
+});
+
+describe('handlePollOfflineStatus*', () => {
+  const gen = handlePollOfflineStatus();
+  const mockTask = createMockTask();
+
+  it('should fork pollOffineStatus', () => {
+    const expectedForkYield = fork(pollOfflineStatus);
+    expect(gen.next().value).toEqual(expectedForkYield);
+  });
+
+  it('should take CONFIG_STOP_POLL_OFFLINE_STATE', () => {
+    expect(gen.next(mockTask).value).toEqual(
+      take('CONFIG_STOP_POLL_OFFLINE_STATE')
+    );
+  });
+
+  it('should cancel pollOfflineStatus', () => {
+    expect(gen.next().value).toEqual(cancel(mockTask));
+  });
+});
+
+describe('handleTogglePollOfflineStatus*', () => {
+  const data = {} as any;
+  data.gen = cloneableGenerator(handleTogglePollOfflineStatus)();
+  const isForcedOffline = true;
+
+  it('should select getForceOffline', () => {
+    expect(data.gen.next().value).toEqual(select(getForceOffline));
+  });
+
+  it('should fork handlePollOfflineStatus when isForcedOffline', () => {
+    data.clone = data.gen.clone();
+    expect(data.gen.next(isForcedOffline).value).toEqual(
+      fork(handlePollOfflineStatus)
+    );
+  });
+
+  it('should call handlePollOfflineStatus when !isForcedOffline', () => {
+    expect(data.clone.next(!isForcedOffline).value).toEqual(
+      call(handlePollOfflineStatus)
+    );
+  });
+
+  it('should be done', () => {
+    expect(data.gen.next().done).toEqual(true);
+    expect(data.clone.next().done).toEqual(true);
+  });
+});
+
+describe('handleNodeChangeIntent*', () => {
+  let originalRandom;
+
+  // normal operation variables
+  const defaultNode = configInitialState.nodeSelection;
+  const defaultNodeConfig = NODES[defaultNode];
+  const newNode = Object.keys(NODES).reduce(
+    (acc, cur) => (NODES[acc].network === defaultNodeConfig.network ? cur : acc)
+  );
+  const newNodeConfig = NODES[newNode];
+  const changeNodeIntentAction = changeNodeIntent(newNode);
+  const truthyWallet = true;
+  const latestBlock = '0xa';
+  const raceSuccess = {
+    lb: latestBlock
+  };
+  const raceFailure = {
+    to: true
+  };
+
+  const data = {} as any;
+  data.gen = cloneableGenerator(handleNodeChangeIntent)(changeNodeIntentAction);
+
+  beforeAll(() => {
+    originalRandom = Math.random;
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    Math.random = originalRandom;
+  });
+
+  it('should select getNode', () => {
+    expect(data.gen.next().value).toEqual(select(getNode));
+  });
+
+  it('should select nodeConfig', () => {
+    expect(data.gen.next(defaultNode).value).toEqual(select(getNodeConfig));
+  });
+
+  it('should race getCurrentBlock and delay', () => {
+    expect(data.gen.next(defaultNodeConfig).value).toMatchSnapshot();
+  });
+
+  it('should put showNotification and put changeNode if timeout', () => {
+    data.clone1 = data.gen.clone();
+    expect(data.clone1.next(raceFailure).value).toEqual(
+      put(showNotification('danger', translate('ERROR_32'), 5000))
+    );
+    expect(data.clone1.next().value).toEqual(
+      put(changeNode(defaultNode, defaultNodeConfig))
+    );
+    expect(data.clone1.next().done).toEqual(true);
+  });
+
+  it('should put setLatestBlock', () => {
+    expect(data.gen.next(raceSuccess).value).toEqual(
+      put(setLatestBlock(latestBlock))
+    );
+  });
+
+  it('should put changeNode', () => {
+    expect(data.gen.next().value).toEqual(
+      put(changeNode(changeNodeIntentAction.payload, newNodeConfig))
+    );
+  });
+
+  it('should select getWalletInst', () => {
+    expect(data.gen.next().value).toEqual(select(getWalletInst));
+  });
+
+  it('should call reload if wallet exists and network is new', () => {
+    data.clone2 = data.gen.clone();
+    expect(data.clone2.next(truthyWallet).value).toEqual(call(reload));
+    expect(data.clone2.next().done).toEqual(true);
+  });
+
+  it('should be done', () => {
+    expect(data.gen.next().done).toEqual(true);
+  });
+
+  // custom node variables
+  const customNodeConfigs = [
+    {
+      name: 'name',
+      url: 'url',
+      port: 443,
+      network: 'network'
+    }
+  ];
+  const customNodeIdFound = 'url:443';
+  const customNodeIdNotFound = 'notFound';
+  const customNodeAction = changeNodeIntent(customNodeIdFound);
+  const customNodeNotFoundAction = changeNodeIntent(customNodeIdNotFound);
+  data.customNode = handleNodeChangeIntent(customNodeAction);
+  data.customNodeNotFound = handleNodeChangeIntent(customNodeNotFoundAction);
+
+  // test custom node
+  it('should select getCustomNodeConfig and match race snapshot', () => {
+    data.customNode.next();
+    data.customNode.next(defaultNode);
+    expect(data.customNode.next(defaultNodeConfig).value).toEqual(
+      select(getCustomNodeConfigs)
+    );
+    expect(data.customNode.next(customNodeConfigs).value).toMatchSnapshot();
+  });
+
+  // test custom node not found
+  it('should select getCustomNodeConfig, put showNotification, put changeNode', () => {
+    data.customNodeNotFound.next();
+    data.customNodeNotFound.next(defaultNode);
+    expect(data.customNodeNotFound.next(defaultNodeConfig).value).toEqual(
+      select(getCustomNodeConfigs)
+    );
+    expect(data.customNodeNotFound.next(customNodeConfigs).value).toEqual(
+      put(
+        showNotification(
+          'danger',
+          `Attempted to switch to unknown node '${
+            customNodeNotFoundAction.payload
+          }'`,
+          5000
+        )
+      )
+    );
+    expect(data.customNodeNotFound.next().value).toEqual(
+      put(changeNode(defaultNode, defaultNodeConfig))
+    );
+    expect(data.customNodeNotFound.next().done).toEqual(true);
+  });
+});
+
+describe('unsetWeb3Node*', () => {
+  const fakeAction = {};
+  const mockNode = 'web3';
+  const mockNodeConfig = { network: 'ETH' };
+  const gen = unsetWeb3Node(fakeAction);
+
+  it('should select getNode', () => {
+    expect(gen.next().value).toEqual(select(getNode));
+  });
+
+  it('should select getNodeConfig', () => {
+    expect(gen.next(mockNode).value).toEqual(select(getNodeConfig));
+  });
+
+  it('should put changeNodeIntent', () => {
+    expect(gen.next(mockNodeConfig).value).toEqual(
+      put(changeNodeIntent(equivalentNodeOrDefault(mockNodeConfig)))
+    );
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+
+  it('should return early if node type is not web3', () => {
+    const gen1 = unsetWeb3Node({ payload: false });
+    gen1.next(); //getNode
+    gen1.next('notWeb3'); //getNodeConfig
+    expect(gen1.next().done).toEqual(true);
+  });
+
+  it('should return early if wallet type is web3', () => {
+    const mockWeb3 = {};
+    const mockAddress = '0x0';
+    const mockNetwork = 'ETH';
+    const mockWeb3Wallet = new Web3Wallet(mockWeb3, mockAddress, mockNetwork);
+    const gen2 = unsetWeb3Node({ payload: mockWeb3Wallet });
+    gen2.next(); //getNode
+    gen2.next('web3'); //getNodeConfig
+    expect(gen2.next().done).toEqual(true);
+  });
+});
+
+describe('equivalentNodeOrDefault', () => {
+  const originalNodeList = Object.keys(NODES);
+  const appDefaultNode = configInitialState.nodeSelection;
+  const mockNodeConfig = {
+    network: 'ETH',
+    service: 'fakeService',
+    lib: new RPCNode('fakeEndpoint'),
+    estimateGas: false
+  };
+
+  afterEach(() => {
+    Object.keys(NODES).forEach(node => {
+      if (originalNodeList.indexOf(node) === -1) {
+        delete NODES[node];
+      }
+    });
+  });
+
+  it('should return node with equivalent network', () => {
+    const node = equivalentNodeOrDefault({
+      ...mockNodeConfig,
+      network: 'Kovan'
+    });
+    expect(NODES[node].network).toEqual('Kovan');
+  });
+
+  it('should return app default if no eqivalent is found', () => {
+    const node = equivalentNodeOrDefault({
+      ...mockNodeConfig,
+      network: 'noEqivalentExists'
+    });
+    expect(node).toEqual(appDefaultNode);
+  });
+
+  it('should ignore web3 from node list', () => {
+    NODES.web3 = {
+      ...mockNodeConfig,
+      network: 'uniqueToWeb3'
+    };
+
+    const node = equivalentNodeOrDefault({
+      ...mockNodeConfig,
+      network: 'uniqueToWeb3'
+    });
+    expect(node).toEqual(appDefaultNode);
+  });
+});
diff --git a/spec/sagas/deterministicWallets.spec.ts b/spec/sagas/deterministicWallets.spec.ts
new file mode 100644
index 00000000..1f480718
--- /dev/null
+++ b/spec/sagas/deterministicWallets.spec.ts
@@ -0,0 +1,220 @@
+import { configuredStore } from 'store';
+import { INode } from 'libs/nodes/INode';
+import { cloneableGenerator } from 'redux-saga/utils';
+import { all, apply, fork, put, select } from 'redux-saga/effects';
+import RpcNode from 'libs/nodes/rpc';
+import { getDesiredToken, getWallets } from 'selectors/deterministicWallets';
+import { getTokens } from 'selectors/wallet';
+import { getNodeLib } from 'selectors/config';
+import * as dWalletActions from 'actions/deterministicWallets';
+import { Token } from 'config/data';
+import {
+  getDeterministicWallets,
+  updateWalletValues,
+  updateWalletTokenValues
+} from 'sagas/deterministicWallets';
+import { TokenValue, Wei } from 'libs/units';
+
+// init module
+configuredStore.getState();
+
+const genWalletData1 = () => ({
+  index: 0,
+  address: '0x0',
+  value: TokenValue('100'),
+  tokenValues: {
+    OMG: {
+      value: TokenValue('100'),
+      decimal: 16
+    }
+  }
+});
+
+const genWalletData2 = () => ({
+  index: 1,
+  address: '0x1',
+  value: TokenValue('100'),
+  tokenValues: {
+    BAT: {
+      value: TokenValue('100'),
+      decimal: 16
+    }
+  }
+});
+
+const genBalances = () => [Wei('100'), Wei('200')];
+
+describe('getDeterministicWallets*', () => {
+  describe('starting from seed', () => {
+    const dWallet = {
+      seed:
+        '1ba4b713b9cf6f91e8e2eea015fc4e107452fa7d8ade32322207967371e5c0fb93289d4dde94ce13625ecc60279d211b6d677c67f54b9e97c7e68afc9ca1b5ea',
+      dPath: "m/44'/60'/0'/0"
+    };
+    const action = dWalletActions.getDeterministicWallets(dWallet);
+    const gen = getDeterministicWallets(action);
+
+    it('should match put snapshot', () => {
+      expect(gen.next().value).toMatchSnapshot();
+    });
+
+    it('should fork updateWalletValues', () => {
+      expect(gen.next().value).toEqual(fork(updateWalletValues));
+    });
+
+    it('should fork updateWalletTokenValues', () => {
+      expect(gen.next().value).toEqual(fork(updateWalletTokenValues));
+    });
+  });
+
+  describe('starting from publicKey & chainCode', () => {
+    const dWallet = {
+      dPath: '',
+      publicKey:
+        '02fcba7ecf41bc7e1be4ee122d9d22e3333671eb0a3a87b5cdf099d59874e1940f',
+      chainCode:
+        '180c998615636cd875aa70c71cfa6b7bf570187a56d8c6d054e60b644d13e9d3',
+      limit: 10,
+      offset: 0
+    };
+
+    const action = dWalletActions.getDeterministicWallets(dWallet);
+    const gen = getDeterministicWallets(action);
+
+    it('should match put snapshot', () => {
+      expect(gen.next().value).toMatchSnapshot();
+    });
+
+    it('should fork updateWalletValues', () => {
+      expect(gen.next().value).toEqual(fork(updateWalletValues));
+    });
+
+    it('should fork updateWalletTokenValues', () => {
+      expect(gen.next().value).toEqual(fork(updateWalletTokenValues));
+    });
+  });
+});
+
+describe('updateWalletValues*', () => {
+  const walletData1 = genWalletData1();
+  const walletData2 = genWalletData2();
+  const wallets: dWalletActions.DeterministicWalletData[] = [
+    walletData1,
+    walletData2
+  ];
+  const balances = genBalances();
+  const node: INode = new RpcNode('');
+  const gen = updateWalletValues();
+
+  it('should select getNodeLib', () => {
+    expect(gen.next().value).toEqual(select(getNodeLib));
+  });
+
+  it('should select getWallets', () => {
+    expect(gen.next(node).value).toEqual(select(getWallets));
+  });
+
+  it('should get balance for all wallets', () => {
+    expect(gen.next(wallets).value).toEqual(
+      all([
+        apply(node, node.getBalance, [walletData1.address]),
+        apply(node, node.getBalance, [walletData2.address])
+      ])
+    );
+  });
+
+  it('should put updateDeterministicWallet for wallet1', () => {
+    expect(gen.next(balances).value).toEqual(
+      put(
+        dWalletActions.updateDeterministicWallet({
+          ...walletData1,
+          value: balances[0]
+        })
+      )
+    );
+  });
+
+  it('should put updateDeterministicWallet for wallet2', () => {
+    expect(gen.next(balances).value).toEqual(
+      put(
+        dWalletActions.updateDeterministicWallet({
+          ...walletData2,
+          value: balances[1]
+        })
+      )
+    );
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('updateWalletTokenValues*', () => {
+  const walletData1 = genWalletData1();
+  const walletData2 = genWalletData2();
+  const wallets: dWalletActions.DeterministicWalletData[] = [
+    walletData1,
+    walletData2
+  ];
+  const node: INode = new RpcNode('');
+  const token1: Token = {
+    address: '0x2',
+    symbol: 'OMG',
+    decimal: 16
+  };
+  const token2: Token = {
+    address: '0x3',
+    symbol: 'BAT',
+    decimal: 16
+  };
+  const tokens = [token1, token2];
+  const tokenBalances = [TokenValue('100'), TokenValue('200')];
+  const desiredToken = 'OMG';
+  const data = {} as any;
+  data.gen = cloneableGenerator(updateWalletTokenValues)();
+
+  it('should select getDesiredToken', () => {
+    expect(data.gen.next().value).toEqual(select(getDesiredToken));
+  });
+
+  it('should return if desired token is falsey', () => {
+    data.clone1 = data.gen.clone();
+    data.clone1.next();
+    expect(data.clone1.next().done).toEqual(true);
+  });
+
+  it('should select getTokens', () => {
+    data.clone2 = data.gen.clone();
+    expect(data.gen.next(desiredToken).value).toEqual(select(getTokens));
+  });
+
+  it('should return if desired token is not amongst tokens', () => {
+    data.clone2.next('fakeDesiredToken');
+    expect(data.clone2.next(tokens).done).toEqual(true);
+  });
+
+  it('should select getNodeLib', () => {
+    expect(data.gen.next(tokens).value).toEqual(select(getNodeLib));
+  });
+
+  it('should select getWallets', () => {
+    expect(data.gen.next(node).value).toEqual(select(getWallets));
+  });
+
+  it('should match snapshot of wallet token balances', () => {
+    expect(data.gen.next(wallets).value).toMatchSnapshot();
+  });
+
+  it('should match snapshot for put wallet1 update', () => {
+    expect(data.gen.next(tokenBalances)).toMatchSnapshot();
+  });
+
+  it('should match snapshot for put wallet2 update', () => {
+    expect(data.gen.next()).toMatchSnapshot();
+  });
+
+  it('should be done', () => {
+    expect(data.gen.next().done).toEqual(true);
+  });
+});
diff --git a/spec/sagas/notifications.spec.ts b/spec/sagas/notifications.spec.ts
new file mode 100644
index 00000000..37a05acc
--- /dev/null
+++ b/spec/sagas/notifications.spec.ts
@@ -0,0 +1,44 @@
+import { delay } from 'redux-saga';
+import { call, put } from 'redux-saga/effects';
+import { handleNotification } from 'sagas/notifications';
+import {
+  ShowNotificationAction,
+  showNotification,
+  closeNotification
+} from 'actions/notifications';
+
+describe('handleNotification*', () => {
+  const level = 'success';
+  const msg = 'msg';
+  const duration = 10;
+  const notificationAction1: ShowNotificationAction = showNotification(
+    level,
+    msg,
+    duration
+  );
+  const notificationAction2: ShowNotificationAction = showNotification(
+    level,
+    msg,
+    0
+  );
+  const gen1 = handleNotification(notificationAction1);
+  const gen2 = handleNotification(notificationAction2);
+
+  it('should call delay with duration', () => {
+    expect(gen1.next(notificationAction1).value).toEqual(call(delay, duration));
+  });
+
+  it('should return when duration is zero', () => {
+    expect(gen2.next(notificationAction2).done).toEqual(true);
+  });
+
+  it('should put closeNotification', () => {
+    expect(gen1.next(notificationAction1).value).toEqual(
+      put(closeNotification(notificationAction1.payload))
+    );
+  });
+
+  it('should be done', () => {
+    expect(gen1.next().done).toEqual(true);
+  });
+});
diff --git a/spec/sagas/swap/orders.spec.ts b/spec/sagas/swap/orders.spec.ts
new file mode 100644
index 00000000..5553e1d9
--- /dev/null
+++ b/spec/sagas/swap/orders.spec.ts
@@ -0,0 +1,371 @@
+import { showNotification } from 'actions/notifications';
+import {
+  bityOrderCreateFailedSwap,
+  bityOrderCreateSucceededSwap,
+  bityOrderCreateRequestedSwap,
+  BityOrderPostResponse,
+  BityOrderInput,
+  BityOrderOutput,
+  BityOrderResponse,
+  changeStepSwap,
+  orderStatusRequestedSwap,
+  orderStatusSucceededSwap,
+  orderTimeSwap,
+  startOrderTimerSwap,
+  startPollBityOrderStatus,
+  stopLoadBityRatesSwap,
+  stopPollBityOrderStatus
+} from 'actions/swap';
+import { getOrderStatus, postOrder } from 'api/bity';
+import {
+  State as SwapState,
+  INITIAL_STATE as INITIAL_SWAP_STATE
+} from 'reducers/swap';
+import { delay } from 'redux-saga';
+import {
+  call,
+  cancel,
+  cancelled,
+  fork,
+  put,
+  select,
+  take,
+  takeEvery
+} from 'redux-saga/effects';
+import {
+  getSwap,
+  pollBityOrderStatus,
+  pollBityOrderStatusSaga,
+  postBityOrderCreate,
+  postBityOrderSaga,
+  bityTimeRemaining,
+  BITY_TIMEOUT_MESSAGE
+} from 'sagas/swap/orders';
+import { cloneableGenerator, createMockTask } from 'redux-saga/utils';
+
+const ONE_SECOND = 1000;
+const TEN_SECONDS = ONE_SECOND * 10;
+const ELEVEN_SECONDS = ONE_SECOND * 11;
+
+const orderInput: BityOrderInput = {
+  amount: 'amount',
+  currency: 'currency',
+  reference: 'reference',
+  status: 'status'
+};
+const orderOutput: BityOrderOutput = {
+  amount: 'amount',
+  currency: 'currency',
+  reference: 'reference',
+  status: 'status'
+};
+
+describe('pollBityOrderStatus*', () => {
+  const data = {} as any;
+  data.gen = cloneableGenerator(pollBityOrderStatus)();
+  const fakeSwap: SwapState = {
+    ...INITIAL_SWAP_STATE,
+    orderId: '1'
+  };
+  const orderResponse: BityOrderResponse = {
+    input: orderInput,
+    output: orderOutput,
+    status: 'status'
+  };
+  const cancelledSwap = 'CANC';
+  const successStatus = {
+    error: null,
+    data: orderResponse
+  };
+  const errorStatus = {
+    error: true,
+    msg: 'error message'
+  };
+  let random;
+
+  beforeAll(() => {
+    random = Math.random;
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    Math.random = random;
+  });
+
+  it('should select getSwap', () => {
+    expect(data.gen.next().value).toEqual(select(getSwap));
+  });
+
+  it('should put orderStatusRequestedSwap', () => {
+    expect(data.gen.next(fakeSwap).value).toEqual(
+      put(orderStatusRequestedSwap())
+    );
+  });
+
+  it('should call getOrderStatus with swap.orderId', () => {
+    expect(data.gen.next().value).toEqual(
+      call(getOrderStatus, fakeSwap.orderId)
+    );
+  });
+
+  it('should put showNotfication on error', () => {
+    data.clone = data.gen.clone();
+    expect(data.clone.next(errorStatus).value).toEqual(
+      put(
+        showNotification(
+          'danger',
+          `Bity Error: ${errorStatus.msg}`,
+          TEN_SECONDS
+        )
+      )
+    );
+  });
+
+  it('should put orderStatusSucceededSwap', () => {
+    expect(data.gen.next(successStatus).value).toEqual(
+      put(orderStatusSucceededSwap(successStatus.data))
+    );
+  });
+
+  it('should call delay for 5 seconds', () => {
+    expect(data.gen.next().value).toEqual(call(delay, ONE_SECOND * 5));
+  });
+
+  it('should select getSwap', () => {
+    expect(data.gen.next().value).toEqual(select(getSwap));
+  });
+
+  it('should break loop if swap is cancelled', () => {
+    data.clone2 = data.gen.clone();
+    expect(data.clone2.next(cancelledSwap).value).toEqual(cancelled());
+    expect(data.clone2.next().done).toEqual(true);
+  });
+
+  it('should restart loop', () => {
+    expect(data.gen.next(fakeSwap).value).toEqual(
+      put(orderStatusRequestedSwap())
+    );
+  });
+});
+
+describe('pollBityOrderStatusSaga*', () => {
+  const data = {} as any;
+  data.gen = cloneableGenerator(pollBityOrderStatusSaga)();
+  const mockedTask = createMockTask();
+
+  it('should take SWAP_START_POLL_BITY_ORDER_STATUS', () => {
+    expect(data.gen.next().value).toEqual(
+      take('SWAP_START_POLL_BITY_ORDER_STATUS')
+    );
+  });
+
+  it('should be done if order status is false', () => {
+    data.clone = data.gen.clone();
+    expect(data.clone.next(false).done).toEqual(true);
+  });
+
+  it('should fork pollBityOrderStatus', () => {
+    expect(data.gen.next(true).value).toEqual(fork(pollBityOrderStatus));
+  });
+
+  it('should take SWAP_STOP_POLL_BITY_ORDER_STATUS', () => {
+    expect(data.gen.next(mockedTask).value).toEqual(
+      take('SWAP_STOP_POLL_BITY_ORDER_STATUS')
+    );
+  });
+
+  it('should cancel pollBityOrderStatusTask', () => {
+    expect(data.gen.next().value).toEqual(cancel(mockedTask));
+  });
+});
+
+describe('postBityOrderCreate*', () => {
+  const amount = 100;
+  const destinationAddress = '0x0';
+  const pair = 'BTC_ETH';
+  const action = bityOrderCreateRequestedSwap(amount, destinationAddress, pair);
+  const orderResp: BityOrderPostResponse = {
+    payment_address: '0x0',
+    status: 'status',
+    input: orderInput,
+    output: orderOutput,
+    timestamp_created: 'timestamp_created',
+    validFor: 10,
+    id: '0'
+  };
+  const successOrder = { error: false, data: orderResp };
+  const errorOrder = { error: true, msg: 'error msg' };
+  const connectionErrMsg =
+    'Connection Error. Please check the developer console for more details and/or contact support';
+
+  const data = {} as any;
+  data.gen = cloneableGenerator(postBityOrderCreate)(action);
+
+  let random;
+  beforeAll(() => {
+    random = Math.random;
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    Math.random = random;
+  });
+
+  it('should put stopLoadBityRatesSwap', () => {
+    expect(data.gen.next().value).toEqual(put(stopLoadBityRatesSwap()));
+  });
+
+  it('should call postOrder', () => {
+    data.clone1 = data.gen.clone();
+    expect(data.gen.next().value).toEqual(
+      call(postOrder, amount, destinationAddress, action.payload.mode, pair)
+    );
+  });
+
+  it('should put bityOrderCreateSucceededSwap', () => {
+    data.clone2 = data.gen.clone();
+    expect(data.gen.next(successOrder).value).toEqual(
+      put(bityOrderCreateSucceededSwap(successOrder.data))
+    );
+  });
+
+  it('should put changeStepSwap', () => {
+    expect(data.gen.next().value).toEqual(put(changeStepSwap(3)));
+  });
+
+  it('should put startOrderTimerSwap', () => {
+    expect(data.gen.next().value).toEqual(put(startOrderTimerSwap()));
+  });
+
+  it('should put startPollBityOrderStatus', () => {
+    expect(data.gen.next().value).toEqual(put(startPollBityOrderStatus()));
+  });
+
+  // failure modes
+  it('should handle a connection exeception', () => {
+    expect(data.clone1.throw().value).toEqual(
+      put(showNotification('danger', connectionErrMsg, TEN_SECONDS))
+    );
+    expect(data.clone1.next().value).toEqual(put(bityOrderCreateFailedSwap()));
+    expect(data.clone1.next().done).toEqual(true);
+  });
+
+  it('should handle an errored order', () => {
+    expect(data.clone2.next(errorOrder).value).toEqual(
+      put(
+        showNotification('danger', `Bity Error: ${errorOrder.msg}`, TEN_SECONDS)
+      )
+    );
+    expect(data.clone2.next().value).toEqual(put(bityOrderCreateFailedSwap()));
+  });
+});
+
+describe('postBityOrderSaga*', () => {
+  const gen = postBityOrderSaga();
+
+  it('should takeEvery SWAP_ORDER_CREATE_REQUESTED', () => {
+    expect(gen.next().value).toEqual(
+      takeEvery('SWAP_ORDER_CREATE_REQUESTED', postBityOrderCreate)
+    );
+  });
+});
+
+describe('bityTimeRemaining*', () => {
+  const orderTime = new Date().toISOString();
+  const orderTimeExpired = new Date().getTime() - ELEVEN_SECONDS;
+  const swapValidFor = 10; //seconds
+  const swapOrder = {
+    ...INITIAL_SWAP_STATE,
+    orderTimestampCreatedISOString: orderTime,
+    validFor: swapValidFor
+  };
+  const swapOrderExpired = {
+    ...INITIAL_SWAP_STATE,
+    orderTimestampCreatedISOString: new Date(orderTimeExpired).toISOString(),
+    validFor: swapValidFor
+  };
+  let random;
+
+  const data = {} as any;
+  data.gen = cloneableGenerator(bityTimeRemaining)();
+
+  beforeAll(() => {
+    random = Math.random;
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    Math.random = random;
+  });
+
+  it('should take SWAP_ORDER_START_TIMER', () => {
+    expect(data.gen.next().value).toEqual(take('SWAP_ORDER_START_TIMER'));
+  });
+
+  it('should break while loop when take SWAP_ORDER_START_TIMER is false', () => {
+    data.clone1 = data.gen.clone();
+    expect(data.clone1.next().done).toEqual(true);
+  });
+
+  it('should call delay of one second', () => {
+    expect(data.gen.next(true).value).toEqual(call(delay, ONE_SECOND));
+  });
+
+  it('should select getSwap', () => {
+    expect(data.gen.next().value).toEqual(select(getSwap));
+  });
+
+  it('should handle if isValidUntil.isAfter(now)', () => {
+    data.clone2 = data.gen.clone();
+    const result = data.clone2.next(swapOrder).value;
+    expect(result).toHaveProperty('PUT');
+    expect(result.PUT.action.type).toEqual('SWAP_ORDER_TIME');
+    expect(result.PUT.action.payload).toBeGreaterThan(0);
+  });
+
+  it('should handle an OPEN order state', () => {
+    const openOrder = { ...swapOrderExpired, orderStatus: 'OPEN' };
+    data.OPEN = data.gen.clone();
+    expect(data.OPEN.next(openOrder).value).toEqual(put(orderTimeSwap(0)));
+    expect(data.OPEN.next().value).toEqual(put(stopPollBityOrderStatus()));
+    expect(data.OPEN.next().value).toEqual(
+      put({ type: 'SWAP_STOP_LOAD_BITY_RATES' })
+    );
+    expect(data.OPEN.next().value).toEqual(
+      put(showNotification('danger', BITY_TIMEOUT_MESSAGE, Infinity))
+    );
+  });
+
+  it('should handle a CANC order state', () => {
+    const cancOrder = { ...swapOrderExpired, orderStatus: 'CANC' };
+    data.CANC = data.gen.clone();
+    expect(data.CANC.next(cancOrder).value).toEqual(
+      put(stopPollBityOrderStatus())
+    );
+    expect(data.CANC.next().value).toEqual(
+      put({ type: 'SWAP_STOP_LOAD_BITY_RATES' })
+    );
+    expect(data.CANC.next().value).toEqual(
+      put(showNotification('danger', BITY_TIMEOUT_MESSAGE, Infinity))
+    );
+  });
+
+  it('should handle a RCVE order state', () => {
+    const rcveOrder = { ...swapOrderExpired, orderStatus: 'RCVE' };
+    data.RCVE = data.gen.clone();
+    expect(data.RCVE.next(rcveOrder).value).toEqual(
+      put(showNotification('warning', BITY_TIMEOUT_MESSAGE, Infinity))
+    );
+  });
+
+  it('should handle a FILL order state', () => {
+    const fillOrder = { ...swapOrderExpired, orderStatus: 'FILL' };
+    data.FILL = data.gen.clone();
+    expect(data.FILL.next(fillOrder).value).toEqual(
+      put(stopPollBityOrderStatus())
+    );
+    expect(data.FILL.next().value).toEqual(
+      put({ type: 'SWAP_STOP_LOAD_BITY_RATES' })
+    );
+  });
+});
diff --git a/spec/sagas/swap/rates.spec.ts b/spec/sagas/swap/rates.spec.ts
new file mode 100644
index 00000000..d84f2d7f
--- /dev/null
+++ b/spec/sagas/swap/rates.spec.ts
@@ -0,0 +1,86 @@
+import { showNotification } from 'actions/notifications';
+import { loadBityRatesSucceededSwap } from 'actions/swap';
+import { getAllRates } from 'api/bity';
+import { delay } from 'redux-saga';
+import { call, cancel, fork, put, take, takeLatest } from 'redux-saga/effects';
+import { createMockTask } from 'redux-saga/utils';
+import { Pairs } from 'actions/swap/actionTypes';
+import {
+  loadBityRates,
+  handleBityRates,
+  getBityRatesSaga
+} from 'sagas/swap/rates';
+
+describe('loadBityRates*', () => {
+  const gen1 = loadBityRates();
+  const gen2 = loadBityRates();
+  const rates: Pairs = {
+    ETHBTC: 1,
+    ETHREP: 2,
+    BTCETH: 3,
+    BTCREP: 4
+  };
+  let random;
+
+  beforeAll(() => {
+    random = Math.random;
+    Math.random = () => 0.001;
+  });
+
+  afterAll(() => {
+    Math.random = random;
+  });
+
+  it('should call getAllRates', () => {
+    expect(gen1.next().value).toEqual(call(getAllRates));
+  });
+
+  it('should put loadBityRatesSucceededSwap', () => {
+    expect(gen1.next(rates).value).toEqual(
+      put(loadBityRatesSucceededSwap(rates))
+    );
+  });
+
+  it('should call delay for 5 seconds', () => {
+    expect(gen1.next().value).toEqual(call(delay, 30000));
+  });
+
+  it('should handle an exception', () => {
+    const err = { message: 'error' };
+    gen2.next();
+    expect((gen2 as any).throw(err).value).toEqual(
+      put(showNotification('danger', err.message))
+    );
+  });
+});
+
+describe('handleBityRates*', () => {
+  const gen = handleBityRates();
+  const mockTask = createMockTask();
+
+  it('should fork loadBityRates', () => {
+    expect(gen.next().value).toEqual(fork(loadBityRates));
+  });
+
+  it('should take SWAP_STOP_LOAD_BITY_RATES', () => {
+    expect(gen.next(mockTask).value).toEqual(take('SWAP_STOP_LOAD_BITY_RATES'));
+  });
+
+  it('should cancel loadBityRatesTask', () => {
+    expect(gen.next().value).toEqual(cancel(mockTask));
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('getBityRatesSaga*', () => {
+  const gen = getBityRatesSaga();
+
+  it('should takeLatest SWAP_LOAD_RATES_REQUESTED', () => {
+    expect(gen.next().value).toEqual(
+      takeLatest('SWAP_LOAD_BITY_RATES_REQUESTED', handleBityRates)
+    );
+  });
+});
diff --git a/spec/sagas/wallet.spec.tsx b/spec/sagas/wallet.spec.tsx
new file mode 100644
index 00000000..92532dae
--- /dev/null
+++ b/spec/sagas/wallet.spec.tsx
@@ -0,0 +1,327 @@
+import { configuredStore } from 'store';
+import RpcNode from 'libs/nodes/rpc';
+import {
+  broadcastTxSucceded,
+  setBalanceFullfilled,
+  setBalancePending,
+  unlockPrivateKey as unlockPrivateKeyActionGen,
+  unlockKeystore as unlockKeystoreActionGen,
+  unlockMnemonic as unlockMnemonicActionGen,
+  broadcastTx as broadcastTxActionGen
+} from 'actions/wallet';
+import { Wei } from 'libs/units';
+import { changeNodeIntent } from 'actions/config';
+import { INode } from 'libs/nodes/INode';
+import { initWeb3Node, Token } from 'config/data';
+import { apply, call, cps, fork, put, select } from 'redux-saga/effects';
+import { getNetworkConfig, getNodeLib } from 'selectors/config';
+import { getTokens, getWalletInst } from 'selectors/wallet';
+import {
+  updateAccountBalance,
+  updateTokenBalances,
+  updateBalances,
+  unlockPrivateKey,
+  unlockKeystore,
+  unlockMnemonic,
+  unlockWeb3,
+  broadcastTx
+} from 'sagas/wallet';
+import { PrivKeyWallet } from 'libs/wallet/non-deterministic';
+
+// init module
+configuredStore.getState();
+
+const pkey = '31e97f395cabc6faa37d8a9d6bb185187c35704e7b976c7a110e2f0eab37c344';
+const wallet = PrivKeyWallet(Buffer.from(pkey, 'hex'));
+const address = '0xe2EdC95134bbD88443bc6D55b809F7d0C2f0C854';
+const balance = Wei('100');
+const node: INode = new RpcNode('');
+
+const token1: Token = {
+  address: '0x2',
+  symbol: 'OMG',
+  decimal: 16
+};
+const token2: Token = {
+  address: '0x3',
+  symbol: 'BAT',
+  decimal: 16
+};
+const tokens = [token1, token2];
+const balances = [Wei('100'), Wei('200')];
+
+const utcKeystore = {
+  version: 3,
+  id: 'cb788af4-993d-43ad-851b-0d2031e52c61',
+  address: '25a24679f35e447f778cf54a3823facf39904a63',
+  Crypto: {
+    ciphertext:
+      '4193915c560835d00b2b9ff5dd20f3e13793b2a3ca8a97df649286063f27f707',
+    cipherparams: {
+      iv: 'dccb8c009b11d1c6226ba19b557dce4c'
+    },
+    cipher: 'aes-128-ctr',
+    kdf: 'scrypt',
+    kdfparams: {
+      dklen: 32,
+      salt: '037a53e520f2d00fb70f02f39b31b77374de9e0e1d35fd7cbe9c8a8b21d6b0ab',
+      n: 1024,
+      r: 8,
+      p: 1
+    },
+    mac: '774fbe4bf35e7e28df15cd6c3546e74ce6608e9ab68a88d50227858a3b05769a'
+  }
+};
+
+// necessary so we can later inject a mocked web3 to the window
+declare var window: any;
+
+describe('updateAccountBalance*', () => {
+  const gen1 = updateAccountBalance();
+  const gen2 = updateAccountBalance();
+
+  it('should put setBalancePending', () => {
+    expect(gen1.next().value).toEqual(put(setBalancePending()));
+  });
+
+  it('should select getWalletInst', () => {
+    expect(gen1.next().value).toEqual(select(getWalletInst));
+  });
+
+  it('should return if wallet is falsey', () => {
+    gen2.next();
+    gen2.next();
+    gen2.next(null);
+    expect(gen2.next().done).toBe(true);
+  });
+
+  it('should select getNodeLib', () => {
+    expect(gen1.next(wallet).value).toEqual(select(getNodeLib));
+  });
+
+  it('should apply wallet.getAddressString', () => {
+    expect(gen1.next(node).value).toEqual(
+      apply(wallet, wallet.getAddressString)
+    );
+  });
+
+  it('should apply node.getBalance', () => {
+    expect(gen1.next(address).value).toEqual(
+      apply(node, node.getBalance, [address])
+    );
+  });
+
+  it('should put setBalanceFulfilled', () => {
+    expect(gen1.next(balance).value).toEqual(
+      put(setBalanceFullfilled(balance))
+    );
+  });
+
+  it('should be done', () => {
+    expect(gen1.next().done).toEqual(true);
+  });
+});
+
+describe('updateTokenBalances*', () => {
+  const gen1 = updateTokenBalances();
+  const gen2 = updateTokenBalances();
+  const gen3 = updateTokenBalances();
+
+  it('should select getNodeLib', () => {
+    expect(gen1.next().value).toEqual(select(getNodeLib));
+  });
+
+  it('should select getWalletInst', () => {
+    expect(gen1.next(node).value).toEqual(select(getWalletInst));
+  });
+
+  it('should select getTokens', () => {
+    expect(gen1.next(wallet).value).toEqual(select(getTokens));
+  });
+
+  it('should return if wallet is falsey', () => {
+    gen2.next();
+    gen2.next(node);
+    gen2.next(null);
+    expect(gen2.next().done).toEqual(true);
+  });
+
+  it('should return if node is falsey', () => {
+    gen3.next();
+    gen3.next(null);
+    gen3.next(wallet);
+    expect(gen3.next().done).toEqual(true);
+  });
+
+  it('should apply wallet.getAddressString', () => {
+    expect(gen1.next(tokens).value).toEqual(
+      apply(wallet, wallet.getAddressString)
+    );
+  });
+
+  it('should apply node.getTokenBalances', () => {
+    expect(gen1.next(address).value).toEqual(
+      apply(node, node.getTokenBalances, [address, tokens])
+    );
+  });
+
+  it('should match put setTokenBalances snapshot', () => {
+    expect(gen1.next(balances).value).toMatchSnapshot();
+  });
+
+  it('should be done', () => {
+    expect(gen1.next().done).toEqual(true);
+  });
+});
+
+describe('updateBalances*', () => {
+  const gen = updateBalances();
+
+  it('should fork updateAccountBalance', () => {
+    expect(gen.next().value).toEqual(fork(updateAccountBalance));
+  });
+
+  it('should fork updateTokenBalances', () => {
+    expect(gen.next().value).toEqual(fork(updateTokenBalances));
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('unlockPrivateKey', () => {
+  const value = {
+    key: pkey,
+    password: ''
+  };
+  const action = unlockPrivateKeyActionGen(value);
+  const gen = unlockPrivateKey(action);
+
+  it('should match put setWallet snapshot', () => {
+    expect(gen.next().value).toMatchSnapshot();
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('unlockKeystore*', () => {
+  const action = unlockKeystoreActionGen({
+    file: JSON.stringify(utcKeystore),
+    password: 'testtesttest'
+  });
+  const gen = unlockKeystore(action);
+
+  it('should match put setWallet snapshot', () => {
+    expect(gen.next().value).toMatchSnapshot();
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('unlockMnemonic*', () => {
+  const action = unlockMnemonicActionGen({
+    phrase:
+      'first catalog away faculty jelly now life kingdom pigeon raise gain accident',
+    pass: '',
+    path: "m/44'/60'/0'/0/8",
+    address: '0xe2EdC95134bbD88443bc6D55b809F7d0C2f0C854'
+  });
+  const gen = unlockMnemonic(action);
+
+  it('should match put setWallet snapshot', () => {
+    expect(gen.next().value).toMatchSnapshot();
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+});
+
+describe('unlockWeb3*', () => {
+  const gen = unlockWeb3();
+  const accounts = [address];
+
+  window.web3 = {
+    eth: {
+      getAccounts: jest.fn(cb => cb(undefined, accounts))
+    },
+    version: {
+      getNetwork: jest.fn(cb => cb(undefined, '1'))
+    },
+    network: '1'
+  };
+
+  beforeAll(async done => {
+    await initWeb3Node();
+    done();
+  });
+
+  afterAll(() => {
+    delete window.web3;
+  });
+
+  it('should call initWeb3Node', () => {
+    expect(gen.next().value).toEqual(call(initWeb3Node));
+  });
+
+  it('should cps web3.eth.getAccounts', () => {
+    expect(gen.next().value).toEqual(cps(window.web3.eth.getAccounts));
+  });
+
+  it('should put changeNodeIntent', () => {
+    expect(gen.next(accounts).value).toEqual(put(changeNodeIntent('web3')));
+  });
+
+  it('should match setWallet snapshot', () => {
+    expect(gen.next().value).toMatchSnapshot();
+  });
+});
+
+describe('broadcastTx*', () => {
+  const signedTx = 'signedTx';
+  const txHash = 'txHash';
+  const action = broadcastTxActionGen(signedTx);
+  const gen = broadcastTx(action);
+  const networkConfig = {
+    blockExplorer: 'foo'
+  };
+  let random;
+
+  beforeAll(() => {
+    random = Math.random;
+    Math.random = jest.fn(() => 0.001);
+  });
+
+  afterAll(() => {
+    Math.random = random;
+  });
+
+  it('should select getNodeLib', () => {
+    expect(gen.next().value).toEqual(select(getNodeLib));
+  });
+
+  it('should select getNetworkConfig', () => {
+    expect(gen.next(node).value).toEqual(select(getNetworkConfig));
+  });
+
+  it('should apply node.sendRawTx', () => {
+    expect(gen.next(networkConfig).value).toEqual(
+      apply(node, node.sendRawTx, [signedTx])
+    );
+  });
+
+  it('should match put showNotifiction snapshot', () => {
+    expect(gen.next(txHash).value).toMatchSnapshot();
+  });
+
+  it('should put broadcastTxSucceded', () => {
+    expect(gen.next().value).toEqual(
+      put(broadcastTxSucceded(txHash, signedTx))
+    );
+  });
+});

From a40b22fc688491c986d8c2d6eeb26c245e6ded7b Mon Sep 17 00:00:00 2001
From: skubakdj <skubakdj@gmail.com>
Date: Wed, 29 Nov 2017 23:26:27 -0500
Subject: [PATCH 37/46] Modified File Blacklist for Travis (#448)

---
 .travis.yml                       |   2 +
 common/freezer.ts                 | 176 ++++++++++++++++++++++++++++++
 package.json                      |   2 +
 webpack_config/webpack.freezer.js |  22 ++++
 4 files changed, 202 insertions(+)
 create mode 100644 common/freezer.ts
 create mode 100644 webpack_config/webpack.freezer.js

diff --git a/.travis.yml b/.travis.yml
index 2d64e8d6..8da34db3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,3 +19,5 @@ script:
 - npm run test
 - npm run tslint
 - npm run tscheck
+- npm run freezer
+- npm run freezer:validate
diff --git a/common/freezer.ts b/common/freezer.ts
new file mode 100644
index 00000000..34b74724
--- /dev/null
+++ b/common/freezer.ts
@@ -0,0 +1,176 @@
+import { spawn } from 'child_process';
+import * as path from 'path';
+import * as fs from 'fs';
+
+const PROJECT_BASE = path.resolve('./');
+const ORACLE_BRANCH = 'develop';
+const GET_PACKAGE_CMD = `git show ${ORACLE_BRANCH}:package.json`;
+const GET_DIFF_CMD = `git diff origin/${ORACLE_BRANCH}`;
+
+const newFileRegEx = /^\+\+\+ b\//;
+const frozenFolderRegEx = /\/\*$/;
+
+const start = async () => {
+  try {
+    const packageStr = await runShCommand(GET_PACKAGE_CMD);
+    const diff = await runShCommand(GET_DIFF_CMD);
+    const { frozen } = JSON.parse(packageStr);
+
+    if (frozen === undefined) {
+      console.log(
+        `Freezer: No config found in package.json on branch ${
+          ORACLE_BRANCH
+        }. Exiting.`
+      );
+      return;
+    }
+
+    const newFiles = getNewFiles(diff);
+    const frozenFiles = getFrozenFiles(frozen);
+    const frozenFolders = getFrozenFolders(frozen);
+
+    ensureNewFilesAreNotFrozen(newFiles, frozenFiles, frozenFolders);
+  } catch (err) {
+    console.log(err.message);
+    exit();
+  }
+};
+
+const ensureNewFilesAreNotFrozen = (
+  newFiles: string[],
+  frozenFiles: string[],
+  frozenFolders: string[]
+): void => {
+  const errors = newFiles
+    .map(file => {
+      if (frozenFiles.indexOf(file) !== -1) {
+        return `"${file}" is frozen`;
+      }
+      if (isFileInFrozenFolders(file, frozenFolders)) {
+        return `"${file}" is in a frozen folder`;
+      }
+    })
+    .filter(err => err);
+
+  if (errors.length) {
+    throw new Error(`Frozen files have been modified:\n${errors.join('\n')}`);
+  } else {
+    console.log('Freezer: no frozen files modified.');
+  }
+};
+
+const isFileInFrozenFolders = (file: string, folders: string[]): boolean =>
+  folders.reduce((isFrozen, folder) => {
+    if (isFrozen) {
+      return isFrozen;
+    }
+    const folderSplit = folder.replace(frozenFolderRegEx, '').split('/');
+
+    const fileSplit = file.split('/').slice(0, folderSplit.length);
+
+    return JSON.stringify(folderSplit) === JSON.stringify(fileSplit);
+  }, false);
+
+const getFrozenFiles = (frozen: string[]): string[] =>
+  frozen.filter(f => !frozenFolderRegEx.test(f));
+
+const getFrozenFolders = (frozen: string[]): string[] =>
+  frozen.filter(f => frozenFolderRegEx.test(f));
+
+const getNewFiles = (diff: string): string[] =>
+  diff
+    .split('\n')
+    .filter(line => newFileRegEx.test(line))
+    .map(line => line.replace(newFileRegEx, ''));
+
+const runShCommand = (cmd: string): Promise<string> =>
+  new Promise((resolve, reject) => {
+    const sh = spawn('sh', ['-c', cmd]);
+    const stdout: string[] = [];
+    const stderr: string[] = [];
+
+    sh.stdout.on('data', data => {
+      stdout.push(data.toString());
+    });
+    sh.stderr.on('data', data => {
+      stderr.push(data.toString());
+    });
+    sh.on('close', code => {
+      if (code !== 0) {
+        console.error(stderr.join(''));
+        reject(`Child process closed with code ${code}`);
+      }
+      resolve(stdout.join(''));
+    });
+  });
+
+const isTravisPushJob = () => {
+  const prb = process.env.TRAVIS_PULL_REQUEST_BRANCH;
+  return typeof prb === 'string' && prb.length === 0;
+};
+
+const exit = () => setTimeout(() => process.exit(1), 100);
+
+// check to make sure that all of the freezer config in
+// the "frozen" property of package.json is valid
+const validateConfig = () => {
+  try {
+    const packagePath = path.resolve(PROJECT_BASE, 'package.json');
+    const { frozen } = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+
+    if (frozen === undefined) {
+      console.log(
+        `Freezer: No config found in package.json on branch ${
+          ORACLE_BRANCH
+        }. Exiting.`
+      );
+      return;
+    }
+
+    if (!Array.isArray(frozen)) {
+      throw new Error(`Property "frozen" is not an array`);
+    }
+
+    const errors = frozen
+      .map(filePath => {
+        const isFolder = frozenFolderRegEx.test(filePath);
+        const fullPath = isFolder
+          ? path.resolve(PROJECT_BASE, filePath.replace(frozenFolderRegEx, ''))
+          : path.resolve(PROJECT_BASE, filePath);
+
+        if (!fs.existsSync(fullPath)) {
+          return `"${filePath}" does not exist`;
+        }
+
+        const stats = fs.lstatSync(fullPath);
+
+        if (isFolder) {
+          if (!stats.isDirectory()) {
+            return `"${filePath}" is not a folder`;
+          }
+        } else {
+          if (!stats.isFile()) {
+            return `"${filePath}" is not a file`;
+          }
+        }
+      })
+      .filter(err => err);
+
+    if (errors.length) {
+      throw new Error(errors.join('\n'));
+    } else {
+      console.log('Freezer: Config is valid.');
+    }
+  } catch (err) {
+    console.log(`Freezer: Invalid config on package.json:\n${err.message}`);
+    exit();
+  }
+};
+
+if (isTravisPushJob()) {
+  console.log('Freezer: Travis push job detected. Exiting.');
+} else if (process.argv[2] === '--validate') {
+  validateConfig();
+} else {
+  start();
+}
diff --git a/package.json b/package.json
index 5f64fa4b..db241ccb 100644
--- a/package.json
+++ b/package.json
@@ -109,6 +109,8 @@
     "webpack-hot-middleware": "2.21.0"
   },
   "scripts": {
+    "freezer": "webpack --config=./webpack_config/webpack.freezer.js && node ./dist/freezer.js",
+    "freezer:validate": "npm run freezer -- --validate",    
     "db": "nodemon ./db",
     "build": "webpack --config webpack_config/webpack.prod.js",
     "prebuild": "check-node-version --package",
diff --git a/webpack_config/webpack.freezer.js b/webpack_config/webpack.freezer.js
new file mode 100644
index 00000000..9aba6d19
--- /dev/null
+++ b/webpack_config/webpack.freezer.js
@@ -0,0 +1,22 @@
+// Compile freezer using the (mostly) same webpack config
+'use strict';
+const baseConfig = require('./webpack.base');
+
+const freezerConfig = Object.assign({}, baseConfig, {
+  // Remove the cruft we don't need
+  plugins: undefined,
+  target: undefined,
+  performance: undefined,
+  module: {
+    // Typescript loader
+    loaders: [baseConfig.module.loaders[0]]
+  },
+
+  // Point at freezer, make sure it's setup to run in node
+  target: 'node',
+  entry: {
+    'freezer': './common/freezer'
+  }
+});
+
+module.exports = freezerConfig;

From 980366694c09989b7180f4a0acba823025a06dcd Mon Sep 17 00:00:00 2001
From: Eddie Wang <eddie@eddiewang.me>
Date: Thu, 30 Nov 2017 00:35:17 -0500
Subject: [PATCH 38/46] RPC Error Handling (#384)

* create ensureOkResponse and check against RPC responses

* Merge with develop branch

* added single unit test

* main nodes added

* getBalance method

* remove console.log

* minor conflict fix - readd polyfill to integration test

* added two more method tests

* seperate rpcnode from extended classes

* fixes etherscan

* added all tests

* revert files with only formatting changes

* remove console.logs - still need to update snapshot before tests will pass

* updated snapshot due to RpcNode fixes for Infura and Etherscan nodes

* added RpcNodeTest config so we don't rely on constants in code

* undo formatting changes

* Multiple fixes to error handling tokens.

* Fixed TSC errors

* Minor styling edit - change async func to promise

* changed shape of tokenBalances

* change balance type back to stricter TokenValue type

* remove package.json change and include test for error state.

* minor change removing unneeded line of code

* added longer timeout for api

* update snapshot
---
 common/actions/wallet/actionCreators.ts       |  5 +-
 common/actions/wallet/actionTypes.ts          |  5 +-
 common/api/bity.ts                            | 10 +-
 .../BalanceSidebar/EquivalentValues.tsx       |  2 +
 common/config/data.ts                         |  1 +
 common/libs/nodes/INode.ts                    | 10 +-
 common/libs/nodes/etherscan/client.ts         |  8 +-
 common/libs/nodes/etherscan/requests.ts       |  4 +-
 common/libs/nodes/etherscan/types.ts          |  4 +-
 common/libs/nodes/infura/client.ts            |  4 +-
 common/libs/nodes/rpc/client.ts               | 18 +++-
 common/libs/nodes/rpc/index.ts                | 97 +++++++++++--------
 common/libs/nodes/web3/index.ts               | 29 ++++--
 common/libs/validators.ts                     | 66 +++++++++++++
 common/reducers/wallet.ts                     |  5 +-
 common/selectors/wallet.ts                    |  6 +-
 common/utils/printElement.ts                  |  6 +-
 jest_config/setupJest.js                      | 19 +++-
 package.json                                  |  2 +
 spec/config/RpcNodeTestConfig.js              |  5 +
 spec/config/data.spec.ts                      | 93 ++++++++++++++++++
 .../SendTransaction.spec.tsx.snap             |  1 +
 spec/reducers/wallet.spec.ts                  | 11 ++-
 .../deterministicWallets.spec.ts.snap         |  2 +
 24 files changed, 333 insertions(+), 80 deletions(-)
 create mode 100644 spec/config/RpcNodeTestConfig.js
 create mode 100644 spec/config/data.spec.ts

diff --git a/common/actions/wallet/actionCreators.ts b/common/actions/wallet/actionCreators.ts
index 8acf32dc..f69305f3 100644
--- a/common/actions/wallet/actionCreators.ts
+++ b/common/actions/wallet/actionCreators.ts
@@ -71,7 +71,10 @@ export function setBalanceRejected(): types.SetBalanceRejectedAction {
 
 export type TSetTokenBalances = typeof setTokenBalances;
 export function setTokenBalances(payload: {
-  [key: string]: TokenValue;
+  [key: string]: {
+    balance: TokenValue;
+    error: string | null;
+  };
 }): types.SetTokenBalancesAction {
   return {
     type: TypeKeys.WALLET_SET_TOKEN_BALANCES,
diff --git a/common/actions/wallet/actionTypes.ts b/common/actions/wallet/actionTypes.ts
index 1eb64b50..e11aab99 100644
--- a/common/actions/wallet/actionTypes.ts
+++ b/common/actions/wallet/actionTypes.ts
@@ -48,7 +48,10 @@ export interface SetBalanceRejectedAction {
 export interface SetTokenBalancesAction {
   type: TypeKeys.WALLET_SET_TOKEN_BALANCES;
   payload: {
-    [key: string]: TokenValue;
+    [key: string]: {
+      balance: TokenValue;
+      error: string | null;
+    };
   };
 }
 
diff --git a/common/api/bity.ts b/common/api/bity.ts
index dc66c24d..21989135 100644
--- a/common/api/bity.ts
+++ b/common/api/bity.ts
@@ -3,8 +3,8 @@ import { checkHttpStatus, parseJSON } from './utils';
 
 export function getAllRates() {
   const mappedRates = {};
-  return _getAllRates().then((bityRates) => {
-    bityRates.objects.forEach((each) => {
+  return _getAllRates().then(bityRates => {
+    bityRates.objects.forEach(each => {
       const pairName = each.pair;
       mappedRates[pairName] = parseFloat(each.rate_we_sell);
     });
@@ -26,7 +26,7 @@ export function postOrder(
       mode,
       pair
     }),
-    headers: bityConfig.postConfig.headers
+    headers: new Headers(bityConfig.postConfig.headers)
   })
     .then(checkHttpStatus)
     .then(parseJSON);
@@ -38,7 +38,7 @@ export function getOrderStatus(orderId: string) {
     body: JSON.stringify({
       orderid: orderId
     }),
-    headers: bityConfig.postConfig.headers
+    headers: new Headers(bityConfig.postConfig.headers)
   })
     .then(checkHttpStatus)
     .then(parseJSON);
@@ -48,4 +48,4 @@ function _getAllRates() {
   return fetch(`${bityConfig.bityURL}/v1/rate2/`)
     .then(checkHttpStatus)
     .then(parseJSON);
-}
\ No newline at end of file
+}
diff --git a/common/components/BalanceSidebar/EquivalentValues.tsx b/common/components/BalanceSidebar/EquivalentValues.tsx
index 7fda3f81..40162333 100644
--- a/common/components/BalanceSidebar/EquivalentValues.tsx
+++ b/common/components/BalanceSidebar/EquivalentValues.tsx
@@ -87,6 +87,8 @@ export default class EquivalentValues extends React.Component<Props, CmpState> {
       });
     } else if (ratesError) {
       valuesEl = <h5>{ratesError}</h5>;
+    } else if (tokenBalances && tokenBalances.length === 0) {
+      valuesEl = <h5>No tokens found!</h5>;
     } else {
       valuesEl = (
         <div className="EquivalentValues-values-loader">
diff --git a/common/config/data.ts b/common/config/data.ts
index be69ac04..60a34757 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -55,6 +55,7 @@ export interface Token {
   address: string;
   symbol: string;
   decimal: number;
+  error?: string | null;
 }
 
 export interface NetworkContract {
diff --git a/common/libs/nodes/INode.ts b/common/libs/nodes/INode.ts
index 653c2c9a..b2db9a86 100644
--- a/common/libs/nodes/INode.ts
+++ b/common/libs/nodes/INode.ts
@@ -9,8 +9,14 @@ export interface TxObj {
 export interface INode {
   ping(): Promise<boolean>;
   getBalance(address: string): Promise<Wei>;
-  getTokenBalance(address: string, token: Token): Promise<TokenValue>;
-  getTokenBalances(address: string, tokens: Token[]): Promise<TokenValue[]>;
+  getTokenBalance(
+    address: string,
+    token: Token
+  ): Promise<{ balance: TokenValue; error: string | null }>;
+  getTokenBalances(
+    address: string,
+    tokens: Token[]
+  ): Promise<{ balance: TokenValue; error: string | null }[]>;
   estimateGas(tx: TransactionWithoutGas): Promise<Wei>;
   getTransactionCount(address: string): Promise<string>;
   sendRawTx(tx: string): Promise<string>;
diff --git a/common/libs/nodes/etherscan/client.ts b/common/libs/nodes/etherscan/client.ts
index 77e24965..b5b666ef 100644
--- a/common/libs/nodes/etherscan/client.ts
+++ b/common/libs/nodes/etherscan/client.ts
@@ -6,7 +6,9 @@ export default class EtherscanClient extends RPCClient {
   public encodeRequest(request: EtherscanRequest): string {
     const encoded = new URLSearchParams();
     Object.keys(request).forEach(key => {
-      encoded.set(key, request[key]);
+      if (request[key]) {
+        encoded.set(key, request[key]);
+      }
     });
     return encoded.toString();
   }
@@ -14,9 +16,9 @@ export default class EtherscanClient extends RPCClient {
   public call = (request: EtherscanRequest): Promise<JsonRpcResponse> =>
     fetch(this.endpoint, {
       method: 'POST',
-      headers: {
+      headers: new Headers({
         'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-      },
+      }),
       body: this.encodeRequest(request)
     }).then(r => r.json());
 
diff --git a/common/libs/nodes/etherscan/requests.ts b/common/libs/nodes/etherscan/requests.ts
index 036cb60c..c98256a3 100644
--- a/common/libs/nodes/etherscan/requests.ts
+++ b/common/libs/nodes/etherscan/requests.ts
@@ -15,7 +15,7 @@ export default class EtherscanRequests extends RPCRequests {
   public sendRawTx(signedTx: string): SendRawTxRequest {
     return {
       module: 'proxy',
-      method: 'eth_sendRawTransaction',
+      action: 'eth_sendRawTransaction',
       hex: signedTx
     };
   }
@@ -23,7 +23,7 @@ export default class EtherscanRequests extends RPCRequests {
   public estimateGas(transaction): EstimateGasRequest {
     return {
       module: 'proxy',
-      method: 'eth_estimateGas',
+      action: 'eth_estimateGas',
       to: transaction.to,
       value: transaction.value,
       data: transaction.data,
diff --git a/common/libs/nodes/etherscan/types.ts b/common/libs/nodes/etherscan/types.ts
index fd153ba8..5fca1167 100644
--- a/common/libs/nodes/etherscan/types.ts
+++ b/common/libs/nodes/etherscan/types.ts
@@ -5,7 +5,7 @@ export interface EtherscanReqBase {
 
 export interface SendRawTxRequest extends EtherscanReqBase {
   module: 'proxy';
-  method: 'eth_sendRawTransaction';
+  action: 'eth_sendRawTransaction';
   hex: string;
 }
 
@@ -27,7 +27,7 @@ export type GetTokenBalanceRequest = CallRequest;
 
 export interface EstimateGasRequest extends EtherscanReqBase {
   module: 'proxy';
-  method: 'eth_estimateGas';
+  action: 'eth_estimateGas';
   to: string;
   value: string | number;
   data: string;
diff --git a/common/libs/nodes/infura/client.ts b/common/libs/nodes/infura/client.ts
index 536173e3..2bc400ab 100644
--- a/common/libs/nodes/infura/client.ts
+++ b/common/libs/nodes/infura/client.ts
@@ -2,7 +2,7 @@ import { randomBytes } from 'crypto';
 import RPCClient from '../rpc/client';
 
 export default class InfuraClient extends RPCClient {
-  public id(): string {
-    return `0x${randomBytes(5).toString('hex')}`;
+  public id(): number {
+    return parseInt(randomBytes(5).toString('hex'), 16);
   }
 }
diff --git a/common/libs/nodes/rpc/client.ts b/common/libs/nodes/rpc/client.ts
index 144fd2cb..7f1934ee 100644
--- a/common/libs/nodes/rpc/client.ts
+++ b/common/libs/nodes/rpc/client.ts
@@ -9,7 +9,7 @@ export default class RPCClient {
     this.headers = headers;
   }
 
-  public id(): string {
+  public id(): string | number {
     return randomBytes(16).toString('hex');
   }
 
@@ -22,10 +22,10 @@ export default class RPCClient {
   public call = (request: RPCRequest | any): Promise<JsonRpcResponse> => {
     return fetch(this.endpoint, {
       method: 'POST',
-      headers: {
+      headers: this.createHeaders({
         'Content-Type': 'application/json',
         ...this.headers
-      },
+      }),
       body: JSON.stringify(this.decorateRequest(request))
     }).then(r => r.json());
   };
@@ -33,11 +33,19 @@ export default class RPCClient {
   public batch = (requests: RPCRequest[] | any): Promise<JsonRpcResponse[]> => {
     return fetch(this.endpoint, {
       method: 'POST',
-      headers: {
+      headers: this.createHeaders({
         'Content-Type': 'application/json',
         ...this.headers
-      },
+      }),
       body: JSON.stringify(requests.map(this.decorateRequest))
     }).then(r => r.json());
   };
+
+  private createHeaders = headerObject => {
+    const headers = new Headers();
+    Object.keys(headerObject).forEach(name => {
+      headers.append(name, headerObject[name]);
+    });
+    return headers;
+  };
 }
diff --git a/common/libs/nodes/rpc/index.ts b/common/libs/nodes/rpc/index.ts
index af5acd82..005c8318 100644
--- a/common/libs/nodes/rpc/index.ts
+++ b/common/libs/nodes/rpc/index.ts
@@ -6,13 +6,15 @@ import { stripHexPrefix } from 'libs/values';
 import { INode, TxObj } from '../INode';
 import RPCClient from './client';
 import RPCRequests from './requests';
-
-function errorOrResult(response) {
-  if (response.error) {
-    throw new Error(response.error.message);
-  }
-  return response.result;
-}
+import {
+  isValidGetBalance,
+  isValidEstimateGas,
+  isValidCallRequest,
+  isValidTokenBalance,
+  isValidTransactionCount,
+  isValidCurrentBlock,
+  isValidRawTxApi
+} from '../../validators';
 
 export default class RpcNode implements INode {
   public client: RPCClient;
@@ -31,78 +33,87 @@ export default class RpcNode implements INode {
   }
 
   public sendCallRequest(txObj: TxObj): Promise<string> {
-    return this.client.call(this.requests.ethCall(txObj)).then(r => {
-      if (r.error) {
-        throw Error(r.error.message);
-      }
-      return r.result;
-    });
+    return this.client
+      .call(this.requests.ethCall(txObj))
+      .then(isValidCallRequest)
+      .then(response => response.result);
   }
   public getBalance(address: string): Promise<Wei> {
     return this.client
       .call(this.requests.getBalance(address))
-      .then(errorOrResult)
-      .then(result => Wei(result));
+      .then(isValidGetBalance)
+      .then(({ result }) => Wei(result));
   }
 
   public estimateGas(transaction: TransactionWithoutGas): Promise<Wei> {
     return this.client
       .call(this.requests.estimateGas(transaction))
-      .then(errorOrResult)
-      .then(result => Wei(result));
+      .then(isValidEstimateGas)
+      .then(({ result }) => Wei(result));
   }
 
-  public getTokenBalance(address: string, token: Token): Promise<TokenValue> {
+  public getTokenBalance(
+    address: string,
+    token: Token
+  ): Promise<{ balance: TokenValue; error: string | null }> {
     return this.client
       .call(this.requests.getTokenBalance(address, token))
-      .then(response => {
-        if (response.error) {
-          // TODO - Error handling
-          return TokenValue('0');
-        }
-        return TokenValue(response.result);
-      });
+      .then(isValidTokenBalance)
+      .then(({ result }) => {
+        return {
+          balance: TokenValue(result),
+          error: null
+        };
+      })
+      .catch(err => ({
+        balance: TokenValue('0'),
+        error: 'Caught error:' + err
+      }));
   }
 
   public getTokenBalances(
     address: string,
     tokens: Token[]
-  ): Promise<TokenValue[]> {
+  ): Promise<{ balance: TokenValue; error: string | null }[]> {
     return this.client
       .batch(tokens.map(t => this.requests.getTokenBalance(address, t)))
-      .then(response => {
-        return response.map(item => {
-          // FIXME wrap in maybe-like
-          if (item.error) {
-            return TokenValue('0');
+      .then(response =>
+        response.map(item => {
+          if (isValidTokenBalance(item)) {
+            return {
+              balance: TokenValue(item.result),
+              error: null
+            };
+          } else {
+            return {
+              balance: TokenValue('0'),
+              error: 'Invalid object shape'
+            };
           }
-          return TokenValue(item.result);
-        });
-      });
-    // TODO - Error handling
+        })
+      );
   }
 
   public getTransactionCount(address: string): Promise<string> {
     return this.client
       .call(this.requests.getTransactionCount(address))
-      .then(errorOrResult);
+      .then(isValidTransactionCount)
+      .then(({ result }) => result);
   }
 
   public getCurrentBlock(): Promise<string> {
     return this.client
       .call(this.requests.getCurrentBlock())
-      .then(errorOrResult)
-      .then(result => new BN(stripHexPrefix(result)).toString());
+      .then(isValidCurrentBlock)
+      .then(({ result }) => new BN(stripHexPrefix(result)).toString());
   }
 
   public sendRawTx(signedTx: string): Promise<string> {
     return this.client
       .call(this.requests.sendRawTx(signedTx))
-      .then(response => {
-        if (response.error) {
-          throw new Error(response.error.message);
-        }
-        return response.result;
+      .then(isValidRawTxApi)
+      .then(({ result }) => {
+        return result;
       });
   }
 }
diff --git a/common/libs/nodes/web3/index.ts b/common/libs/nodes/web3/index.ts
index 47a4de75..64d77690 100644
--- a/common/libs/nodes/web3/index.ts
+++ b/common/libs/nodes/web3/index.ts
@@ -57,7 +57,13 @@ export default class Web3Node implements INode {
     );
   }
 
-  public getTokenBalance(address: string, token: Token): Promise<TokenValue> {
+  public getTokenBalance(
+    address: string,
+    token: Token
+  ): Promise<{
+    balance: TokenValue;
+    error: string | null;
+  }> {
     return new Promise(resolve => {
       this.web3.eth.call(
         {
@@ -68,10 +74,10 @@ export default class Web3Node implements INode {
         (err, res) => {
           if (err) {
             // TODO - Error handling
-            return resolve(TokenValue('0'));
+            return resolve({ balance: TokenValue('0'), error: err });
           }
           // web3 returns string
-          resolve(TokenValue(res));
+          resolve({ balance: TokenValue(res), error: null });
         }
       );
     });
@@ -80,11 +86,14 @@ export default class Web3Node implements INode {
   public getTokenBalances(
     address: string,
     tokens: Token[]
-  ): Promise<TokenValue[]> {
+  ): Promise<{ balance: TokenValue; error: string | null }[]> {
     return new Promise(resolve => {
       const batch = this.web3.createBatch();
       const totalCount = tokens.length;
-      const returnArr = new Array<TokenValue>(totalCount);
+      const returnArr = new Array<{
+        balance: TokenValue;
+        error: string | null;
+      }>(totalCount);
       let finishCount = 0;
 
       tokens.forEach((token, index) =>
@@ -104,10 +113,16 @@ export default class Web3Node implements INode {
       function finish(index, err, res) {
         if (err) {
           // TODO - Error handling
-          returnArr[index] = TokenValue('0');
+          returnArr[index] = {
+            balance: TokenValue('0'),
+            error: err
+          };
         } else {
           // web3 returns string
-          returnArr[index] = TokenValue(res);
+          returnArr[index] = {
+            balance: TokenValue(res),
+            error: err
+          };
         }
 
         finishCount++;
diff --git a/common/libs/validators.ts b/common/libs/validators.ts
index 6fd91e7c..fff82e5e 100644
--- a/common/libs/validators.ts
+++ b/common/libs/validators.ts
@@ -2,6 +2,8 @@ import { toChecksumAddress } from 'ethereumjs-util';
 import { RawTransaction } from 'libs/transaction';
 import WalletAddressValidator from 'wallet-address-validator';
 import { normalise } from './ens';
+import { Validator } from 'jsonschema';
+import { JsonRpcResponse } from './nodes/rpc/types';
 
 export function isValidETHAddress(address: string): boolean {
   if (!address) {
@@ -177,3 +179,67 @@ export const isValidByteCode = (byteCode: string) =>
 
 export const isValidAbiJson = (abiJson: string) =>
   abiJson && abiJson.startsWith('[') && abiJson.endsWith(']');
+
+// JSONSchema Validations for Rpc responses
+const v = new Validator();
+
+export const schema = {
+  RpcNode: {
+    type: 'object',
+    additionalProperties: false,
+    properties: {
+      jsonrpc: { type: 'string' },
+      id: { oneOf: [{ type: 'string' }, { type: 'integer' }] },
+      result: { type: 'string' },
+      status: { type: 'string' },
+      message: { type: 'string', maxLength: 2 }
+    }
+  }
+};
+
+function isValidResult(response: JsonRpcResponse, schemaFormat): boolean {
+  return v.validate(response, schemaFormat).valid;
+}
+
+function formatErrors(response: JsonRpcResponse, apiType: string) {
+  if (response.error) {
+    return `${response.error.message} ${response.error.data}`;
+  }
+  return `Invalid ${apiType} Error`;
+}
+
+const isValidEthCall = (response: JsonRpcResponse, schemaType) => (
+  apiName,
+  cb?
+) => {
+  if (!isValidResult(response, schemaType)) {
+    if (cb) {
+      return cb(response);
+    }
+    throw new Error(formatErrors(response, apiName));
+  }
+  return response;
+};
+
+export const isValidGetBalance = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Get Balance');
+
+export const isValidEstimateGas = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Estimate Gas');
+
+export const isValidCallRequest = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Call Request');
+
+export const isValidTokenBalance = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Token Balance', () => ({
+    result: 'Failed'
+  }));
+
+export const isValidTransactionCount = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Transaction Count');
+
+export const isValidCurrentBlock = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Current Block');
+
+export const isValidRawTxApi = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Raw Tx');
diff --git a/common/reducers/wallet.ts b/common/reducers/wallet.ts
index 83a021c5..59242c46 100644
--- a/common/reducers/wallet.ts
+++ b/common/reducers/wallet.ts
@@ -15,7 +15,10 @@ export interface State {
   // in ETH
   balance: Balance | { wei: null };
   tokens: {
-    [key: string]: TokenValue;
+    [key: string]: {
+      balance: TokenValue;
+      error: string | null;
+    };
   };
   transactions: BroadcastTransactionStatus[];
 }
diff --git a/common/selectors/wallet.ts b/common/selectors/wallet.ts
index f2d36f5e..1e52d01b 100644
--- a/common/selectors/wallet.ts
+++ b/common/selectors/wallet.ts
@@ -14,6 +14,7 @@ export interface TokenBalance {
   balance: TokenValue;
   custom: boolean;
   decimal: number;
+  error: string | null;
 }
 
 export type MergedToken = Token & {
@@ -38,8 +39,11 @@ export function getTokenBalances(state: AppState): TokenBalance[] {
   return tokens.map(t => ({
     symbol: t.symbol,
     balance: state.wallet.tokens[t.symbol]
-      ? state.wallet.tokens[t.symbol]
+      ? state.wallet.tokens[t.symbol].balance
       : TokenValue('0'),
+    error: state.wallet.tokens[t.symbol]
+      ? state.wallet.tokens[t.symbol].error
+      : null,
     custom: t.custom,
     decimal: t.decimal
   }));
diff --git a/common/utils/printElement.ts b/common/utils/printElement.ts
index a1dbadef..207bfa26 100644
--- a/common/utils/printElement.ts
+++ b/common/utils/printElement.ts
@@ -26,8 +26,9 @@ export default function(
     .join(',');
 
   const popup = window.open('about:blank', 'printWindow', featuresStr);
-  popup.document.open();
-  popup.document.write(`
+  if (popup) {
+    popup.document.open();
+    popup.document.write(`
   <html>
     <head>
       <style>${options.styles}</style>
@@ -50,4 +51,5 @@ export default function(
     </body>
     </html>
 	`);
+  }
 }
diff --git a/jest_config/setupJest.js b/jest_config/setupJest.js
index 7c59e8ed..07c52109 100644
--- a/jest_config/setupJest.js
+++ b/jest_config/setupJest.js
@@ -1,2 +1,17 @@
-global.fetch = require('node-fetch')
-window.BASE_API = 'http://localhost:4000/api/v1'
+'use strict';
+
+var realFetch = require('node-fetch');
+module.exports = function(url, options) {
+  if (/^\/\//.test(url)) {
+    url = 'https:' + url;
+  }
+  return realFetch.call(this, url, options);
+};
+
+if (!global.fetch) {
+  global.fetch = module.exports;
+  global.Response = realFetch.Response;
+  global.Headers = realFetch.Headers;
+  global.Request = realFetch.Request;
+}
+window.BASE_API = 'http://localhost:4000/api/v1';
diff --git a/package.json b/package.json
index db241ccb..002cd484 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "font-awesome": "4.7.0",
     "hdkey": "0.7.1",
     "idna-uts46": "1.1.0",
+    "jsonschema": "1.2.0",
     "lodash": "4.17.4",
     "moment": "2.19.3",
     "qrcode": "1.0.0",
@@ -104,6 +105,7 @@
     "types-rlp": "0.0.1",
     "typescript": "2.5.2",
     "url-loader": "0.6.2",
+    "url-search-params-polyfill": "2.0.1",
     "webpack": "3.8.1",
     "webpack-dev-middleware": "1.12.2",
     "webpack-hot-middleware": "2.21.0"
diff --git a/spec/config/RpcNodeTestConfig.js b/spec/config/RpcNodeTestConfig.js
new file mode 100644
index 00000000..998645c8
--- /dev/null
+++ b/spec/config/RpcNodeTestConfig.js
@@ -0,0 +1,5 @@
+module.exports = {
+  RpcNodes: ['eth_mew', 'etc_epool', 'etc_epool', 'rop_mew'],
+  EtherscanNodes: ['eth_ethscan', 'kov_ethscan', 'rin_ethscan'],
+  InfuraNodes: ['eth_infura', 'rop_infura', 'rin_infura']
+};
diff --git a/spec/config/data.spec.ts b/spec/config/data.spec.ts
new file mode 100644
index 00000000..d02a2208
--- /dev/null
+++ b/spec/config/data.spec.ts
@@ -0,0 +1,93 @@
+import { NODES, NodeConfig } from '../../common/config/data';
+import { RPCNode } from '../../common/libs/nodes';
+import { Validator } from 'jsonschema';
+import { schema } from '../../common/libs/validators';
+import 'url-search-params-polyfill';
+import EtherscanNode from 'libs/nodes/etherscan';
+import InfuraNode from 'libs/nodes/infura';
+import RpcNodeTestConfig from './RpcNodeTestConfig';
+
+const v = new Validator();
+
+const validRequests = {
+  address: '0x72948fa4200d10ffaa7c594c24bbba6ef627d4a3',
+  transaction: {
+    data: '',
+    from: '0x72948fa4200d10ffaa7c594c24bbba6ef627d4a3',
+    to: '0x72948fa4200d10ffaa7c594c24bbba6ef627d4a3',
+    value: '0xde0b6b3a7640000'
+  },
+  token: {
+    address: '0x4156d3342d5c385a87d264f90653733592000581',
+    symbol: 'SALT',
+    decimal: 8
+  }
+};
+
+const testGetBalance = (n: RPCNode) => {
+  return n.client
+    .call(n.requests.getBalance(validRequests.address))
+    .then(data => v.validate(data, schema.RpcNode));
+};
+
+const testEstimateGas = (n: RPCNode) => {
+  return n.client
+    .call(n.requests.estimateGas(validRequests.transaction))
+    .then(data => v.validate(data, schema.RpcNode));
+};
+
+const testGetTokenBalance = (n: RPCNode) => {
+  const { address, token } = validRequests;
+  return n.client
+    .call(n.requests.getTokenBalance(address, token))
+    .then(data => v.validate(data, schema.RpcNode));
+};
+
+const RPCTests = {
+  getBalance: testGetBalance,
+  estimateGas: testEstimateGas,
+  getTokenBalance: testGetTokenBalance
+};
+
+function testRpcRequests(node: RPCNode, service: string) {
+  Object.keys(RPCTests).forEach(testType => {
+    describe(`RPC (${service}) should work`, () => {
+      it(
+        `RPC: ${testType} ${service}`,
+        () => {
+          return RPCTests[testType](node).then(d =>
+            expect(d.valid).toBeTruthy()
+          );
+        },
+        10000
+      );
+    });
+  });
+}
+
+const mapNodeEndpoints = (nodes: { [key: string]: NodeConfig }) => {
+  const { RpcNodes, EtherscanNodes, InfuraNodes } = RpcNodeTestConfig;
+
+  RpcNodes.forEach(n => {
+    testRpcRequests(
+      nodes[n].lib as RPCNode,
+      `${nodes[n].service} ${nodes[n].network}`
+    );
+  });
+
+  EtherscanNodes.forEach(n => {
+    testRpcRequests(
+      nodes[n].lib as EtherscanNode,
+      `${nodes[n].service} ${nodes[n].network}`
+    );
+  });
+
+  InfuraNodes.forEach(n => {
+    testRpcRequests(
+      nodes[n].lib as InfuraNode,
+      `${nodes[n].service} ${nodes[n].network}`
+    );
+  });
+};
+
+mapNodeEndpoints(NODES);
diff --git a/spec/pages/__snapshots__/SendTransaction.spec.tsx.snap b/spec/pages/__snapshots__/SendTransaction.spec.tsx.snap
index 51777a68..7bba85ab 100644
--- a/spec/pages/__snapshots__/SendTransaction.spec.tsx.snap
+++ b/spec/pages/__snapshots__/SendTransaction.spec.tsx.snap
@@ -56,6 +56,7 @@ exports[`render snapshot 1`] = `
       "client": RPCClient {
         "batch": [Function],
         "call": [Function],
+        "createHeaders": [Function],
         "decorateRequest": [Function],
         "endpoint": "https://api.myetherapi.com/rop",
         "headers": Object {},
diff --git a/spec/reducers/wallet.spec.ts b/spec/reducers/wallet.spec.ts
index a12b039a..e87d661a 100644
--- a/spec/reducers/wallet.spec.ts
+++ b/spec/reducers/wallet.spec.ts
@@ -60,7 +60,16 @@ describe('wallet reducer', () => {
   });
 
   it('should handle WALLET_SET_TOKEN_BALANCES', () => {
-    const tokenBalances = { OMG: TokenValue('20') };
+    const tokenBalances = {
+      OMG: {
+        balance: TokenValue('20'),
+        error: null
+      },
+      WTT: {
+        balance: TokenValue('0'),
+        error: 'The request failed to execute'
+      }
+    };
     expect(
       wallet(undefined, walletActions.setTokenBalances(tokenBalances))
     ).toEqual({
diff --git a/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap b/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
index 45760707..63dc34b7 100644
--- a/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
+++ b/spec/sagas/__snapshots__/deterministicWallets.spec.ts.snap
@@ -178,6 +178,7 @@ Object {
           "client": RPCClient {
             "batch": [Function],
             "call": [Function],
+            "createHeaders": [Function],
             "decorateRequest": [Function],
             "endpoint": "",
             "headers": Object {},
@@ -202,6 +203,7 @@ Object {
           "client": RPCClient {
             "batch": [Function],
             "call": [Function],
+            "createHeaders": [Function],
             "decorateRequest": [Function],
             "endpoint": "",
             "headers": Object {},

From 92a4551085f10ecb872d2a6b310cc73ac8390c06 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2017 11:36:10 -0600
Subject: [PATCH 39/46] =?UTF-8?q?Update=20typescript=20to=20the=20latest?=
 =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#467)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(package): update typescript to version 2.6.2

* fix RPC type error
---
 common/libs/nodes/rpc/client.ts | 4 ++--
 package.json                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/libs/nodes/rpc/client.ts b/common/libs/nodes/rpc/client.ts
index 7f1934ee..58f6a2e1 100644
--- a/common/libs/nodes/rpc/client.ts
+++ b/common/libs/nodes/rpc/client.ts
@@ -3,8 +3,8 @@ import { JsonRpcResponse, RPCRequest } from './types';
 
 export default class RPCClient {
   public endpoint: string;
-  public headers: object;
-  constructor(endpoint: string, headers: object = {}) {
+  public headers: { [key: string]: string };
+  constructor(endpoint: string, headers: { [key: string]: string } = {}) {
     this.endpoint = endpoint;
     this.headers = headers;
   }
diff --git a/package.json b/package.json
index 002cd484..94f32633 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "tslint-config-prettier": "1.6.0",
     "tslint-react": "3.2.0",
     "types-rlp": "0.0.1",
-    "typescript": "2.5.2",
+    "typescript": "2.6.2",
     "url-loader": "0.6.2",
     "url-search-params-polyfill": "2.0.1",
     "webpack": "3.8.1",

From 4f48eee99e2ab8b432f2d58b4e192e02c00869e2 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Thu, 30 Nov 2017 12:11:44 -0600
Subject: [PATCH 40/46] chore(package): update webpack to version 3.9.1 (#498)

Closes #497
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94f32633..4998ef54 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "typescript": "2.6.2",
     "url-loader": "0.6.2",
     "url-search-params-polyfill": "2.0.1",
-    "webpack": "3.8.1",
+    "webpack": "3.9.1",
     "webpack-dev-middleware": "1.12.2",
     "webpack-hot-middleware": "2.21.0"
   },

From 818ad9fef551366c744921539002ed77d315662c Mon Sep 17 00:00:00 2001
From: Eddie Wang <eddie@eddiewang.me>
Date: Thu, 30 Nov 2017 15:16:30 -0500
Subject: [PATCH 41/46] Add Private key to V3 keystore functionality (#336)

* setup components, reducers, actions, and added routes

* removed redux, using local state and ethereumjs-wallet

* added validation and state reset

* added visibility options and changed btn colors

* updated isValidPrivKey and updated some components to stateless functional comp

* componentize input and add placeholder message

* removed cn from KeystoreDetails

* adds isValidPrivate to buffer check and min pw length to 0

* remove packagelock to fix merge conflict

* added utilities tab removed keystore tab

* adds fixpkey in validators and uses it across two components

* added checksum removal and btn css fixes

* Fixed en.json formatting - also removed fixedPkey

* Added unit tests for isValidPrivKey

* add runtime checks and rename stripHexPrefix to strippedPrivateKey

* switch back to stripHexPrefix

* Add constant for n-factor

* enforce 9 char minimum
---
 common/Root.tsx                               |   3 +-
 .../Header/components/Navigation.tsx          |   5 +
 .../components/WalletDecrypt/PrivateKey.tsx   |  51 +++--
 common/config/data.ts                         |   1 +
 .../components/DownloadWallet.tsx             |   5 +-
 .../components/KeystoreDetails.scss           |  23 +++
 .../components/KeystoreDetails.tsx            | 177 ++++++++++++++++++
 .../components/KeystoreInput.tsx              |  43 +++++
 .../RestoreKeystore/components/Template.tsx   |  16 ++
 .../containers/Tabs/RestoreKeystore/index.tsx |  11 ++
 common/libs/validators.ts                     |  13 +-
 common/translations/lang/en.json              |   1 +
 spec/libs/validators.spec.ts                  |  23 ++-
 spec/sagas/wallet.spec.tsx                    |   4 +-
 14 files changed, 336 insertions(+), 40 deletions(-)
 create mode 100644 common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.scss
 create mode 100644 common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.tsx
 create mode 100644 common/containers/Tabs/RestoreKeystore/components/KeystoreInput.tsx
 create mode 100644 common/containers/Tabs/RestoreKeystore/components/Template.tsx
 create mode 100644 common/containers/Tabs/RestoreKeystore/index.tsx

diff --git a/common/Root.tsx b/common/Root.tsx
index c0c139c8..a531d9a4 100644
--- a/common/Root.tsx
+++ b/common/Root.tsx
@@ -11,6 +11,7 @@ import Swap from 'containers/Tabs/Swap';
 import ViewWallet from 'containers/Tabs/ViewWallet';
 import SignAndVerifyMessage from 'containers/Tabs/SignAndVerifyMessage';
 import BroadcastTx from 'containers/Tabs/BroadcastTx';
+import RestoreKeystore from 'containers/Tabs/RestoreKeystore';
 
 // TODO: fix this
 interface Props {
@@ -33,12 +34,12 @@ export default class Root extends Component<Props, {}> {
             <Route path="/send-transaction" component={SendTransaction} />
             <Route path="/contracts" component={Contracts} />
             <Route path="/ens" component={ENS} />
+            <Route path="/utilities" component={RestoreKeystore} />
             <Route
               path="/sign-and-verify-message"
               component={SignAndVerifyMessage}
             />
             <Route path="/pushTx" component={BroadcastTx} />
-
             <LegacyRoutes />
           </div>
         </Router>
diff --git a/common/components/Header/components/Navigation.tsx b/common/components/Header/components/Navigation.tsx
index facdd691..8a37f04e 100644
--- a/common/components/Header/components/Navigation.tsx
+++ b/common/components/Header/components/Navigation.tsx
@@ -8,6 +8,7 @@ const tabs = [
     name: 'NAV_GenerateWallet',
     to: '/'
   },
+
   {
     name: 'NAV_SendEther',
     to: 'send-transaction'
@@ -36,6 +37,10 @@ const tabs = [
     name: 'Broadcast Transaction',
     to: 'pushTx'
   },
+  {
+    name: 'NAV_Utilities',
+    to: 'utilities'
+  },
   {
     name: 'NAV_Help',
     to: 'https://myetherwallet.groovehq.com/help_center',
diff --git a/common/components/WalletDecrypt/PrivateKey.tsx b/common/components/WalletDecrypt/PrivateKey.tsx
index 0e564144..96af3673 100644
--- a/common/components/WalletDecrypt/PrivateKey.tsx
+++ b/common/components/WalletDecrypt/PrivateKey.tsx
@@ -1,4 +1,5 @@
 import { isValidEncryptedPrivKey, isValidPrivKey } from 'libs/validators';
+import { stripHexPrefix } from 'libs/values';
 import React, { Component } from 'react';
 import translate, { translateRaw } from 'translations';
 
@@ -8,13 +9,6 @@ export interface PrivateKeyValue {
   valid: boolean;
 }
 
-function fixPkey(key) {
-  if (key.indexOf('0x') === 0) {
-    return key.slice(2);
-  }
-  return key;
-}
-
 interface Validated {
   fixedPkey: string;
   isValidPkey: boolean;
@@ -23,7 +17,7 @@ interface Validated {
 }
 
 function validatePkeyAndPass(pkey: string, pass: string): Validated {
-  const fixedPkey = fixPkey(pkey);
+  const fixedPkey = stripHexPrefix(pkey);
   const validPkey = isValidPrivKey(fixedPkey);
   const validEncPkey = isValidEncryptedPrivKey(fixedPkey);
   const isValidPkey = validPkey || validEncPkey;
@@ -58,15 +52,13 @@ export default class PrivateKeyDecrypt extends Component {
     return (
       <section className="col-md-4 col-sm-6">
         <div id="selectedTypeKey">
-          <h4>
-            {translate('ADD_Radio_3')}
-          </h4>
+          <h4>{translate('ADD_Radio_3')}</h4>
           <div className="form-group">
             <textarea
               id="aria-private-key"
-              className={`form-control ${isValidPkey
-                ? 'is-valid'
-                : 'is-invalid'}`}
+              className={`form-control ${
+                isValidPkey ? 'is-valid' : 'is-invalid'
+              }`}
               value={key}
               onChange={this.onPkeyChange}
               onKeyDown={this.onKeyDown}
@@ -75,22 +67,21 @@ export default class PrivateKeyDecrypt extends Component {
             />
           </div>
           {isValidPkey &&
-            isPassRequired &&
-            <div className="form-group">
-              <p>
-                {translate('ADD_Label_3')}
-              </p>
-              <input
-                className={`form-control ${password.length > 0
-                  ? 'is-valid'
-                  : 'is-invalid'}`}
-                value={password}
-                onChange={this.onPasswordChange}
-                onKeyDown={this.onKeyDown}
-                placeholder={translateRaw('x_Password')}
-                type="password"
-              />
-            </div>}
+            isPassRequired && (
+              <div className="form-group">
+                <p>{translate('ADD_Label_3')}</p>
+                <input
+                  className={`form-control ${
+                    password.length > 0 ? 'is-valid' : 'is-invalid'
+                  }`}
+                  value={password}
+                  onChange={this.onPasswordChange}
+                  onKeyDown={this.onKeyDown}
+                  placeholder={translateRaw('x_Password')}
+                  type="password"
+                />
+              </div>
+            )}
         </div>
       </section>
     );
diff --git a/common/config/data.ts b/common/config/data.ts
index 60a34757..2cd8684b 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -3,6 +3,7 @@ import { networkIdToName } from 'libs/values';
 export const languages = require('./languages.json');
 // Displays in the header
 export const VERSION = '4.0.0 (Alpha 0.0.4)';
+export const N_FACTOR = 1024;
 
 // Displays at the top of the site, make message empty string to remove.
 // Type can be primary, warning, danger, success, or info.
diff --git a/common/containers/Tabs/GenerateWallet/components/DownloadWallet.tsx b/common/containers/Tabs/GenerateWallet/components/DownloadWallet.tsx
index 65523458..7eadecb0 100644
--- a/common/containers/Tabs/GenerateWallet/components/DownloadWallet.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/DownloadWallet.tsx
@@ -7,6 +7,7 @@ import translate from 'translations';
 import { makeBlob } from 'utils/blob';
 import './DownloadWallet.scss';
 import Template from './Template';
+import { N_FACTOR } from 'config/data';
 
 interface Props {
   wallet: IFullWallet;
@@ -47,7 +48,7 @@ export default class DownloadWallet extends Component<Props, State> {
           role="button"
           className="DlWallet-download btn btn-primary btn-lg"
           aria-label="Download Keystore File (UTC / JSON · Recommended · Encrypted)"
-          aria-describedby="x_KeystoreDesc"
+          aria-describedby={translate('x_KeystoreDesc')}
           download={filename}
           href={this.getBlob()}
           onClick={this.handleDownloadKeystore}
@@ -130,7 +131,7 @@ export default class DownloadWallet extends Component<Props, State> {
     this.state.hasDownloadedWallet && this.props.continueToPaper();
 
   private setWallet(wallet: IFullWallet, password: string) {
-    const keystore = wallet.toV3(password, { n: 1024 });
+    const keystore = wallet.toV3(password, { n: N_FACTOR });
     keystore.address = toChecksumAddress(keystore.address);
     this.setState({ keystore });
   }
diff --git a/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.scss b/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.scss
new file mode 100644
index 00000000..25f137e2
--- /dev/null
+++ b/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.scss
@@ -0,0 +1,23 @@
+@import 'common/sass/variables';
+
+.KeystoreDetails {
+  &-title {
+    margin: $space auto $space * 2.5;
+  }
+
+  &-password,
+  &-key {
+    max-width: 40rem;
+    margin: 0 auto $space;
+
+    &-label {
+      margin-bottom: $space;
+    }
+  }
+
+  &-submit,
+  &-download {
+    max-width: 16rem;
+    margin: 0 auto $space * 3;
+  }
+}
diff --git a/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.tsx b/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.tsx
new file mode 100644
index 00000000..bece2338
--- /dev/null
+++ b/common/containers/Tabs/RestoreKeystore/components/KeystoreDetails.tsx
@@ -0,0 +1,177 @@
+import React, { Component } from 'react';
+import Template from './Template';
+import KeystoreInput from './KeystoreInput';
+import { fromPrivateKey, IFullWallet, fromV3 } from 'ethereumjs-wallet';
+import { makeBlob } from 'utils/blob';
+import { isValidPrivKey } from 'libs/validators';
+import { stripHexPrefix } from 'libs/values';
+import translate from 'translations';
+import './KeystoreDetails.scss';
+import { N_FACTOR } from 'config/data';
+
+interface State {
+  secretKey: string;
+  password: string;
+  fileName: string;
+  isPasswordVisible: boolean;
+  isPrivateKeyVisible: boolean;
+  wallet: IFullWallet | null | undefined;
+}
+const initialState: State = {
+  secretKey: '',
+  password: '',
+  isPasswordVisible: false,
+  isPrivateKeyVisible: false,
+  fileName: '',
+  wallet: null
+};
+
+const minLength = min => value => value && value.length >= min;
+const minLength9 = minLength(9);
+
+class KeystoreDetails extends Component<{}, State> {
+  public state = initialState;
+
+  public componentWillUnmount() {
+    this.resetState();
+  }
+
+  public render() {
+    const {
+      secretKey,
+      isPasswordVisible,
+      isPrivateKeyVisible,
+      password,
+      wallet,
+      fileName
+    } = this.state;
+
+    const privateKey = stripHexPrefix(secretKey);
+    const privateKeyValid = isValidPrivKey(privateKey);
+
+    const content = (
+      <div className="KeystoreDetails">
+        <div>
+          <label className="KeystoreDetails-key">
+            <h4 className="KeystoreDetails-label">Private Key</h4>
+            <KeystoreInput
+              isValid={privateKeyValid}
+              isVisible={isPrivateKeyVisible}
+              name="secretKey"
+              value={secretKey}
+              handleInput={this.handleInput}
+              placeholder="Enter your saved private key here"
+              handleToggle={this.togglePrivateKey}
+            />
+          </label>
+        </div>
+        <div>
+          <label className="KeystoreDetails-password">
+            <h4 className="KeystoreDetails-label">Password</h4>
+            <KeystoreInput
+              isValid={minLength9(password)}
+              isVisible={isPasswordVisible}
+              name="password"
+              value={password}
+              placeholder="Enter your encryption password here."
+              handleInput={this.handleInput}
+              handleToggle={this.togglePassword}
+            />
+          </label>
+        </div>
+        {!wallet ? (
+          <button
+            onClick={this.handleKeystoreGeneration}
+            className="KeystoreDetails-submit btn btn-primary btn-block"
+            disabled={!privateKeyValid || !minLength9(password)}
+          >
+            Generate Keystore
+          </button>
+        ) : this.runtimeKeystoreCheck() ? (
+          <a
+            onClick={this.resetState}
+            href={this.getBlob()}
+            className="KeystoreDetails-download btn btn-success btn-block"
+            aria-label="Download Keystore File (UTC / JSON · Recommended · Encrypted)"
+            aria-describedby={translate('x_KeystoreDesc')}
+            download={fileName}
+          >
+            Download Keystore
+          </a>
+        ) : (
+          <p>
+            Error generating a valid keystore that matches your private key. In
+            order to protect our users, if our runtime check fails, we prevent
+            you from downloading a potentially corrupted wallet.
+          </p>
+        )}
+      </div>
+    );
+    return (
+      <div>
+        <Template title="Regenerate Keystore File" content={content} />
+      </div>
+    );
+  }
+
+  private togglePrivateKey = () => {
+    this.setState({
+      isPrivateKeyVisible: !this.state.isPrivateKeyVisible
+    });
+  };
+
+  private togglePassword = () => {
+    this.setState({
+      isPasswordVisible: !this.state.isPasswordVisible
+    });
+  };
+
+  private resetState = () => {
+    this.setState(initialState);
+  };
+
+  private handleKeystoreGeneration = () => {
+    const { secretKey } = this.state;
+    const removeChecksumPkey = stripHexPrefix(secretKey);
+    const keyBuffer = Buffer.from(removeChecksumPkey, 'hex');
+    const wallet = fromPrivateKey(keyBuffer);
+    const fileName = wallet.getV3Filename();
+    this.setState({
+      wallet,
+      fileName
+    });
+  };
+
+  private handleInput = (e: React.FormEvent<HTMLInputElement>) => {
+    const name = e.currentTarget.name;
+    const value = e.currentTarget.value;
+    if (name === 'secretKey') {
+      this.setState({
+        wallet: null
+      });
+    }
+    this.setState({ [name as any]: value });
+  };
+
+  private runtimeKeystoreCheck(): boolean {
+    const { wallet, password, secretKey } = this.state;
+    if (wallet) {
+      const keystore = wallet.toV3(password, { n: N_FACTOR });
+      const backToWallet = fromV3(keystore, password, true);
+      if (stripHexPrefix(backToWallet.getPrivateKeyString()) === secretKey) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private getBlob() {
+    const { wallet, password } = this.state;
+    if (wallet) {
+      const keystore = wallet.toV3(password, { n: N_FACTOR });
+      return makeBlob('text/json;charset=UTF-8', keystore);
+    }
+  }
+}
+
+export default KeystoreDetails;
diff --git a/common/containers/Tabs/RestoreKeystore/components/KeystoreInput.tsx b/common/containers/Tabs/RestoreKeystore/components/KeystoreInput.tsx
new file mode 100644
index 00000000..56af37e7
--- /dev/null
+++ b/common/containers/Tabs/RestoreKeystore/components/KeystoreInput.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import classnames from 'classnames';
+
+interface Props {
+  isValid: boolean;
+  isVisible: boolean;
+  name: string;
+  value: string;
+  placeholder: string;
+  handleInput(e: React.FormEvent<HTMLInputElement>): void;
+  handleToggle(): void;
+}
+
+const KeystoreInput: React.SFC<Props> = ({
+  isValid,
+  isVisible,
+  handleInput,
+  name,
+  value,
+  placeholder,
+  handleToggle
+}) => (
+  <div className="input-group">
+    <input
+      className={classnames(
+        'form-control',
+        isValid ? 'is-valid' : 'is-invalid'
+      )}
+      type={isVisible ? 'text' : 'password'}
+      name={name}
+      placeholder={placeholder}
+      value={value}
+      onChange={handleInput}
+    />
+    <span
+      onClick={handleToggle}
+      role="button"
+      className="input-group-addon eye"
+    />
+  </div>
+);
+
+export default KeystoreInput;
diff --git a/common/containers/Tabs/RestoreKeystore/components/Template.tsx b/common/containers/Tabs/RestoreKeystore/components/Template.tsx
new file mode 100644
index 00000000..e6ff8216
--- /dev/null
+++ b/common/containers/Tabs/RestoreKeystore/components/Template.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+interface Props {
+  content: React.ReactElement<any>;
+  title: string;
+}
+
+const RestoreKeystoreTemplate: React.SFC<Props> = ({ title, content }) => (
+  <div className="Tab-content">
+    <div className="Tab-content-pane text-center">
+      <h1>{title}</h1>
+      {content}
+    </div>
+  </div>
+);
+export default RestoreKeystoreTemplate;
diff --git a/common/containers/Tabs/RestoreKeystore/index.tsx b/common/containers/Tabs/RestoreKeystore/index.tsx
new file mode 100644
index 00000000..f269432b
--- /dev/null
+++ b/common/containers/Tabs/RestoreKeystore/index.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import TabSection from 'containers/TabSection';
+import KeystoreDetails from './components/KeystoreDetails';
+
+const RestoreKeystore: React.SFC<{}> = () => (
+  <TabSection>
+    <KeystoreDetails />
+  </TabSection>
+);
+
+export default RestoreKeystore;
diff --git a/common/libs/validators.ts b/common/libs/validators.ts
index fff82e5e..0585b69c 100644
--- a/common/libs/validators.ts
+++ b/common/libs/validators.ts
@@ -1,5 +1,6 @@
-import { toChecksumAddress } from 'ethereumjs-util';
+import { toChecksumAddress, isValidPrivate } from 'ethereumjs-util';
 import { RawTransaction } from 'libs/transaction';
+import { stripHexPrefix } from 'libs/values';
 import WalletAddressValidator from 'wallet-address-validator';
 import { normalise } from './ens';
 import { Validator } from 'jsonschema';
@@ -88,9 +89,15 @@ function validateEtherAddress(address: string): boolean {
 
 export function isValidPrivKey(privkey: string | Buffer): boolean {
   if (typeof privkey === 'string') {
-    return privkey.length === 64;
+    const strippedKey = stripHexPrefix(privkey);
+    const initialCheck = strippedKey.length === 64;
+    if (initialCheck) {
+      const keyBuffer = Buffer.from(strippedKey, 'hex');
+      return isValidPrivate(keyBuffer);
+    }
+    return false;
   } else if (privkey instanceof Buffer) {
-    return privkey.length === 32;
+    return privkey.length === 32 && isValidPrivate(privkey);
   } else {
     return false;
   }
diff --git a/common/translations/lang/en.json b/common/translations/lang/en.json
index 3b898648..6641f229 100644
--- a/common/translations/lang/en.json
+++ b/common/translations/lang/en.json
@@ -72,6 +72,7 @@
     "NAV_Swap": "Swap ",
     "NAV_ViewWallet": "View Wallet Info ",
     "NAV_YourWallets": "Your Wallets ",
+    "NAV_Utilities": "Utilities",
     "x_Access": "Access ",
     "x_AddessDesc": "Your Address can also be known as you `Account #` or your `Public Key`. It is what you share with people so they can send you Ether or Tokens. Find the colorful address icon. Make sure it matches your paper wallet & whenever you enter your address somewhere.",
     "x_Address": "Your Address ",
diff --git a/spec/libs/validators.spec.ts b/spec/libs/validators.spec.ts
index 4637b147..0794a056 100644
--- a/spec/libs/validators.spec.ts
+++ b/spec/libs/validators.spec.ts
@@ -1,11 +1,19 @@
 import {
   isValidBTCAddress,
   isValidETHAddress,
-  isValidPath
+  isValidPath,
+  isValidPrivKey
 } from '../../common/libs/validators';
 
 const VALID_BTC_ADDRESS = '1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6';
 const VALID_ETH_ADDRESS = '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8';
+const VALID_ETH_PRIVATE_KEY =
+  '3f4fd89ea4970cc77bfd2d07a95786575ea62e183857afe6301578e1a3c5c782';
+const INVALID_ETH_PRIVATE_KEY =
+  '3f4fd89ea4970cc77bfd2d07a95786575ea62e183857afe6301578e1a3c5ZZZZ';
+const VALID_ETH_PRIVATE_BUFFER = Buffer.from(VALID_ETH_PRIVATE_KEY, 'hex');
+const VALID_ETH_PRIVATE_0X =
+  '0x3f4fd89ea4970cc77bfd2d07a95786575ea62e183857afe6301578e1a3c5c782';
 
 describe('Validator', () => {
   it('should validate correct BTC address as true', () => {
@@ -25,11 +33,22 @@ describe('Validator', () => {
       isValidETHAddress('nonsense' + VALID_ETH_ADDRESS + 'nonsense')
     ).toBeFalsy();
   });
-
   it('should validate a correct DPath as true', () => {
     expect(isValidPath("m/44'/60'/0'/0")).toBeTruthy();
   });
   it('should validate an incorrect DPath as false', () => {
     expect(isValidPath('m/44/60/0/0')).toBeFalsy();
   });
+  it('should validate private key as true', () => {
+    expect(isValidPrivKey(VALID_ETH_PRIVATE_KEY)).toBeTruthy();
+  });
+  it('should validate invalid private key as false', () => {
+    expect(isValidPrivKey(INVALID_ETH_PRIVATE_KEY)).toBeFalsy();
+  });
+  it('should validate 0x private keys as true', () => {
+    expect(isValidPrivKey(VALID_ETH_PRIVATE_0X)).toBeTruthy();
+  });
+  it('should validate private key buffer type as true', () => {
+    expect(isValidPrivKey(VALID_ETH_PRIVATE_BUFFER)).toBeTruthy();
+  });
 });
diff --git a/spec/sagas/wallet.spec.tsx b/spec/sagas/wallet.spec.tsx
index 92532dae..215f5758 100644
--- a/spec/sagas/wallet.spec.tsx
+++ b/spec/sagas/wallet.spec.tsx
@@ -12,7 +12,7 @@ import {
 import { Wei } from 'libs/units';
 import { changeNodeIntent } from 'actions/config';
 import { INode } from 'libs/nodes/INode';
-import { initWeb3Node, Token } from 'config/data';
+import { initWeb3Node, Token, N_FACTOR } from 'config/data';
 import { apply, call, cps, fork, put, select } from 'redux-saga/effects';
 import { getNetworkConfig, getNodeLib } from 'selectors/config';
 import { getTokens, getWalletInst } from 'selectors/wallet';
@@ -65,7 +65,7 @@ const utcKeystore = {
     kdfparams: {
       dklen: 32,
       salt: '037a53e520f2d00fb70f02f39b31b77374de9e0e1d35fd7cbe9c8a8b21d6b0ab',
-      n: 1024,
+      n: N_FACTOR,
       r: 8,
       p: 1
     },

From c88ff3ba69542bd92c7be96e049a9c0ad1fcdf05 Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Thu, 30 Nov 2017 13:58:28 -0800
Subject: [PATCH 42/46] Arrow function to prevent error in Sign Message (#502)

---
 .../SignAndVerifyMessage/components/SignMessage/index.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
index 1237db3e..25718e91 100644
--- a/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
+++ b/common/containers/Tabs/SignAndVerifyMessage/components/SignMessage/index.tsx
@@ -85,7 +85,7 @@ export class SignMessage extends Component<Props, State> {
     this.setState({ signedMessage });
   };
 
-  private renderSignButton(fullWallet: IFullWallet) {
+  private renderSignButton = (fullWallet: IFullWallet) => {
     return (
       <SignButton
         wallet={fullWallet}
@@ -94,7 +94,7 @@ export class SignMessage extends Component<Props, State> {
         onSignMessage={this.onSignMessage}
       />
     );
-  }
+  };
 
   private renderUnlock() {
     return <WalletDecrypt />;

From eb490a78b304a58216685af6442492554d2e1af5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2017 22:05:27 -0600
Subject: [PATCH 43/46] chore(package): update awesome-typescript-loader to
 version 3.4.1 (#503)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4998ef54..62e60e2b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@types/redux-promise-middleware": "0.0.9",
     "@types/uuid": "3.4.3",
     "@types/webpack-env": "1.13.2",
-    "awesome-typescript-loader": "3.4.0",
+    "awesome-typescript-loader": "3.4.1",
     "babel-minify-webpack-plugin": "0.2.0",
     "bs58": "4.0.1",
     "cache-loader": "1.2.0",

From b638b746de7b13694677c469d01d7e6846318877 Mon Sep 17 00:00:00 2001
From: William O'Beirne <wbobeirne@gmail.com>
Date: Fri, 1 Dec 2017 08:09:51 -0800
Subject: [PATCH 44/46] Custom Nodes - Final Touches (#501)

* Add warning about matching nodes, only allow one url:port combination of nodes.

* Fix up alert styling.

* Custom network form.

* Add custom network to redux store. Setup infrastructure for removal and display.

* Persist custom networks to LS, show them in display.

* Force chain id, make typing happy.

* Display custom networks in network dropdown.

* Fix form validation, purge unused custom networks.
---
 common/actions/config/actionCreators.ts       |  22 ++-
 common/actions/config/actionTypes.ts          |  16 +-
 common/actions/config/constants.ts            |   2 +
 .../Header/components/CustomNodeModal.tsx     | 163 ++++++++++++++++--
 common/components/Header/index.tsx            |  48 ++++--
 common/config/data.ts                         |   6 +
 common/containers/TabSection/index.tsx        |  53 ++++--
 .../Tabs/Contracts/components/withTx.tsx      |  27 +--
 common/libs/transaction.ts                    |   2 +-
 common/reducers/config.ts                     |  49 +++++-
 common/sagas/config.ts                        |  20 +++
 common/sass/styles/overrides/alerts.scss      |  22 ++-
 common/sass/styles/overrides/forms.scss       |   6 +
 common/selectors/config.ts                    |  21 ++-
 common/selectors/wallet.ts                    |   3 +-
 common/store.ts                               |   3 +-
 common/utils/network.ts                       |  30 ++++
 17 files changed, 406 insertions(+), 87 deletions(-)
 create mode 100644 common/utils/network.ts

diff --git a/common/actions/config/actionCreators.ts b/common/actions/config/actionCreators.ts
index 8b189127..dcfea5c4 100644
--- a/common/actions/config/actionCreators.ts
+++ b/common/actions/config/actionCreators.ts
@@ -1,6 +1,6 @@
 import * as interfaces from './actionTypes';
 import { TypeKeys } from './constants';
-import { NodeConfig, CustomNodeConfig } from 'config/data';
+import { NodeConfig, CustomNodeConfig, CustomNetworkConfig } from 'config/data';
 
 export type TForceOfflineConfig = typeof forceOfflineConfig;
 export function forceOfflineConfig(): interfaces.ForceOfflineAction {
@@ -80,6 +80,26 @@ export function removeCustomNode(
   };
 }
 
+export type TAddCustomNetwork = typeof addCustomNetwork;
+export function addCustomNetwork(
+  payload: CustomNetworkConfig
+): interfaces.AddCustomNetworkAction {
+  return {
+    type: TypeKeys.CONFIG_ADD_CUSTOM_NETWORK,
+    payload
+  };
+}
+
+export type TRemoveCustomNetwork = typeof removeCustomNetwork;
+export function removeCustomNetwork(
+  payload: CustomNetworkConfig
+): interfaces.RemoveCustomNetworkAction {
+  return {
+    type: TypeKeys.CONFIG_REMOVE_CUSTOM_NETWORK,
+    payload
+  };
+}
+
 export type TSetLatestBlock = typeof setLatestBlock;
 export function setLatestBlock(
   payload: string
diff --git a/common/actions/config/actionTypes.ts b/common/actions/config/actionTypes.ts
index e8b27135..7e72703d 100644
--- a/common/actions/config/actionTypes.ts
+++ b/common/actions/config/actionTypes.ts
@@ -1,5 +1,5 @@
 import { TypeKeys } from './constants';
-import { CustomNodeConfig, NodeConfig } from 'config/data';
+import { NodeConfig, CustomNodeConfig, CustomNetworkConfig } from 'config/data';
 
 /*** Toggle Offline ***/
 export interface ToggleOfflineAction {
@@ -56,6 +56,18 @@ export interface RemoveCustomNodeAction {
   payload: CustomNodeConfig;
 }
 
+/*** Add Custom Network ***/
+export interface AddCustomNetworkAction {
+  type: TypeKeys.CONFIG_ADD_CUSTOM_NETWORK;
+  payload: CustomNetworkConfig;
+}
+
+/*** Remove Custom Network ***/
+export interface RemoveCustomNetworkAction {
+  type: TypeKeys.CONFIG_REMOVE_CUSTOM_NETWORK;
+  payload: CustomNetworkConfig;
+}
+
 /*** Set Latest Block ***/
 export interface SetLatestBlockAction {
   type: TypeKeys.CONFIG_SET_LATEST_BLOCK;
@@ -78,5 +90,7 @@ export type ConfigAction =
   | ChangeNodeIntentAction
   | AddCustomNodeAction
   | RemoveCustomNodeAction
+  | AddCustomNetworkAction
+  | RemoveCustomNetworkAction
   | SetLatestBlockAction
   | Web3UnsetNodeAction;
diff --git a/common/actions/config/constants.ts b/common/actions/config/constants.ts
index d11471ac..519f2ba6 100644
--- a/common/actions/config/constants.ts
+++ b/common/actions/config/constants.ts
@@ -8,6 +8,8 @@ export enum TypeKeys {
   CONFIG_POLL_OFFLINE_STATUS = 'CONFIG_POLL_OFFLINE_STATUS',
   CONFIG_ADD_CUSTOM_NODE = 'CONFIG_ADD_CUSTOM_NODE',
   CONFIG_REMOVE_CUSTOM_NODE = 'CONFIG_REMOVE_CUSTOM_NODE',
+  CONFIG_ADD_CUSTOM_NETWORK = 'CONFIG_ADD_CUSTOM_NETWORK',
+  CONFIG_REMOVE_CUSTOM_NETWORK = 'CONFIG_REMOVE_CUSTOM_NETWORK',
   CONFIG_SET_LATEST_BLOCK = 'CONFIG_SET_LATEST_BLOCK',
   CONFIG_NODE_WEB3_UNSET = 'CONFIG_NODE_WEB3_UNSET'
 }
diff --git a/common/components/Header/components/CustomNodeModal.tsx b/common/components/Header/components/CustomNodeModal.tsx
index fae273eb..ac58e895 100644
--- a/common/components/Header/components/CustomNodeModal.tsx
+++ b/common/components/Header/components/CustomNodeModal.tsx
@@ -2,9 +2,12 @@ import React from 'react';
 import classnames from 'classnames';
 import Modal, { IButton } from 'components/ui/Modal';
 import translate from 'translations';
-import { NETWORKS, CustomNodeConfig } from 'config/data';
+import { NETWORKS, CustomNodeConfig, CustomNetworkConfig } from 'config/data';
+import { makeCustomNodeId } from 'utils/node';
+import { makeCustomNetworkId } from 'utils/network';
 
 const NETWORK_KEYS = Object.keys(NETWORKS);
+const CUSTOM = 'custom';
 
 interface Input {
   name: string;
@@ -13,7 +16,10 @@ interface Input {
 }
 
 interface Props {
+  customNodes: CustomNodeConfig[];
+  customNetworks: CustomNetworkConfig[];
   handleAddCustomNode(node: CustomNodeConfig): void;
+  handleAddCustomNetwork(node: CustomNetworkConfig): void;
   handleClose(): void;
 }
 
@@ -22,6 +28,9 @@ interface State {
   url: string;
   port: string;
   network: string;
+  customNetworkName: string;
+  customNetworkUnit: string;
+  customNetworkChainId: string;
   hasAuth: boolean;
   username: string;
   password: string;
@@ -33,13 +42,17 @@ export default class CustomNodeModal extends React.Component<Props, State> {
     url: '',
     port: '',
     network: NETWORK_KEYS[0],
+    customNetworkName: '',
+    customNetworkUnit: '',
+    customNetworkChainId: '',
     hasAuth: false,
     username: '',
     password: ''
   };
 
   public render() {
-    const { handleClose } = this.props;
+    const { customNetworks, handleClose } = this.props;
+    const { network } = this.state;
     const isHttps = window.location.protocol.includes('https');
     const invalids = this.getInvalids();
 
@@ -56,6 +69,8 @@ export default class CustomNodeModal extends React.Component<Props, State> {
       }
     ];
 
+    const conflictedNode = this.getConflictedNode();
+
     return (
       <Modal
         title={translate('NODE_Title')}
@@ -65,11 +80,18 @@ export default class CustomNodeModal extends React.Component<Props, State> {
       >
         <div>
           {isHttps && (
-            <div className="alert alert-danger small">
+            <div className="alert alert-warning small">
               {translate('NODE_Warning')}
             </div>
           )}
 
+          {conflictedNode && (
+            <div className="alert alert-warning small">
+              You already have a node called '{conflictedNode.name}' that
+              matches this one, saving this will overwrite it
+            </div>
+          )}
+
           <form>
             <div className="row">
               <div className="col-sm-7">
@@ -87,7 +109,7 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                 <select
                   className="form-control"
                   name="network"
-                  value={this.state.network}
+                  value={network}
                   onChange={this.handleChange}
                 >
                   {NETWORK_KEYS.map(net => (
@@ -95,10 +117,56 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                       {net}
                     </option>
                   ))}
+                  {customNetworks.map(net => {
+                    const id = makeCustomNetworkId(net);
+                    return (
+                      <option key={id} value={id}>
+                        {net.name} (Custom)
+                      </option>
+                    );
+                  })}
+                  <option value={CUSTOM}>Custom...</option>
                 </select>
               </div>
             </div>
 
+            {network === CUSTOM && (
+              <div className="row">
+                <div className="col-sm-6">
+                  <label className="is-required">Network Name</label>
+                  {this.renderInput(
+                    {
+                      name: 'customNetworkName',
+                      placeholder: 'My Custom Network'
+                    },
+                    invalids
+                  )}
+                </div>
+                <div className="col-sm-3">
+                  <label className="is-required">Currency</label>
+                  {this.renderInput(
+                    {
+                      name: 'customNetworkUnit',
+                      placeholder: 'ETH'
+                    },
+                    invalids
+                  )}
+                </div>
+                <div className="col-sm-3">
+                  <label>Chain ID</label>
+                  {this.renderInput(
+                    {
+                      name: 'customNetworkChainId',
+                      placeholder: 'e.g. 1'
+                    },
+                    invalids
+                  )}
+                </div>
+              </div>
+            )}
+
+            <hr />
+
             <div className="row">
               <div className="col-sm-9">
                 <label>URL</label>
@@ -123,6 +191,7 @@ export default class CustomNodeModal extends React.Component<Props, State> {
                 )}
               </div>
             </div>
+
             <div className="row">
               <div className="col-sm-12">
                 <label>
@@ -139,11 +208,11 @@ export default class CustomNodeModal extends React.Component<Props, State> {
             {this.state.hasAuth && (
               <div className="row">
                 <div className="col-sm-6">
-                  <label>Username</label>
+                  <label className="is-required">Username</label>
                   {this.renderInput({ name: 'username' }, invalids)}
                 </div>
                 <div className="col-sm-6">
-                  <label>Password</label>
+                  <label className="is-required">Password</label>
                   {this.renderInput(
                     {
                       name: 'password',
@@ -175,7 +244,17 @@ export default class CustomNodeModal extends React.Component<Props, State> {
   }
 
   private getInvalids(): { [key: string]: boolean } {
-    const { url, port, hasAuth, username, password } = this.state;
+    const {
+      url,
+      port,
+      hasAuth,
+      username,
+      password,
+      network,
+      customNetworkName,
+      customNetworkUnit,
+      customNetworkChainId
+    } = this.state;
     const required = ['name', 'url', 'port', 'network'];
     const invalids: { [key: string]: boolean } = {};
 
@@ -207,9 +286,64 @@ export default class CustomNodeModal extends React.Component<Props, State> {
       }
     }
 
+    // If they have a custom network, make sure info is provided
+    if (network === CUSTOM) {
+      if (!customNetworkName) {
+        invalids.customNetworkName = true;
+      }
+      if (!customNetworkUnit) {
+        invalids.customNetworkUnit = true;
+      }
+
+      // Numeric chain ID (if provided)
+      const iChainId = parseInt(customNetworkChainId, 10);
+      if (!iChainId || iChainId < 0) {
+        invalids.customNetworkChainId = true;
+      }
+    }
+
     return invalids;
   }
 
+  private makeCustomNetworkConfigFromState(): CustomNetworkConfig {
+    return {
+      name: this.state.customNetworkName,
+      unit: this.state.customNetworkUnit,
+      chainId: this.state.customNetworkChainId
+        ? parseInt(this.state.customNetworkChainId, 10)
+        : 0
+    };
+  }
+
+  private makeCustomNodeConfigFromState(): CustomNodeConfig {
+    const { network } = this.state;
+    const node: CustomNodeConfig = {
+      name: this.state.name.trim(),
+      url: this.state.url.trim(),
+      port: parseInt(this.state.port, 10),
+      network:
+        network === CUSTOM
+          ? makeCustomNetworkId(this.makeCustomNetworkConfigFromState())
+          : network
+    };
+
+    if (this.state.hasAuth) {
+      node.auth = {
+        username: this.state.username,
+        password: this.state.password
+      };
+    }
+
+    return node;
+  }
+
+  private getConflictedNode(): CustomNodeConfig | undefined {
+    const { customNodes } = this.props;
+    const config = this.makeCustomNodeConfigFromState();
+    const thisId = makeCustomNodeId(config);
+    return customNodes.find(conf => makeCustomNodeId(conf) === thisId);
+  }
+
   private handleChange = (
     ev: React.FormEvent<HTMLInputElement | HTMLSelectElement>
   ) => {
@@ -223,18 +357,11 @@ export default class CustomNodeModal extends React.Component<Props, State> {
   };
 
   private saveAndAdd = () => {
-    const node: CustomNodeConfig = {
-      name: this.state.name.trim(),
-      url: this.state.url.trim(),
-      port: parseInt(this.state.port, 10),
-      network: this.state.network
-    };
+    const node = this.makeCustomNodeConfigFromState();
 
-    if (this.state.hasAuth) {
-      node.auth = {
-        username: this.state.username,
-        password: this.state.password
-      };
+    if (this.state.network === CUSTOM) {
+      const network = this.makeCustomNetworkConfigFromState();
+      this.props.handleAddCustomNetwork(network);
     }
 
     this.props.handleAddCustomNode(node);
diff --git a/common/components/Header/index.tsx b/common/components/Header/index.tsx
index 6e381db4..111a8a04 100644
--- a/common/components/Header/index.tsx
+++ b/common/components/Header/index.tsx
@@ -3,7 +3,8 @@ import {
   TChangeLanguage,
   TChangeNodeIntent,
   TAddCustomNode,
-  TRemoveCustomNode
+  TRemoveCustomNode,
+  TAddCustomNetwork
 } from 'actions/config';
 import logo from 'assets/images/logo-myetherwallet.svg';
 import { Dropdown, ColorDropdown } from 'components/ui';
@@ -14,17 +15,18 @@ import {
   ANNOUNCEMENT_MESSAGE,
   ANNOUNCEMENT_TYPE,
   languages,
-  NETWORKS,
   NODES,
   VERSION,
   NodeConfig,
-  CustomNodeConfig
-} from '../../config/data';
+  CustomNodeConfig,
+  CustomNetworkConfig
+} from 'config/data';
 import GasPriceDropdown from './components/GasPriceDropdown';
 import Navigation from './components/Navigation';
 import CustomNodeModal from './components/CustomNodeModal';
 import { getKeyByValue } from 'utils/helpers';
 import { makeCustomNodeId } from 'utils/node';
+import { getNetworkConfigFromId } from 'utils/network';
 import './index.scss';
 
 interface Props {
@@ -34,12 +36,14 @@ interface Props {
   isChangingNode: boolean;
   gasPriceGwei: number;
   customNodes: CustomNodeConfig[];
+  customNetworks: CustomNetworkConfig[];
 
   changeLanguage: TChangeLanguage;
   changeNodeIntent: TChangeNodeIntent;
   changeGasPrice: TChangeGasPrice;
   addCustomNode: TAddCustomNode;
   removeCustomNode: TRemoveCustomNode;
+  addCustomNetwork: TAddCustomNetwork;
 }
 
 interface State {
@@ -58,40 +62,47 @@ export default class Header extends Component<Props, State> {
       node,
       nodeSelection,
       isChangingNode,
-      customNodes
+      customNodes,
+      customNetworks
     } = this.props;
     const { isAddingCustomNode } = this.state;
     const selectedLanguage = languageSelection;
-    const selectedNetwork = NETWORKS[node.network];
+    const selectedNetwork = getNetworkConfigFromId(
+      node.network,
+      customNetworks
+    );
     const LanguageDropDown = Dropdown as new () => Dropdown<
       typeof selectedLanguage
     >;
 
     const nodeOptions = Object.keys(NODES)
       .map(key => {
+        const n = NODES[key];
+        const network = getNetworkConfigFromId(n.network, customNetworks);
         return {
           value: key,
           name: (
             <span>
-              {NODES[key].network} <small>({NODES[key].service})</small>
+              {network && network.name} <small>({n.service})</small>
             </span>
           ),
-          color: NETWORKS[NODES[key].network].color,
-          hidden: NODES[key].hidden
+          color: network && network.color,
+          hidden: n.hidden
         };
       })
       .concat(
-        customNodes.map(customNode => {
+        customNodes.map(cn => {
+          const network = getNetworkConfigFromId(cn.network, customNetworks);
           return {
-            value: makeCustomNodeId(customNode),
+            value: makeCustomNodeId(cn),
             name: (
               <span>
-                {customNode.network} - {customNode.name} <small>(custom)</small>
+                {network && network.name} - {cn.name} <small>(custom)</small>
               </span>
             ),
-            color: '#000',
+            color: network && network.color,
             hidden: false,
-            onRemove: () => this.props.removeCustomNode(customNode)
+            onRemove: () => this.props.removeCustomNode(cn)
           };
         })
       );
@@ -161,8 +172,8 @@ export default class Header extends Component<Props, State> {
               >
                 <ColorDropdown
                   ariaLabel={`
-                    change node. current node ${node.network}
-                    node by ${node.service}
+                    change node. current node is on the ${node.network} network
+                    provided by ${node.service}
                   `}
                   options={nodeOptions}
                   value={nodeSelection}
@@ -182,11 +193,14 @@ export default class Header extends Component<Props, State> {
           </section>
         </section>
 
-        <Navigation color={selectedNetwork.color} />
+        <Navigation color={selectedNetwork && selectedNetwork.color} />
 
         {isAddingCustomNode && (
           <CustomNodeModal
+            customNodes={customNodes}
+            customNetworks={customNetworks}
             handleAddCustomNode={this.addCustomNode}
+            handleAddCustomNetwork={this.props.addCustomNetwork}
             handleClose={this.closeCustomNodeModal}
           />
         )}
diff --git a/common/config/data.ts b/common/config/data.ts
index 2cd8684b..25a1ef87 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -79,6 +79,12 @@ export interface NetworkConfig {
   contracts: NetworkContract[] | null;
 }
 
+export interface CustomNetworkConfig {
+  name: string;
+  unit: string;
+  chainId: number;
+}
+
 export interface NodeConfig {
   network: string;
   lib: RPCNode | Web3Node;
diff --git a/common/containers/TabSection/index.tsx b/common/containers/TabSection/index.tsx
index b50a69dd..d2f8888c 100644
--- a/common/containers/TabSection/index.tsx
+++ b/common/containers/TabSection/index.tsx
@@ -1,40 +1,49 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
 import {
   changeGasPrice as dChangeGasPrice,
   changeLanguage as dChangeLanguage,
   changeNodeIntent as dChangeNodeIntent,
   addCustomNode as dAddCustomNode,
   removeCustomNode as dRemoveCustomNode,
+  addCustomNetwork as dAddCustomNetwork,
   TChangeGasPrice,
   TChangeLanguage,
   TChangeNodeIntent,
   TAddCustomNode,
-  TRemoveCustomNode
+  TRemoveCustomNode,
+  TAddCustomNetwork
 } from 'actions/config';
 import { AlphaAgreement, Footer, Header } from 'components';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import { AppState } from 'reducers';
 import Notifications from './Notifications';
-import { NodeConfig, CustomNodeConfig } from 'config/data';
 
-interface Props {
-  // FIXME
-  children: any;
-
-  languageSelection: string;
-  node: NodeConfig;
-  nodeSelection: string;
-  isChangingNode: boolean;
-  gasPriceGwei: number;
-  customNodes: CustomNodeConfig[];
-  latestBlock: string;
+interface ReduxProps {
+  languageSelection: AppState['config']['languageSelection'];
+  node: AppState['config']['node'];
+  nodeSelection: AppState['config']['nodeSelection'];
+  isChangingNode: AppState['config']['isChangingNode'];
+  gasPriceGwei: AppState['config']['gasPriceGwei'];
+  customNodes: AppState['config']['customNodes'];
+  customNetworks: AppState['config']['customNetworks'];
+  latestBlock: AppState['config']['latestBlock'];
+}
 
+interface ActionProps {
   changeLanguage: TChangeLanguage;
   changeNodeIntent: TChangeNodeIntent;
   changeGasPrice: TChangeGasPrice;
   addCustomNode: TAddCustomNode;
   removeCustomNode: TRemoveCustomNode;
+  addCustomNetwork: TAddCustomNetwork;
 }
+
+type Props = {
+  // FIXME
+  children: any;
+} & ReduxProps &
+  ActionProps;
+
 class TabSection extends Component<Props, {}> {
   public render() {
     const {
@@ -46,13 +55,15 @@ class TabSection extends Component<Props, {}> {
       languageSelection,
       gasPriceGwei,
       customNodes,
+      customNetworks,
       latestBlock,
 
       changeLanguage,
       changeNodeIntent,
       changeGasPrice,
       addCustomNode,
-      removeCustomNode
+      removeCustomNode,
+      addCustomNetwork
     } = this.props;
 
     const headerProps = {
@@ -62,12 +73,14 @@ class TabSection extends Component<Props, {}> {
       isChangingNode,
       gasPriceGwei,
       customNodes,
+      customNetworks,
 
       changeLanguage,
       changeNodeIntent,
       changeGasPrice,
       addCustomNode,
-      removeCustomNode
+      removeCustomNode,
+      addCustomNetwork
     };
 
     return (
@@ -84,7 +97,7 @@ class TabSection extends Component<Props, {}> {
   }
 }
 
-function mapStateToProps(state: AppState) {
+function mapStateToProps(state: AppState): ReduxProps {
   return {
     node: state.config.node,
     nodeSelection: state.config.nodeSelection,
@@ -92,6 +105,7 @@ function mapStateToProps(state: AppState) {
     languageSelection: state.config.languageSelection,
     gasPriceGwei: state.config.gasPriceGwei,
     customNodes: state.config.customNodes,
+    customNetworks: state.config.customNetworks,
     latestBlock: state.config.latestBlock
   };
 }
@@ -101,5 +115,6 @@ export default connect(mapStateToProps, {
   changeLanguage: dChangeLanguage,
   changeNodeIntent: dChangeNodeIntent,
   addCustomNode: dAddCustomNode,
-  removeCustomNode: dRemoveCustomNode
+  removeCustomNode: dRemoveCustomNode,
+  addCustomNetwork: dAddCustomNetwork
 })(TabSection);
diff --git a/common/containers/Tabs/Contracts/components/withTx.tsx b/common/containers/Tabs/Contracts/components/withTx.tsx
index d1c1b625..2a1d6e87 100644
--- a/common/containers/Tabs/Contracts/components/withTx.tsx
+++ b/common/containers/Tabs/Contracts/components/withTx.tsx
@@ -20,18 +20,21 @@ export interface IWithTx {
   showNotification: TShowNotification;
 }
 
-const mapStateToProps = (state: AppState) => ({
-  wallet: state.wallet.inst,
-  balance: state.wallet.balance,
-  node: configSelectors.getNodeConfig(state),
-  nodeLib: configSelectors.getNodeLib(state),
-  chainId: configSelectors.getNetworkConfig(state).chainId,
-  networkName: configSelectors.getNetworkConfig(state).name,
-  gasPrice: toWei(
-    `${configSelectors.getGasPriceGwei(state)}`,
-    getDecimal('gwei')
-  )
-});
+const mapStateToProps = (state: AppState) => {
+  const network = configSelectors.getNetworkConfig(state);
+  return {
+    wallet: state.wallet.inst,
+    balance: state.wallet.balance,
+    node: configSelectors.getNodeConfig(state),
+    nodeLib: configSelectors.getNodeLib(state),
+    chainId: network ? network.chainId : 0,
+    networkName: network ? network.name : 'Unknown network',
+    gasPrice: toWei(
+      `${configSelectors.getGasPriceGwei(state)}`,
+      getDecimal('gwei')
+    )
+  };
+};
 
 export const withTx = passedComponent =>
   connect(mapStateToProps, {
diff --git a/common/libs/transaction.ts b/common/libs/transaction.ts
index 40514f29..7afb8d2d 100644
--- a/common/libs/transaction.ts
+++ b/common/libs/transaction.ts
@@ -198,7 +198,7 @@ export async function generateCompleteTransactionFromRawTransaction(
     to: toChecksumAddress(cleanHex(to)),
     value: token ? '0x00' : cleanHex(value.toString(16)),
     data: data ? cleanHex(data) : '',
-    chainId: chainId || 1
+    chainId: chainId || 0
   };
 
   // Sign the transaction
diff --git a/common/reducers/config.ts b/common/reducers/config.ts
index 6e122dc5..1056c326 100644
--- a/common/reducers/config.ts
+++ b/common/reducers/config.ts
@@ -4,23 +4,35 @@ import {
   ChangeNodeAction,
   AddCustomNodeAction,
   RemoveCustomNodeAction,
+  AddCustomNetworkAction,
+  RemoveCustomNetworkAction,
   SetLatestBlockAction,
   ConfigAction
 } from 'actions/config';
 import { TypeKeys } from 'actions/config/constants';
-import { NODES, NodeConfig, CustomNodeConfig } from '../config/data';
+import {
+  NODES,
+  NETWORKS,
+  NodeConfig,
+  CustomNodeConfig,
+  NetworkConfig,
+  CustomNetworkConfig
+} from '../config/data';
 import { makeCustomNodeId } from 'utils/node';
+import { makeCustomNetworkId } from 'utils/network';
 
 export interface State {
   // FIXME
   languageSelection: string;
   nodeSelection: string;
   node: NodeConfig;
+  network: NetworkConfig;
   isChangingNode: boolean;
   gasPriceGwei: number;
   offline: boolean;
   forceOffline: boolean;
   customNodes: CustomNodeConfig[];
+  customNetworks: CustomNetworkConfig[];
   latestBlock: string;
 }
 
@@ -29,11 +41,13 @@ export const INITIAL_STATE: State = {
   languageSelection: 'en',
   nodeSelection: defaultNode,
   node: NODES[defaultNode],
+  network: NETWORKS[NODES[defaultNode].network],
   isChangingNode: false,
   gasPriceGwei: 21,
   offline: false,
   forceOffline: false,
   customNodes: [],
+  customNetworks: [],
   latestBlock: '???'
 };
 
@@ -82,9 +96,13 @@ function forceOffline(state: State): State {
 }
 
 function addCustomNode(state: State, action: AddCustomNodeAction): State {
+  const newId = makeCustomNodeId(action.payload);
   return {
     ...state,
-    customNodes: [...state.customNodes, action.payload]
+    customNodes: [
+      ...state.customNodes.filter(node => makeCustomNodeId(node) !== newId),
+      action.payload
+    ]
   };
 }
 
@@ -98,6 +116,29 @@ function removeCustomNode(state: State, action: RemoveCustomNodeAction): State {
   };
 }
 
+function addCustomNetwork(state: State, action: AddCustomNetworkAction): State {
+  const newId = makeCustomNetworkId(action.payload);
+  return {
+    ...state,
+    customNetworks: [
+      ...state.customNetworks.filter(
+        node => makeCustomNetworkId(node) !== newId
+      ),
+      action.payload
+    ]
+  };
+}
+
+function removeCustomNetwork(
+  state: State,
+  action: RemoveCustomNetworkAction
+): State {
+  return {
+    ...state,
+    customNetworks: state.customNetworks.filter(cn => cn !== action.payload)
+  };
+}
+
 function setLatestBlock(state: State, action: SetLatestBlockAction): State {
   return {
     ...state,
@@ -126,6 +167,10 @@ export function config(
       return addCustomNode(state, action);
     case TypeKeys.CONFIG_REMOVE_CUSTOM_NODE:
       return removeCustomNode(state, action);
+    case TypeKeys.CONFIG_ADD_CUSTOM_NETWORK:
+      return addCustomNetwork(state, action);
+    case TypeKeys.CONFIG_REMOVE_CUSTOM_NETWORK:
+      return removeCustomNetwork(state, action);
     case TypeKeys.CONFIG_SET_LATEST_BLOCK:
       return setLatestBlock(state, action);
     default:
diff --git a/common/sagas/config.ts b/common/sagas/config.ts
index 294713c7..0ec9bd8a 100644
--- a/common/sagas/config.ts
+++ b/common/sagas/config.ts
@@ -16,10 +16,12 @@ import {
   getCustomNodeConfigFromId,
   makeNodeConfigFromCustomConfig
 } from 'utils/node';
+import { makeCustomNetworkId } from 'utils/network';
 import {
   getNode,
   getNodeConfig,
   getCustomNodeConfigs,
+  getCustomNetworkConfigs,
   getOffline,
   getForceOffline
 } from 'selectors/config';
@@ -30,6 +32,7 @@ import {
   changeNode,
   changeNodeIntent,
   setLatestBlock,
+  removeCustomNetwork,
   AddCustomNodeAction,
   ChangeNodeIntentAction
 } from 'actions/config';
@@ -188,6 +191,22 @@ export function* switchToNewNode(action: AddCustomNodeAction): SagaIterator {
   yield put(changeNodeIntent(nodeId));
 }
 
+// If there are any orphaned custom networks, purge them
+export function* cleanCustomNetworks(): SagaIterator {
+  const customNodes = yield select(getCustomNodeConfigs);
+  const customNetworks = yield select(getCustomNetworkConfigs);
+  const networksInUse = customNodes.reduce((prev, conf) => {
+    prev[conf.network] = true;
+    return prev;
+  }, {});
+
+  for (const net of customNetworks) {
+    if (!networksInUse[makeCustomNetworkId(net)]) {
+      yield put(removeCustomNetwork(net));
+    }
+  }
+}
+
 // unset web3 as the selected node if a non-web3 wallet has been selected
 export function* unsetWeb3Node(action): SagaIterator {
   const node = yield select(getNode);
@@ -230,6 +249,7 @@ export default function* configSaga(): SagaIterator {
   yield takeEvery(TypeKeys.CONFIG_NODE_CHANGE_INTENT, handleNodeChangeIntent);
   yield takeEvery(TypeKeys.CONFIG_LANGUAGE_CHANGE, reload);
   yield takeEvery(TypeKeys.CONFIG_ADD_CUSTOM_NODE, switchToNewNode);
+  yield takeEvery(TypeKeys.CONFIG_REMOVE_CUSTOM_NODE, cleanCustomNetworks);
   yield takeEvery(WalletTypeKeys.WALLET_SET, unsetWeb3Node);
   yield takeEvery(WalletTypeKeys.WALLET_RESET, unsetWeb3Node);
 }
diff --git a/common/sass/styles/overrides/alerts.scss b/common/sass/styles/overrides/alerts.scss
index e29ea60e..f077dce8 100644
--- a/common/sass/styles/overrides/alerts.scss
+++ b/common/sass/styles/overrides/alerts.scss
@@ -3,6 +3,19 @@
 @import "common/sass/mixins";
 @import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts";
 
+.alert {
+  margin-bottom: 1rem;
+
+  a {
+    color: #FFF;
+
+    &:hover {
+      color: #FFF;
+      opacity: 0.8;
+    }
+  }
+}
+
 // Alert icons
 .alert:after {
   content: '';
@@ -23,15 +36,6 @@
   @media screen and (max-width: $screen-xs) {
     left: 1%;
   }
-
-  a {
-    color: #FFF;
-
-    &:hover {
-      color: #FFF;
-      opacity: 0.8;
-    }
-  }
 }
 
 .alert,
diff --git a/common/sass/styles/overrides/forms.scss b/common/sass/styles/overrides/forms.scss
index 0ab18237..5ed54b54 100644
--- a/common/sass/styles/overrides/forms.scss
+++ b/common/sass/styles/overrides/forms.scss
@@ -4,6 +4,12 @@
 label {
   margin-bottom: $space-xs;
   font-size: $font-size-bump-more;
+
+  &.is-required:after {
+    content: '*';
+    padding-left: 2px;
+    color: $brand-warning;
+  }
 }
 
 label + .form-control,
diff --git a/common/selectors/config.ts b/common/selectors/config.ts
index 55ee44ff..7091f9bd 100644
--- a/common/selectors/config.ts
+++ b/common/selectors/config.ts
@@ -1,12 +1,13 @@
 import {
   NetworkConfig,
   NetworkContract,
-  NETWORKS,
   NodeConfig,
-  CustomNodeConfig
+  CustomNodeConfig,
+  CustomNetworkConfig
 } from 'config/data';
 import { INode } from 'libs/nodes/INode';
 import { AppState } from 'reducers';
+import { getNetworkConfigFromId } from 'utils/network';
 
 export function getNode(state: AppState): string {
   return state.config.nodeSelection;
@@ -20,12 +21,16 @@ export function getNodeLib(state: AppState): INode {
   return getNodeConfig(state).lib;
 }
 
-export function getNetworkConfig(state: AppState): NetworkConfig {
-  return NETWORKS[getNodeConfig(state).network];
+export function getNetworkConfig(state: AppState): NetworkConfig | undefined {
+  return getNetworkConfigFromId(
+    getNodeConfig(state).network,
+    getCustomNetworkConfigs(state)
+  );
 }
 
 export function getNetworkContracts(state: AppState): NetworkContract[] | null {
-  return getNetworkConfig(state).contracts;
+  const network = getNetworkConfig(state);
+  return network ? network.contracts : [];
 }
 
 export function getGasPriceGwei(state: AppState): number {
@@ -40,6 +45,12 @@ export function getCustomNodeConfigs(state: AppState): CustomNodeConfig[] {
   return state.config.customNodes;
 }
 
+export function getCustomNetworkConfigs(
+  state: AppState
+): CustomNetworkConfig[] {
+  return state.config.customNetworks;
+}
+
 export function getOffline(state: AppState): boolean {
   return state.config.offline;
 }
diff --git a/common/selectors/wallet.ts b/common/selectors/wallet.ts
index 1e52d01b..80ec1135 100644
--- a/common/selectors/wallet.ts
+++ b/common/selectors/wallet.ts
@@ -22,7 +22,8 @@ export type MergedToken = Token & {
 };
 
 export function getTokens(state: AppState): MergedToken[] {
-  const tokens: Token[] = getNetworkConfig(state).tokens;
+  const network = getNetworkConfig(state);
+  const tokens: Token[] = network ? network.tokens : [];
   return tokens.concat(
     state.customTokens.map((token: Token) => {
       const mergedToken = { ...token, custom: true };
diff --git a/common/store.ts b/common/store.ts
index 28e9524a..257872e5 100644
--- a/common/store.ts
+++ b/common/store.ts
@@ -109,7 +109,8 @@ const configureStore = () => {
           gasPriceGwei: state.config.gasPriceGwei,
           nodeSelection: state.config.nodeSelection,
           languageSelection: state.config.languageSelection,
-          customNodes: state.config.customNodes
+          customNodes: state.config.customNodes,
+          customNetworks: state.config.customNetworks
         },
         swap: { ...state.swap, bityRates: {} },
         customTokens: state.customTokens
diff --git a/common/utils/network.ts b/common/utils/network.ts
new file mode 100644
index 00000000..69ab7602
--- /dev/null
+++ b/common/utils/network.ts
@@ -0,0 +1,30 @@
+import { NETWORKS, NetworkConfig, CustomNetworkConfig } from 'config/data';
+
+export function makeCustomNetworkId(config: CustomNetworkConfig): string {
+  return config.chainId ? `${config.chainId}` : `${config.name}:${config.unit}`;
+}
+
+export function makeNetworkConfigFromCustomConfig(
+  config: CustomNetworkConfig
+): NetworkConfig {
+  return {
+    ...config,
+    color: '#000',
+    tokens: [],
+    contracts: []
+  };
+}
+
+export function getNetworkConfigFromId(
+  id: string,
+  configs: CustomNetworkConfig[]
+): NetworkConfig | undefined {
+  if (NETWORKS[id]) {
+    return NETWORKS[id];
+  }
+
+  const customConfig = configs.find(conf => makeCustomNetworkId(conf) === id);
+  if (customConfig) {
+    return makeNetworkConfigFromCustomConfig(customConfig);
+  }
+}

From c54453729c4251c2cb0126d3ffc74b3d96ccfa51 Mon Sep 17 00:00:00 2001
From: skubakdj <skubakdj@gmail.com>
Date: Fri, 1 Dec 2017 11:32:29 -0500
Subject: [PATCH 45/46] Web3 Future Proof, Refactor, Bugfixes (#481)

* correct web3 hide/show logic

* refactor web3 node lib

* refactor web3 wallet to use new web3 node

* update web3 node init to use new lib

* update web3 wallet saga to use new lib, address unlock flow bug

* remove comments

* add validators for web3 methods

* update web3 node to use latest standards

* remove legacy function

* update lib call, add account unlock check

* add & use new flavor of unsetWeb3Node

* address PR feedback

* add test, update tests, update snapshot
---
 common/config/data.ts                         |  61 +++---
 .../containers/Tabs/SendTransaction/index.tsx |   5 +-
 common/libs/nodes/rpc/types.ts                |   8 +-
 common/libs/nodes/web3/client.ts              |  43 ++++
 common/libs/nodes/web3/index.ts               | 201 ++++--------------
 common/libs/nodes/web3/requests.ts            |  29 +++
 common/libs/nodes/web3/types.ts               |  57 +++++
 common/libs/validators.ts                     |  14 +-
 common/libs/wallet/non-deterministic/web3.ts  | 109 +++++-----
 common/sagas/config.ts                        |  20 +-
 common/sagas/wallet.tsx                       |  40 ++--
 spec/sagas/__snapshots__/wallet.spec.tsx.snap |   9 -
 spec/sagas/config.spec.ts                     |  42 +++-
 spec/sagas/wallet.spec.tsx                    | 106 +++++++--
 14 files changed, 427 insertions(+), 317 deletions(-)
 create mode 100644 common/libs/nodes/web3/client.ts
 create mode 100644 common/libs/nodes/web3/requests.ts
 create mode 100644 common/libs/nodes/web3/types.ts

diff --git a/common/config/data.ts b/common/config/data.ts
index 25a1ef87..78bab0fd 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -268,43 +268,34 @@ export const NODES: { [key: string]: NodeConfig } = {
   }
 };
 
-export function initWeb3Node(): Promise<void> {
-  return new Promise((resolve, reject) => {
-    const { web3 } = window as any;
+export async function initWeb3Node(): Promise<void> {
+  const { web3 } = window as any;
 
-    if (!web3) {
-      return reject(
-        new Error(
-          'Web3 not found. Please check that MetaMask is installed, or that MyEtherWallet is open in Mist.'
-        )
-      );
-    }
+  if (!web3 || !web3.currentProvider || !web3.currentProvider.sendAsync) {
+    throw new Error(
+      'Web3 not found. Please check that MetaMask is installed, or that MyEtherWallet is open in Mist.'
+    );
+  }
 
-    if (web3.version.network === 'loading') {
-      return reject(
-        new Error(
-          'MetaMask / Mist is still loading. Please refresh the page and try again.'
-        )
-      );
-    }
+  const lib = new Web3Node();
+  const networkId = await lib.getNetVersion();
+  const accounts = await lib.getAccounts();
 
-    web3.version.getNetwork((err, networkId) => {
-      if (err) {
-        return reject(err);
-      }
+  if (!accounts.length) {
+    throw new Error('No accounts found in MetaMask / Mist.');
+  }
 
-      try {
-        NODES.web3 = {
-          network: networkIdToName(networkId),
-          service: 'MetaMask / Mist',
-          lib: new Web3Node(web3),
-          estimateGas: false,
-          hidden: true
-        };
-        resolve();
-      } catch (err) {
-        reject(err);
-      }
-    });
-  });
+  if (networkId === 'loading') {
+    throw new Error(
+      'MetaMask / Mist is still loading. Please refresh the page and try again.'
+    );
+  }
+
+  NODES.web3 = {
+    network: networkIdToName(networkId),
+    service: 'MetaMask / Mist',
+    lib,
+    estimateGas: false,
+    hidden: true
+  };
 }
diff --git a/common/containers/Tabs/SendTransaction/index.tsx b/common/containers/Tabs/SendTransaction/index.tsx
index e4664814..4b913983 100644
--- a/common/containers/Tabs/SendTransaction/index.tsx
+++ b/common/containers/Tabs/SendTransaction/index.tsx
@@ -293,8 +293,9 @@ export class SendTransaction extends React.Component<Props, State> {
           />
           <div className="row">
             {/* Send Form */}
+
             {unlocked &&
-              !(offline || (forceOffline && isWeb3Wallet)) && (
+              !((offline || forceOffline) && isWeb3Wallet) && (
                 <main className="col-sm-8">
                   <div className="Tab-content-pane">
                     {hasQueryString && (
@@ -434,7 +435,7 @@ export class SendTransaction extends React.Component<Props, State> {
               )}
 
             {unlocked &&
-              (offline || (forceOffline && isWeb3Wallet)) && (
+              ((offline || forceOffline) && isWeb3Wallet) && (
                 <main className="col-sm-8">
                   <div className="Tab-content-pane">
                     <h4>Sorry...</h4>
diff --git a/common/libs/nodes/rpc/types.ts b/common/libs/nodes/rpc/types.ts
index cc5a3f7e..da63c1ad 100644
--- a/common/libs/nodes/rpc/types.ts
+++ b/common/libs/nodes/rpc/types.ts
@@ -1,8 +1,8 @@
 // don't use flow temporarily
 import { TransactionWithoutGas } from 'libs/messages';
 
-type DATA = string;
-type QUANTITY = string;
+export type DATA = string;
+export type QUANTITY = string;
 type TX = string;
 
 export type DEFAULT_BLOCK = string | 'earliest' | 'latest' | 'pending';
@@ -19,8 +19,9 @@ export interface JsonRpcResponse {
   };
 }
 
-interface RPCRequestBase {
+export interface RPCRequestBase {
   method: string;
+  params?: any[];
 }
 
 export interface SendRawTxRequest extends RPCRequestBase {
@@ -74,6 +75,7 @@ export interface GetCurrentBlockRequest extends RPCRequestBase {
 }
 
 export type RPCRequest =
+  | RPCRequestBase //base added so I can add an empty params array in decorateRequest without TS complaining
   | GetBalanceRequest
   | GetTokenBalanceRequest
   | CallRequest
diff --git a/common/libs/nodes/web3/client.ts b/common/libs/nodes/web3/client.ts
new file mode 100644
index 00000000..32af32a7
--- /dev/null
+++ b/common/libs/nodes/web3/client.ts
@@ -0,0 +1,43 @@
+import { JsonRpcResponse, RPCRequest } from '../rpc/types';
+import { IWeb3Provider } from './types';
+import RPCClient from '../rpc/client';
+
+export default class Web3Client extends RPCClient {
+  private provider: IWeb3Provider;
+
+  constructor() {
+    super('web3'); // initialized with fake endpoint
+    this.provider = (window as any).web3.currentProvider;
+  }
+
+  public decorateRequest = (req: RPCRequest) => ({
+    ...req,
+    id: this.id(),
+    jsonrpc: '2.0',
+    params: req.params || [] // default to empty array so MetaMask doesn't error
+  });
+
+  public call = (request: RPCRequest | any): Promise<JsonRpcResponse> =>
+    this.sendAsync(this.decorateRequest(request)) as Promise<JsonRpcResponse>;
+
+  public batch = (requests: RPCRequest[] | any): Promise<JsonRpcResponse[]> =>
+    this.sendAsync(requests.map(this.decorateRequest)) as Promise<
+      JsonRpcResponse[]
+    >;
+
+  private sendAsync = (
+    request: any
+  ): Promise<JsonRpcResponse | JsonRpcResponse[]> => {
+    return new Promise((resolve, reject) => {
+      this.provider.sendAsync(
+        request,
+        (error, result: JsonRpcResponse | JsonRpcResponse[]) => {
+          if (error) {
+            return reject(error);
+          }
+          resolve(result);
+        }
+      );
+    });
+  };
+}
diff --git a/common/libs/nodes/web3/index.ts b/common/libs/nodes/web3/index.ts
index 64d77690..caf25e94 100644
--- a/common/libs/nodes/web3/index.ts
+++ b/common/libs/nodes/web3/index.ts
@@ -1,170 +1,55 @@
-import { Token } from 'config/data';
-import { TransactionWithoutGas } from 'libs/messages';
-import { Wei, TokenValue } from 'libs/units';
-import { INode, TxObj } from '../INode';
-import ERC20 from 'libs/erc20';
+import RPCNode from '../rpc';
+import Web3Client from './client';
+import Web3Requests from './requests';
+import { Web3Transaction } from './types';
+import { INode } from 'libs/nodes/INode';
 
-export default class Web3Node implements INode {
-  private web3: any;
+import {
+  isValidSendTransaction,
+  isValidSignMessage,
+  isValidGetAccounts,
+  isValidGetNetVersion
+} from '../../validators';
 
-  constructor(web3: any) {
-    this.web3 = web3;
+export default class Web3Node extends RPCNode {
+  public client: Web3Client;
+  public requests: Web3Requests;
+
+  constructor() {
+    super('web3'); // initialized with fake endpoint
+    this.client = new Web3Client();
+    this.requests = new Web3Requests();
   }
 
-  public ping(): Promise<boolean> {
-    return Promise.resolve(true);
+  public getNetVersion(): Promise<string> {
+    return this.client
+      .call(this.requests.getNetVersion())
+      .then(isValidGetNetVersion)
+      .then(({ result }) => result);
   }
 
-  public sendCallRequest(txObj: TxObj): Promise<string> {
-    return new Promise((resolve, reject) => {
-      this.web3.eth.call(txObj, 'pending', (err, res) => {
-        if (err) {
-          return reject(err.message);
-        }
-        // web3 return string
-        resolve(res);
-      });
-    });
+  public sendTransaction(web3Tx: Web3Transaction): Promise<string> {
+    return this.client
+      .call(this.requests.sendTransaction(web3Tx))
+      .then(isValidSendTransaction)
+      .then(({ result }) => result);
   }
 
-  public getBalance(address: string): Promise<Wei> {
-    return new Promise((resolve, reject) => {
-      this.web3.eth.getBalance(address, (err, res) => {
-        if (err) {
-          return reject(err);
-        }
-        // web3 returns BigNumber
-        resolve(Wei(res.toString()));
-      });
-    });
+  public signMessage(msgHex: string, fromAddr: string): Promise<string> {
+    return this.client
+      .call(this.requests.signMessage(msgHex, fromAddr))
+      .then(isValidSignMessage)
+      .then(({ result }) => result);
   }
 
-  public estimateGas(transaction: TransactionWithoutGas): Promise<Wei> {
-    return new Promise((resolve, reject) =>
-      this.web3.eth.estimateGas(
-        {
-          to: transaction.to,
-          data: transaction.data
-        },
-        (err, res) => {
-          if (err) {
-            return reject(err);
-          }
-          // web3 returns number
-          resolve(Wei(res));
-        }
-      )
-    );
-  }
-
-  public getTokenBalance(
-    address: string,
-    token: Token
-  ): Promise<{
-    balance: TokenValue;
-    error: string | null;
-  }> {
-    return new Promise(resolve => {
-      this.web3.eth.call(
-        {
-          to: token.address,
-          data: ERC20.balanceOf(address)
-        },
-        'pending',
-        (err, res) => {
-          if (err) {
-            // TODO - Error handling
-            return resolve({ balance: TokenValue('0'), error: err });
-          }
-          // web3 returns string
-          resolve({ balance: TokenValue(res), error: null });
-        }
-      );
-    });
-  }
-
-  public getTokenBalances(
-    address: string,
-    tokens: Token[]
-  ): Promise<{ balance: TokenValue; error: string | null }[]> {
-    return new Promise(resolve => {
-      const batch = this.web3.createBatch();
-      const totalCount = tokens.length;
-      const returnArr = new Array<{
-        balance: TokenValue;
-        error: string | null;
-      }>(totalCount);
-      let finishCount = 0;
-
-      tokens.forEach((token, index) =>
-        batch.add(
-          this.web3.eth.call.request(
-            {
-              to: token.address,
-              data: ERC20.balanceOf(address)
-            },
-            'pending',
-            (err, res) => finish(index, err, res)
-          )
-        )
-      );
-      batch.execute();
-
-      function finish(index, err, res) {
-        if (err) {
-          // TODO - Error handling
-          returnArr[index] = {
-            balance: TokenValue('0'),
-            error: err
-          };
-        } else {
-          // web3 returns string
-          returnArr[index] = {
-            balance: TokenValue(res),
-            error: err
-          };
-        }
-
-        finishCount++;
-        if (finishCount === totalCount) {
-          resolve(returnArr);
-        }
-      }
-    });
-  }
-
-  public getTransactionCount(address: string): Promise<string> {
-    return new Promise((resolve, reject) =>
-      this.web3.eth.getTransactionCount(address, 'pending', (err, txCount) => {
-        if (err) {
-          return reject(err);
-        }
-        // web3 returns number
-        resolve(txCount.toString());
-      })
-    );
-  }
-
-  public getCurrentBlock(): Promise<string> {
-    return new Promise((resolve, reject) =>
-      this.web3.eth.getBlock('latest', false, (err, block) => {
-        if (err) {
-          return reject(err);
-        }
-        resolve(block.number);
-      })
-    );
-  }
-
-  public sendRawTx(signedTx: string): Promise<string> {
-    return new Promise((resolve, reject) =>
-      this.web3.eth.sendRawTransaction(signedTx, (err, txHash) => {
-        if (err) {
-          return reject(err);
-        }
-        // web3 return string
-        resolve(txHash);
-      })
-    );
+  public getAccounts(): Promise<string> {
+    return this.client
+      .call(this.requests.getAccounts())
+      .then(isValidGetAccounts)
+      .then(({ result }) => result);
   }
 }
+
+export function isWeb3Node(nodeLib: INode | Web3Node): nodeLib is Web3Node {
+  return nodeLib instanceof Web3Node;
+}
diff --git a/common/libs/nodes/web3/requests.ts b/common/libs/nodes/web3/requests.ts
new file mode 100644
index 00000000..b0e5d4b8
--- /dev/null
+++ b/common/libs/nodes/web3/requests.ts
@@ -0,0 +1,29 @@
+import RPCRequests from '../rpc/requests';
+import {
+  SendTransactionRequest,
+  SignMessageRequest,
+  GetAccountsRequest,
+  Web3Transaction
+} from './types';
+
+export default class Web3Requests extends RPCRequests {
+  public sendTransaction(web3Tx: Web3Transaction): SendTransactionRequest {
+    return {
+      method: 'eth_sendTransaction',
+      params: [web3Tx]
+    };
+  }
+
+  public signMessage(msgHex: string, fromAddr: string): SignMessageRequest {
+    return {
+      method: 'personal_sign',
+      params: [msgHex, fromAddr]
+    };
+  }
+
+  public getAccounts(): GetAccountsRequest {
+    return {
+      method: 'eth_accounts'
+    };
+  }
+}
diff --git a/common/libs/nodes/web3/types.ts b/common/libs/nodes/web3/types.ts
new file mode 100644
index 00000000..330a22fb
--- /dev/null
+++ b/common/libs/nodes/web3/types.ts
@@ -0,0 +1,57 @@
+import {
+  JsonRpcResponse,
+  RPCRequest,
+  RPCRequestBase,
+  DATA,
+  QUANTITY
+} from '../rpc/types';
+
+type MESSAGE_HEX = string;
+type ADDRESS = string;
+
+export interface Web3Transaction {
+  from: string;
+  to: string;
+  value: string;
+  gas: string;
+  gasPrice: string;
+  data: string;
+  nonce: string;
+}
+
+export interface SendTransactionRequest extends RPCRequestBase {
+  method: 'eth_sendTransaction';
+  params: [
+    {
+      from: DATA;
+      to: DATA;
+      gas: QUANTITY;
+      gasPrice: QUANTITY;
+      value: QUANTITY;
+      data?: DATA;
+      nonce?: QUANTITY;
+    }
+  ];
+}
+
+export interface SignMessageRequest extends RPCRequestBase {
+  method: 'personal_sign';
+  params: [MESSAGE_HEX, ADDRESS];
+}
+
+export interface GetAccountsRequest extends RPCRequestBase {
+  method: 'eth_accounts';
+}
+
+type TWeb3ProviderCallback = (
+  error,
+  result: JsonRpcResponse | JsonRpcResponse[]
+) => any;
+type TSendAsync = (
+  request: RPCRequest | any,
+  callback: TWeb3ProviderCallback
+) => void;
+
+export interface IWeb3Provider {
+  sendAsync: TSendAsync;
+}
diff --git a/common/libs/validators.ts b/common/libs/validators.ts
index 0585b69c..9c0ae11e 100644
--- a/common/libs/validators.ts
+++ b/common/libs/validators.ts
@@ -197,7 +197,7 @@ export const schema = {
     properties: {
       jsonrpc: { type: 'string' },
       id: { oneOf: [{ type: 'string' }, { type: 'integer' }] },
-      result: { type: 'string' },
+      result: { oneOf: [{ type: 'string' }, { type: 'array' }] },
       status: { type: 'string' },
       message: { type: 'string', maxLength: 2 }
     }
@@ -250,3 +250,15 @@ export const isValidCurrentBlock = (response: JsonRpcResponse) =>
 
 export const isValidRawTxApi = (response: JsonRpcResponse) =>
   isValidEthCall(response, schema.RpcNode)('Raw Tx');
+
+export const isValidSendTransaction = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Send Transaction');
+
+export const isValidSignMessage = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Sign Message');
+
+export const isValidGetAccounts = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Get Accounts');
+
+export const isValidGetNetVersion = (response: JsonRpcResponse) =>
+  isValidEthCall(response, schema.RpcNode)('Net Version');
diff --git a/common/libs/wallet/non-deterministic/web3.ts b/common/libs/wallet/non-deterministic/web3.ts
index 2447ab97..f4521d9b 100644
--- a/common/libs/wallet/non-deterministic/web3.ts
+++ b/common/libs/wallet/non-deterministic/web3.ts
@@ -1,15 +1,18 @@
 import { IFullWallet } from '../IWallet';
 import { ExtendedRawTransaction } from 'libs/transaction';
-import { networkIdToName } from 'libs/values';
+import { networkIdToName, sanitizeHex } from 'libs/values';
 import { bufferToHex } from 'ethereumjs-util';
+import { configuredStore } from 'store';
+import { getNodeLib } from 'selectors/config';
+import Web3Node, { isWeb3Node } from 'libs/nodes/web3';
+import { INode } from 'libs/nodes/INode';
+import BN from 'bn.js';
 
 export default class Web3Wallet implements IFullWallet {
-  private web3: any;
   private address: string;
   private network: string;
 
-  constructor(web3: any, address: string, network: string) {
-    this.web3 = web3;
+  constructor(address: string, network: string) {
     this.address = address;
     this.network = network;
   }
@@ -24,69 +27,53 @@ export default class Web3Wallet implements IFullWallet {
     );
   }
 
-  public signMessage(msg: string): Promise<string> {
-    return new Promise((resolve, reject) => {
-      const msgHex = bufferToHex(Buffer.from(msg));
-      const options = {
-        method: 'personal_sign',
-        params: [msgHex, this.address],
-        signingAddr: this.address
-      };
+  public async signMessage(msg: string): Promise<string> {
+    const msgHex = bufferToHex(Buffer.from(msg));
+    const state = configuredStore.getState();
+    const nodeLib: Web3Node | INode = getNodeLib(state);
 
-      this.web3.currentProvider.sendAsync(options, (err, data) => {
-        if (err) {
-          return reject(err);
-        }
+    if (!isWeb3Node(nodeLib)) {
+      throw new Error('Web3 wallets can only be used with a Web3 node.');
+    }
 
-        if (data.error) {
-          return reject(data.error);
-        }
-        resolve(data.result);
-      });
-    });
+    return nodeLib.signMessage(msgHex, this.address);
   }
 
-  public sendTransaction(transaction: ExtendedRawTransaction): Promise<string> {
-    return new Promise((resolve, reject) => {
-      const { from, to, value, gasLimit, gasPrice, data, nonce } = transaction;
+  public async sendTransaction(
+    transaction: ExtendedRawTransaction
+  ): Promise<string> {
+    const state = configuredStore.getState();
+    const nodeLib: Web3Node | INode = getNodeLib(state);
+    const { from, to, value, gasLimit, gasPrice, data, nonce } = transaction;
+    const web3Tx = {
+      from,
+      to,
+      value,
+      gas:
+        gasLimit instanceof BN ? sanitizeHex(gasLimit.toString(16)) : gasLimit,
+      gasPrice:
+        gasPrice instanceof BN ? sanitizeHex(gasPrice.toString(16)) : gasPrice,
+      data,
+      nonce
+    };
 
-      const web3Tx = {
-        from,
-        to,
-        value,
-        gas: gasLimit,
-        gasPrice,
-        data,
-        nonce
-      };
+    if (!isWeb3Node(nodeLib)) {
+      throw new Error('Web3 wallets can only be used with a Web3 node.');
+    }
+    await this.networkCheck(nodeLib);
 
-      // perform sanity check to ensure network hasn't changed
-      this.web3.version.getNetwork((err1, networkId) => {
-        const networkName = networkIdToName(networkId);
+    return nodeLib.sendTransaction(web3Tx);
+  }
 
-        if (err1) {
-          return reject(err1);
-        }
-
-        if (this.network !== networkName) {
-          return reject(
-            new Error(
-              `Expected MetaMask / Mist network to be ${
-                this.network
-              }, but got ${networkName}. ` +
-                `Please change the network or restart MyEtherWallet.`
-            )
-          );
-        }
-
-        // execute transaction
-        this.web3.eth.sendTransaction(web3Tx, (err2, txHash) => {
-          if (err2) {
-            return reject(err2);
-          }
-          resolve(txHash);
-        });
-      });
-    });
+  private async networkCheck(lib: Web3Node) {
+    const netId = await lib.getNetVersion();
+    const netName = networkIdToName(netId);
+    if (this.network !== netName) {
+      throw new Error(
+        `Expected MetaMask / Mist network to be ${this.network}, but got ${
+          netName
+        }. Please change the network or restart MyEtherWallet.`
+      );
+    }
   }
 }
diff --git a/common/sagas/config.ts b/common/sagas/config.ts
index 0ec9bd8a..035663c1 100644
--- a/common/sagas/config.ts
+++ b/common/sagas/config.ts
@@ -208,7 +208,7 @@ export function* cleanCustomNetworks(): SagaIterator {
 }
 
 // unset web3 as the selected node if a non-web3 wallet has been selected
-export function* unsetWeb3Node(action): SagaIterator {
+export function* unsetWeb3NodeOnWalletEvent(action): SagaIterator {
   const node = yield select(getNode);
   const nodeConfig = yield select(getNodeConfig);
   const newWallet = action.payload;
@@ -222,6 +222,19 @@ export function* unsetWeb3Node(action): SagaIterator {
   yield put(changeNodeIntent(equivalentNodeOrDefault(nodeConfig)));
 }
 
+export function* unsetWeb3Node(): SagaIterator {
+  const node = yield select(getNode);
+
+  if (node !== 'web3') {
+    return;
+  }
+
+  const nodeConfig = yield select(getNodeConfig);
+  const newNode = equivalentNodeOrDefault(nodeConfig);
+
+  yield put(changeNodeIntent(newNode));
+}
+
 export const equivalentNodeOrDefault = nodeConfig => {
   const node = Object.keys(NODES)
     .filter(key => key !== 'web3')
@@ -250,6 +263,7 @@ export default function* configSaga(): SagaIterator {
   yield takeEvery(TypeKeys.CONFIG_LANGUAGE_CHANGE, reload);
   yield takeEvery(TypeKeys.CONFIG_ADD_CUSTOM_NODE, switchToNewNode);
   yield takeEvery(TypeKeys.CONFIG_REMOVE_CUSTOM_NODE, cleanCustomNetworks);
-  yield takeEvery(WalletTypeKeys.WALLET_SET, unsetWeb3Node);
-  yield takeEvery(WalletTypeKeys.WALLET_RESET, unsetWeb3Node);
+  yield takeEvery(TypeKeys.CONFIG_NODE_WEB3_UNSET, unsetWeb3Node);
+  yield takeEvery(WalletTypeKeys.WALLET_SET, unsetWeb3NodeOnWalletEvent);
+  yield takeEvery(WalletTypeKeys.WALLET_RESET, unsetWeb3NodeOnWalletEvent);
 }
diff --git a/common/sagas/wallet.tsx b/common/sagas/wallet.tsx
index c3bd1e9c..a56e1145 100644
--- a/common/sagas/wallet.tsx
+++ b/common/sagas/wallet.tsx
@@ -13,7 +13,8 @@ import {
   UnlockPrivateKeyAction
 } from 'actions/wallet';
 import { Wei } from 'libs/units';
-import { changeNodeIntent } from 'actions/config';
+import { changeNodeIntent, web3UnsetNode } from 'actions/config';
+import { TypeKeys as ConfigTypeKeys } from 'actions/config/constants';
 import TransactionSucceeded from 'components/ExtendedNotifications/TransactionSucceeded';
 import { INode } from 'libs/nodes/INode';
 import {
@@ -29,15 +30,16 @@ import { SagaIterator } from 'redux-saga';
 import {
   apply,
   call,
-  cps,
   fork,
   put,
   select,
-  takeEvery
+  takeEvery,
+  take
 } from 'redux-saga/effects';
 import { getNetworkConfig, getNodeLib } from 'selectors/config';
 import { getTokens, getWalletInst } from 'selectors/wallet';
 import translate from 'translations';
+import Web3Node, { isWeb3Node } from 'libs/nodes/web3';
 
 export function* updateAccountBalance(): SagaIterator {
   try {
@@ -140,32 +142,32 @@ export function* unlockMnemonic(action: UnlockMnemonicAction): SagaIterator {
 // inspired by v3:
 // https://github.com/kvhnuke/etherwallet/blob/417115b0ab4dd2033d9108a1a5c00652d38db68d/app/scripts/controllers/decryptWalletCtrl.js#L311
 export function* unlockWeb3(): SagaIterator {
-  const failMsg1 = 'Could not connect to MetaMask / Mist.';
-  const failMsg2 = 'No accounts found in MetaMask / Mist.';
-  const { web3 } = window as any;
-
-  if (!web3 || !web3.eth) {
-    yield put(showNotification('danger', translate(failMsg1)));
-    return;
-  }
-
   try {
     yield call(initWeb3Node);
+    yield put(changeNodeIntent('web3'));
+    yield take(
+      action =>
+        action.type === ConfigTypeKeys.CONFIG_NODE_CHANGE &&
+        action.payload.nodeSelection === 'web3'
+    );
 
     const network = NODES.web3.network;
-    const accounts = yield cps(web3.eth.getAccounts);
+    const nodeLib: INode | Web3Node = yield select(getNodeLib);
 
-    if (!accounts.length) {
-      yield put(showNotification('danger', translate(failMsg2)));
-      return;
+    if (!isWeb3Node(nodeLib)) {
+      throw new Error('Cannot use Web3 wallet without a Web3 node.');
     }
 
+    const accounts = yield apply(nodeLib, nodeLib.getAccounts);
     const address = accounts[0];
 
-    yield put(changeNodeIntent('web3'));
-    yield put(setWallet(new Web3Wallet(web3, address, network)));
+    if (!address) {
+      throw new Error('No accounts found in MetaMask / Mist.');
+    }
+    yield put(setWallet(new Web3Wallet(address, network)));
   } catch (err) {
-    console.error(err);
+    // unset web3 node so node dropdown isn't disabled
+    yield put(web3UnsetNode());
     yield put(showNotification('danger', translate(err.message)));
   }
 }
diff --git a/spec/sagas/__snapshots__/wallet.spec.tsx.snap b/spec/sagas/__snapshots__/wallet.spec.tsx.snap
index b5273d10..c7f03c87 100644
--- a/spec/sagas/__snapshots__/wallet.spec.tsx.snap
+++ b/spec/sagas/__snapshots__/wallet.spec.tsx.snap
@@ -194,15 +194,6 @@ Object {
       "payload": Web3Wallet {
         "address": "0xe2EdC95134bbD88443bc6D55b809F7d0C2f0C854",
         "network": "ETH",
-        "web3": Object {
-          "eth": Object {
-            "getAccounts": [Function],
-          },
-          "network": "1",
-          "version": Object {
-            "getNetwork": [Function],
-          },
-        },
       },
       "type": "WALLET_SET",
     },
diff --git a/spec/sagas/config.spec.ts b/spec/sagas/config.spec.ts
index ba622fe3..28ecaaaa 100644
--- a/spec/sagas/config.spec.ts
+++ b/spec/sagas/config.spec.ts
@@ -15,6 +15,7 @@ import {
   handleTogglePollOfflineStatus,
   reload,
   unsetWeb3Node,
+  unsetWeb3NodeOnWalletEvent,
   equivalentNodeOrDefault
 } from 'sagas/config';
 import { NODES } from 'config/data';
@@ -326,10 +327,42 @@ describe('handleNodeChangeIntent*', () => {
 });
 
 describe('unsetWeb3Node*', () => {
+  const node = 'web3';
+  const mockNodeConfig = { network: 'ETH' };
+  const newNode = equivalentNodeOrDefault(mockNodeConfig);
+  const gen = unsetWeb3Node();
+
+  it('should select getNode', () => {
+    expect(gen.next().value).toEqual(select(getNode));
+  });
+
+  it('should select getNodeConfig', () => {
+    expect(gen.next(node).value).toEqual(select(getNodeConfig));
+  });
+
+  it('should put changeNodeIntent', () => {
+    expect(gen.next(mockNodeConfig).value).toEqual(
+      put(changeNodeIntent(newNode))
+    );
+  });
+
+  it('should be done', () => {
+    expect(gen.next().done).toEqual(true);
+  });
+
+  it('should return early if node type is not web3', () => {
+    const gen1 = unsetWeb3Node();
+    gen1.next();
+    gen1.next('notWeb3');
+    expect(gen1.next().done).toEqual(true);
+  });
+});
+
+describe('unsetWeb3NodeOnWalletEvent*', () => {
   const fakeAction = {};
   const mockNode = 'web3';
   const mockNodeConfig = { network: 'ETH' };
-  const gen = unsetWeb3Node(fakeAction);
+  const gen = unsetWeb3NodeOnWalletEvent(fakeAction);
 
   it('should select getNode', () => {
     expect(gen.next().value).toEqual(select(getNode));
@@ -350,18 +383,17 @@ describe('unsetWeb3Node*', () => {
   });
 
   it('should return early if node type is not web3', () => {
-    const gen1 = unsetWeb3Node({ payload: false });
+    const gen1 = unsetWeb3NodeOnWalletEvent({ payload: false });
     gen1.next(); //getNode
     gen1.next('notWeb3'); //getNodeConfig
     expect(gen1.next().done).toEqual(true);
   });
 
   it('should return early if wallet type is web3', () => {
-    const mockWeb3 = {};
     const mockAddress = '0x0';
     const mockNetwork = 'ETH';
-    const mockWeb3Wallet = new Web3Wallet(mockWeb3, mockAddress, mockNetwork);
-    const gen2 = unsetWeb3Node({ payload: mockWeb3Wallet });
+    const mockWeb3Wallet = new Web3Wallet(mockAddress, mockNetwork);
+    const gen2 = unsetWeb3NodeOnWalletEvent({ payload: mockWeb3Wallet });
     gen2.next(); //getNode
     gen2.next('web3'); //getNodeConfig
     expect(gen2.next().done).toEqual(true);
diff --git a/spec/sagas/wallet.spec.tsx b/spec/sagas/wallet.spec.tsx
index 215f5758..386ffcf7 100644
--- a/spec/sagas/wallet.spec.tsx
+++ b/spec/sagas/wallet.spec.tsx
@@ -10,10 +10,10 @@ import {
   broadcastTx as broadcastTxActionGen
 } from 'actions/wallet';
 import { Wei } from 'libs/units';
-import { changeNodeIntent } from 'actions/config';
+import { changeNodeIntent, web3UnsetNode } from 'actions/config';
 import { INode } from 'libs/nodes/INode';
 import { initWeb3Node, Token, N_FACTOR } from 'config/data';
-import { apply, call, cps, fork, put, select } from 'redux-saga/effects';
+import { apply, call, fork, put, select, take } from 'redux-saga/effects';
 import { getNetworkConfig, getNodeLib } from 'selectors/config';
 import { getTokens, getWalletInst } from 'selectors/wallet';
 import {
@@ -27,6 +27,11 @@ import {
   broadcastTx
 } from 'sagas/wallet';
 import { PrivKeyWallet } from 'libs/wallet/non-deterministic';
+import { TypeKeys as ConfigTypeKeys } from 'actions/config/constants';
+import Web3Node from 'libs/nodes/web3';
+import { cloneableGenerator } from 'redux-saga/utils';
+import { showNotification } from 'actions/notifications';
+import translate from 'translations';
 
 // init module
 configuredStore.getState();
@@ -74,7 +79,6 @@ const utcKeystore = {
 };
 
 // necessary so we can later inject a mocked web3 to the window
-declare var window: any;
 
 describe('updateAccountBalance*', () => {
   const gen1 = updateAccountBalance();
@@ -243,42 +247,102 @@ describe('unlockMnemonic*', () => {
 });
 
 describe('unlockWeb3*', () => {
-  const gen = unlockWeb3();
+  const G = global as any;
+  const data = {} as any;
+  data.gen = cloneableGenerator(unlockWeb3)();
   const accounts = [address];
+  const { random } = Math;
+  let nodeLib;
 
-  window.web3 = {
-    eth: {
-      getAccounts: jest.fn(cb => cb(undefined, accounts))
-    },
-    version: {
-      getNetwork: jest.fn(cb => cb(undefined, '1'))
-    },
-    network: '1'
-  };
+  function sendAsync(options, cb) {
+    const resp = {
+      id: 'id'
+    };
+    switch (options.method) {
+      case 'net_version':
+        return cb(null, { ...resp, result: '1' });
+      case 'eth_accounts':
+        return cb(null, { ...resp, result: JSON.stringify(accounts) });
+    }
+  }
 
   beforeAll(async done => {
+    G.web3 = {
+      currentProvider: {
+        sendAsync
+      }
+    };
+    nodeLib = new Web3Node();
+    Math.random = () => 0.001;
     await initWeb3Node();
     done();
   });
 
   afterAll(() => {
-    delete window.web3;
+    Math.random = random;
+    delete G.web3;
   });
 
   it('should call initWeb3Node', () => {
-    expect(gen.next().value).toEqual(call(initWeb3Node));
-  });
-
-  it('should cps web3.eth.getAccounts', () => {
-    expect(gen.next().value).toEqual(cps(window.web3.eth.getAccounts));
+    expect(data.gen.next().value).toEqual(call(initWeb3Node));
   });
 
   it('should put changeNodeIntent', () => {
-    expect(gen.next(accounts).value).toEqual(put(changeNodeIntent('web3')));
+    expect(data.gen.next(accounts).value).toEqual(
+      put(changeNodeIntent('web3'))
+    );
+  });
+
+  it('should yield take on node change', () => {
+    const expected = take(
+      action =>
+        action.type === ConfigTypeKeys.CONFIG_NODE_CHANGE &&
+        action.payload.nodeSelection === 'web3'
+    );
+    const result = data.gen.next().value;
+    expect(JSON.stringify(expected)).toEqual(JSON.stringify(result));
+  });
+
+  it('should select getNodeLib', () => {
+    expect(data.gen.next().value).toEqual(select(getNodeLib));
+  });
+
+  it('should throw & catch if node is not web3 node', () => {
+    data.clone = data.gen.clone();
+    expect(data.clone.next().value).toEqual(put(web3UnsetNode()));
+    expect(data.clone.next().value).toEqual(
+      put(
+        showNotification(
+          'danger',
+          translate('Cannot use Web3 wallet without a Web3 node.')
+        )
+      )
+    );
+    expect(data.clone.next().done).toEqual(true);
+  });
+
+  it('should apply nodeLib.getAccounts', () => {
+    expect(data.gen.next(nodeLib).value).toEqual(
+      apply(nodeLib, nodeLib.getAccounts)
+    );
+  });
+
+  it('should throw & catch if no accounts found', () => {
+    data.clone1 = data.gen.clone();
+    expect(data.clone1.next([]).value).toEqual(put(web3UnsetNode()));
+    expect(data.clone1.next().value).toEqual(
+      put(
+        showNotification(
+          'danger',
+          translate('No accounts found in MetaMask / Mist.')
+        )
+      )
+    );
+    expect(data.clone1.next().done).toEqual(true);
   });
 
   it('should match setWallet snapshot', () => {
-    expect(gen.next().value).toMatchSnapshot();
+    expect(data.gen.next(accounts).value).toMatchSnapshot();
   });
 });
 

From 4b3def2fce8ff6f8887611074cb29dc5a894a89e Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Fri, 1 Dec 2017 10:34:27 -0600
Subject: [PATCH 46/46] Tag Release 0.0.5 (#507)

---
 common/config/data.ts | 2 +-
 package.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/config/data.ts b/common/config/data.ts
index 78bab0fd..4aaf87cc 100644
--- a/common/config/data.ts
+++ b/common/config/data.ts
@@ -2,7 +2,7 @@ import { EtherscanNode, InfuraNode, RPCNode, Web3Node } from 'libs/nodes';
 import { networkIdToName } from 'libs/values';
 export const languages = require('./languages.json');
 // Displays in the header
-export const VERSION = '4.0.0 (Alpha 0.0.4)';
+export const VERSION = '4.0.0 (Alpha 0.0.5)';
 export const N_FACTOR = 1024;
 
 // Displays at the top of the site, make message empty string to remove.
diff --git a/package.json b/package.json
index 62e60e2b..584590ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MyEtherWallet",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.5",
   "main": "common/index.jsx",
   "description": "MyEtherWallet v4",
   "engines": {