Confirm eth v2

7 years ago · 119c2b2423
parent 71d6463984
commit 119c2b2423
6 changed files with 184 additions and 200 deletions
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@ -192,7 +192,7 @@ ConfirmSendEther.prototype.render = function () {
  this.inputs = []

  return (
-    h('div.flex-column.flex-grow.confirm-screen-container', {
+    h('div.confirm-screen-container', {
      style: { minWidth: '355px' },
    }, [
      // Main Send token Card
@ -202,6 +202,7 @@ ConfirmSendEther.prototype.render = function () {
            onClick: () => backToAccountDetail(selectedAddress),
          }, 'BACK'),
          h('div.confirm-screen-title', 'Confirm Transaction'),
+          h('div.confirm-screen-header-tip'),
        ]),
        h('div.flex-row.flex-center.confirm-screen-identicons', [
          h('div.confirm-screen-account-wrapper', [
@ -209,11 +210,11 @@ ConfirmSendEther.prototype.render = function () {
              Identicon,
              {
                address: fromAddress,
-                diameter: 100,
+                diameter: 60,
              },
            ),
            h('span.confirm-screen-account-name', fromName),
-            h('span.confirm-screen-account-number', fromAddress.slice(fromAddress.length - 4)),
+            // h('span.confirm-screen-account-number', fromAddress.slice(fromAddress.length - 4)),
          ]),
          h('i.fa.fa-arrow-right.fa-lg'),
          h('div.confirm-screen-account-wrapper', [
@ -221,27 +222,27 @@ ConfirmSendEther.prototype.render = function () {
              Identicon,
              {
                address: txParams.to,
-                diameter: 100,
+                diameter: 60,
              },
            ),
            h('span.confirm-screen-account-name', toName),
-            h('span.confirm-screen-account-number', toAddress.slice(toAddress.length - 4)),
+            // h('span.confirm-screen-account-number', toAddress.slice(toAddress.length - 4)),
          ]),
        ]),

-        h('h3.flex-center.confirm-screen-sending-to-message', {
-          style: {
-            textAlign: 'center',
-            fontSize: '16px',
-          },
-        }, [
-          `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`,
-        ]),
+        // h('h3.flex-center.confirm-screen-sending-to-message', {
+        //   style: {
+        //     textAlign: 'center',
+        //     fontSize: '16px',
+        //   },
+        // }, [
+        //   `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`,
+        // ]),

        h('h3.flex-center.confirm-screen-send-amount', [`$${amountInUSD}`]),
        h('h3.flex-center.confirm-screen-send-amount-currency', [ 'USD' ]),
        h('div.flex-center.confirm-memo-wrapper', [
-          h('h3.confirm-screen-send-memo', [ memo ]),
+          h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]),
        ]),

        h('div.confirm-screen-rows', [
@ -365,17 +366,16 @@ ConfirmSendEther.prototype.render = function () {
 // }
      ]),

-      h('form#pending-tx-form.flex-column.flex-center', {
+      h('form#pending-tx-form', {
        onSubmit: this.onSubmit,
      }, [
-
-        // Accept Button
-        h('button.confirm-screen-confirm-button', ['CONFIRM']),
-
        // Cancel Button
        h('div.cancel.btn-light.confirm-screen-cancel-button', {
          onClick: (event) => this.cancel(event, txMeta),
        }, 'CANCEL'),
+
+        // Accept Button
+        h('button.confirm-screen-confirm-button', ['CONFIRM']),
      ]),
    ])
  )
--- a/ui/app/css/itcss/components/confirm.scss
+++ b/ui/app/css/itcss/components/confirm.scss
@ -1,32 +1,43 @@
 .confirm-screen-container {
-  position: absolute;
+  position: relative;
  align-items: center;
+  font-family: Roboto;
+  flex: 0 0 auto;
+  flex-flow: column nowrap;
+  box-shadow: 0 2px 4px 0 rgba($black, .08);
+  border-radius: 8px;

  @media screen and (max-width: 575px) {
-    margin-top: 35px;
    width: 100%;
  }

  @media screen and (min-width: 576px) {
-    margin-top: 6.9vh;
+    top: -26px;
  }
 }

 .confirm-screen-wrapper {
+  height: 100%;
+  width: 380px;
+  background-color: $white;
  display: flex;
-  flex-direction: column;
+  flex-flow: column nowrap;
+  z-index: 25;
  align-items: center;
-  z-index: 100;
-  top: 5%;
-  font-family: 'DIN NEXT';
-  background: $white;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);
-  // padding: 20px 24px 32px;
-  color: $scorpion;
-  width: 100%;
+  font-family: Roboto;
+  position: relative;
+  overflow-y: auto;
+  overflow-x: hidden;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;

-  @media screen and (min-width: $break-large) {
-    width: 498px;
+  @media screen and (max-width: $break-small) {
+    width: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    top: 0;
+    box-shadow: none;
+    height: calc(100vh - 41px - 100px);
  }
 }

@ -39,27 +50,34 @@
  margin: 0;
 }

-.confirm-screen-wrapper > .confirm-screen-header {
-
-  @media screen and (max-width: $break-small) {
-    margin-left: 8px;
-  }
-}
-
 .confirm-screen-header {
-  font-size: 26px;
+  height: 88px;
+  background-color: $athens-grey;
  position: relative;
  display: flex;
-  flex-flow: row nowrap;
+  justify-content: center;
  align-items: center;
+  font-size: 22px;
+  line-height: 29px;
  width: 100%;
-  padding: 20px 24px 0;
+  padding: 25px 0;
+  flex: 0 0 auto;

  @media screen and (max-width: $break-small) {
    font-size: 22px;
  }
 }

+.confirm-screen-header-tip {
+  height: 25px;
+  width: 25px;
+  background: $athens-grey;
+  position: absolute;
+  transform: rotate(45deg);
+  left: 178px;
+  top: 71px;
+}
+
 .confirm-screen-title {
  line-height: 27px;

@ -70,12 +88,12 @@
 }

 .confirm-screen-back-button {
-  background: $white;
-  border: 1px solid $dusty-gray;
+  background: transparent;
+  border: 1px solid $curious-blue;
  left: 24px;
  position: absolute;
  text-align: center;
-  color: $black;
+  color: $curious-blue;
  padding: 6px 13px 7px 12px;
  border-radius: 2px;
  height: 30px;
@ -93,14 +111,15 @@

 .confirm-screen-account-name {
  margin-top: 12px;
+  font-size: 14px;
+  line-height: 19px;
+  color: $scorpion;
+  text-align: center;
 }

-.confirm-screen-account-name,
 .confirm-screen-row-info {
  font-size: 16px;
-  line-height: 24px;
-  color: $scorpion;
-  text-align: center;
+  line-height: 21px;
 }

 .confirm-screen-account-number {
@ -113,6 +132,7 @@

 .confirm-screen-identicons {
  margin-top: 24px;
+  flex: 0 0 auto;

  i.fa-arrow-right {
    align-self: start;
@ -132,34 +152,34 @@
 }

 .confirm-screen-send-amount {
-  font-size: 64px;
  color: $scorpion;
  margin-top: 12px;
-  line-height: 60px;
  text-align: center;
-  font-family: 'DIN NEXT Light';
+  font-size: 40px;
+  font-weight: 300;
+  line-height: 53px;
+  flex: 0 0 auto;
 }

 .confirm-screen-send-amount-currency {
  font-size: 20px;
  line-height: 20px;
  text-align: center;
+  flex: 0 0 auto;
 }

 .confirm-memo-wrapper {
  min-height: 24px;
  width: 100%;
  border-bottom: 1px solid $alto;
+  flex: 0 0 auto;
 }

 .confirm-screen-send-memo {
-  color: $dusty-gray;
+  color: $scorpion;
  font-size: 16px;
-  line-height: 24px;
-  text-align: center;
-  margin-top: 21px;
-  margin-bottom: 18px;
-  font-family: 'DIN NEXT Light';
+  line-height: 19px;
+  font-weight: 400;
 }

 .confirm-screen-label {
@ -180,7 +200,7 @@ section .confirm-screen-account-number,
  display: flex;
  flex-flow: column nowrap;
  width: 100%;
-  padding: 0 24px 32px;
+  flex: 0 0 auto;
 }

 .confirm-screen-section-column {
@ -191,24 +211,26 @@ section .confirm-screen-account-number,
  display: flex;
  flex-flow: row nowrap;
  border-bottom: 1px solid $alto;
-  width: calc(100% - 24px);
+  width: 100%;
  align-items: center;
-  padding: 12px 0;
-  margin: 0 12px;
+  padding: 12px;
+  padding-left: 35px;
+  font-size: 16px;
+  line-height: 22px;
+  font-weight: 300;
 }

 .confirm-screen-row-detail {
  font-size: 12px;
  line-height: 16px;
  color: $dusty-gray;
-  font-family: 'DIN NEXT Light';
 }

 .confirm-screen-total-box {
  background-color: $wild-sand;
-  border-radius: 8px;
-  padding: 22px 14px;
-  margin-top: 13px;
+  padding: 20px;
+  padding-left: 35px;
+  border-bottom: 1px solid $alto;

  .confirm-screen-label {
    line-height: 18px;
@ -219,44 +241,62 @@ section .confirm-screen-account-number,
  }

  &__subtitle {
-    font-size: 14px;
-    line-height: 20px;
-    font-family: 'DIN NEXT Light';
+    font-size: 12px;
+    line-height: 22px;
+  }
+
+  .confirm-screen-row-info {
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 21px;
  }
 }

 .confirm-screen-confirm-button {
  height: 62px;
-  width: 216.88px;
  border-radius: 2px;
  background-color: #02c9b1;
  font-size: 16px;
  color: $white;
  text-align: center;
-  font-family: 'DIN NEXT';
+  font-family: Roboto;
  padding-top: 15px;
  padding-bottom: 15px;
-  margin-top: 23px;
  border-width: 0;
  box-shadow: none;
+  flex: 1 0 auto;
+  font-weight: 300;
 }

 .btn-light.confirm-screen-cancel-button {
  height: 62px;
-  width: 216.88px;
  background: none;
  border: none;
  opacity: 1;
-  width: 8em;
-  font-family: 'DIN NEXT';
+  font-family: Roboto;
  border-width: 0;
  padding-top: 15px;
  padding-bottom: 15px;
  font-size: 16px;
+  line-height: 32px;
  box-shadow: none;
  cursor: pointer;
+  flex: 1 0 auto;
+  font-weight: 300;
 }

 #pending-tx-form {
  flex: 1 0 auto;
+  position: relative;
+  display: flex;
+  flex-flow: row nowrap;
+  background-color: $white;
+  padding: 19px 18px;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+
+
+  @media screen and (max-width: $break-small) {
+    border-top: 1px solid $alto;
+  }
 }
--- a/ui/app/css/itcss/settings/typography.scss
+++ b/ui/app/css/itcss/settings/typography.scss
@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css?family=Roboto:300,500');
+@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900');

@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css');

--- a/ui/app/css/itcss/settings/variables.scss
+++ b/ui/app/css/itcss/settings/variables.scss
@ -31,7 +31,6 @@ $concrete: #f3f3f3;
 $tundora: #4d4d4d;
 $nile-blue: #1b344d;
 $scorpion: #5d5d5d;
-$caribbean-green: #02C9B1;
 $silver: #cdcdcd;
 $caribbean-green: #02c9b1;
 $monzo: #d0021b;
--- a/ui/lib/feature-toggle-utils.js
+++ b/ui/lib/feature-toggle-utils.js
@ -1,4 +1,4 @@
-function checkFeatureToggle(name) {
+function checkFeatureToggle (name) {
  const queryPairMap = window.location.search.substr(1).split('&')
    .map(pair => pair.split('='))
    .reduce((pairs, [key, value]) => ({...pairs, [key]: value }), {})
--- a/yarn.lock
+++ b/yarn.lock
@ -1803,10 +1803,6 @@ caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726:
  version "1.0.30000727"
  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000727.tgz#20c895768398ded5f98a4beab4a76c285def41d2"

-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
 caseless@~0.12.0:
  version "0.12.0"
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@ -2094,16 +2090,16 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
  dependencies:
    delayed-stream "~1.0.0"

+commander@2.11.0, commander@^2.5.0, commander@^2.6.0, commander@^2.9.0, commander@~2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
 commander@2.9.0:
  version "2.9.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
  dependencies:
    graceful-readlink ">= 1.0.0"

-commander@^2.5.0, commander@^2.6.0, commander@^2.9.0, commander@~2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-
 commondir@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/commondir/-/commondir-0.0.1.tgz#89f00fdcd51b519c578733fec563e6a6da7f5be2"
@ -2287,15 +2283,15 @@ cosmiconfig@^2.1.1, cosmiconfig@^2.1.3:
    parse-json "^2.2.0"
    require-from-string "^1.1.0"

-coveralls@^2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.1.tgz#d70bb9acc1835ec4f063ff9dac5423c17b11f178"
+coveralls@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.0.tgz#22ef730330538080d29b8c151dc9146afde88a99"
  dependencies:
-    js-yaml "3.6.1"
-    lcov-parse "0.0.10"
-    log-driver "1.2.5"
-    minimist "1.2.0"
-    request "2.79.0"
+    js-yaml "^3.6.1"
+    lcov-parse "^0.0.10"
+    log-driver "^1.2.5"
+    minimist "^1.2.0"
+    request "^2.79.0"

 create-ecdh@^4.0.0:
  version "4.0.0"
@ -2535,6 +2531,12 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

+debug@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.0.0, debug@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64"
@ -2724,7 +2726,7 @@ diff@3.2.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"

-diff@^3.1.0:
+diff@3.3.1, diff@^3.1.0:
  version "3.3.1"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"

@ -3288,7 +3290,7 @@ esprima-fb@3001.1.0-dev-harmony-fb:
  version "3001.1.0-dev-harmony-fb"
  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz#b77d37abcd38ea0b77426bb8bc2922ce6b426411"

-esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+esprima@2.7.x, esprima@^2.7.1:
  version "2.7.3"
  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"

@ -4352,16 +4354,6 @@ gaze@^1.0.0:
  dependencies:
    globule "^1.0.0"

-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
 get-caller-file@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@ -4464,24 +4456,24 @@ glob@7.1.1:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-glob@^5.0.15, glob@^5.0.3, glob@~5.0.0:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
  dependencies:
+    fs.realpath "^1.0.0"
    inflight "^1.0.4"
    inherits "2"
-    minimatch "2 || 3"
+    minimatch "^3.0.4"
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1, glob@~7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@^5.0.15, glob@^5.0.3, glob@~5.0.0:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
  dependencies:
-    fs.realpath "^1.0.0"
    inflight "^1.0.4"
    inherits "2"
-    minimatch "^3.0.4"
+    minimatch "2 || 3"
    once "^1.3.0"
    path-is-absolute "^1.0.0"

@ -4563,6 +4555,10 @@ graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, gr
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

+growl@1.10.3:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
+
 growl@1.9.2:
  version "1.9.2"
  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
@ -4790,15 +4786,6 @@ har-schema@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"

-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
 har-validator@~4.2.1:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@ -5293,15 +5280,6 @@ is-hex-prefixed@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554"

-is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-number@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
@ -5352,10 +5330,6 @@ is-promise@^2.1, is-promise@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"

-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
 is-regex@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@ -5568,14 +5542,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

-js-yaml@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.4.3, js-yaml@^3.6.1, js-yaml@^3.9.1:
  version "3.10.0"
  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
  dependencies:
@ -5748,10 +5715,6 @@ jsonparse@^1.2.0:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"

-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
 jsprim@^1.2.2:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@ -5900,7 +5863,7 @@ lcid@^1.0.0:
  dependencies:
    invert-kv "^1.0.0"

-lcov-parse@0.0.10:
+lcov-parse@^0.0.10:
  version "0.0.10"
  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"

@ -6291,7 +6254,7 @@ lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.4, lo
  version "4.17.4"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

-log-driver@1.2.5:
+log-driver@^1.2.5:
  version "1.2.5"
  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"

@ -6635,14 +6598,14 @@ minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"

-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
 minimist@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"

+minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
 minimist@~0.0.1, minimist@~0.0.8:
  version "0.0.10"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
@ -6689,7 +6652,7 @@ mocha-sinon@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/mocha-sinon/-/mocha-sinon-2.0.0.tgz#723a9310e7d737d7b77c7a66821237425b032d48"

-mocha@^3.2.0, mocha@^3.4.2:
+mocha@^3.2.0:
  version "3.5.3"
  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
  dependencies:
@ -6706,6 +6669,21 @@ mocha@^3.2.0, mocha@^3.4.2:
    mkdirp "0.5.1"
    supports-color "3.1.2"

+mocha@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.0.1.tgz#0aee5a95cf69a4618820f5e51fa31717117daf1b"
+  dependencies:
+    browser-stdout "1.3.0"
+    commander "2.11.0"
+    debug "3.1.0"
+    diff "3.3.1"
+    escape-string-regexp "1.0.5"
+    glob "7.1.2"
+    growl "1.10.3"
+    he "1.1.1"
+    mkdirp "0.5.1"
+    supports-color "4.4.0"
+
 module-deps@^4.0.8:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
@ -7867,10 +7845,6 @@ qs@~2.2.3:
  version "2.2.5"
  resolved "https://registry.yarnpkg.com/qs/-/qs-2.2.5.tgz#1088abaf9dcc0ae5ae45b709e6c6b5888b23923c"

-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
 qs@~6.4.0:
  version "6.4.0"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
@ -8382,31 +8356,6 @@ request@2, request@^2.67.0, request@^2.79.0, request@^2.81.0:
    tunnel-agent "^0.6.0"
    uuid "^3.0.0"

-request@2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
-
 require-directory@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@ -9403,6 +9352,12 @@ supports-color@3.1.2:
  dependencies:
    has-flag "^1.0.0"

+supports-color@4.4.0, supports-color@^4.0.0, supports-color@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+  dependencies:
+    has-flag "^2.0.0"
+
 supports-color@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@ -9417,12 +9372,6 @@ supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
  dependencies:
    has-flag "^1.0.0"

-supports-color@^4.0.0, supports-color@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-  dependencies:
-    has-flag "^2.0.0"
-
 sver-compat@^1.5.0:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
@ -9806,10 +9755,6 @@ tunnel-agent@^0.6.0:
  dependencies:
    safe-buffer "^5.0.1"

-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@ -10165,9 +10110,9 @@ weak@^1.0.0:
    bindings "^1.2.1"
    nan "^2.0.5"

-web3-provider-engine@^13.2.12:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.3.0.tgz#77c07b9ca2c529c48ad8fdfbb9d8ef9c3637d37e"
+web3-provider-engine@^13.3.1:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.3.2.tgz#a5954aa637f96f0dde5131bc20a6ce9e33e6fcd1"
  dependencies:
    async "^2.5.0"
    clone "^2.0.0"