diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7dc41ddbb1..7ad017a041 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,8 +24,8 @@ jobs:
       # use nightly version. 
       # // TODO: This is hardcoded but taken from js-cardano-wasm repo
       # which is checked out later
-      - run: rustup install nightly-2018-06-05
-      - run: rustup target add wasm32-unknown-unknown --toolchain nightly-2018-06-05
+      - run: rustup install 1.32.0
+      - run: rustup target add wasm32-unknown-unknown --toolchain 1.32.0
 
       # Because npm link will write in this path
       - run: sudo chown -R "$(whoami):$(whoami)" /usr/local/lib/node_modules
diff --git a/.gitignore b/.gitignore
index b99a8c675a..27cc69fc11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ production-key.pem
 build/
 dev/
 dll/
+screenshots/
 
 *.zip
 *.xpi
diff --git a/app/api/ada/daedalusTransfer.test.js b/app/api/ada/daedalusTransfer.test.js
new file mode 100644
index 0000000000..662b337774
--- /dev/null
+++ b/app/api/ada/daedalusTransfer.test.js
@@ -0,0 +1,48 @@
+/* eslint-disable camelcase */
+// @flow
+import './lib/test-config';
+import {
+  Wallet,
+} from 'rust-cardano-crypto';
+import {
+  getCryptoDaedalusWalletFromMnemonics,
+} from './lib/cardanoCrypto/cryptoWallet';
+import {
+  decodeRustTx,
+} from './lib/utils';
+import cbor from 'cbor';
+import bs58 from 'bs58';
+import { SHA3 } from 'sha3';
+import blake2b from 'blake2b';
+
+test('Daedalus transfer from old invalid address', () => {
+  const words = 'note park thrive ignore spare latin common balance clap soup school tiny';
+  const address = 'DdzFFzCqrhsmcx7z25PRkdbeUNqNNW4brhznpVxbm1EknAahjaCFEjYXg9KJRqkixjgGyz8D9GSX3CFDRoNrZyfJsi61N2FxCnq9yWBy';
+  const txId = '915f2e6865fb31cc93410efb6c0e580ca74862374b3da461e20135c01f312e7c';
+  const txIndex = 0;
+  const wallet = getCryptoDaedalusWalletFromMnemonics(words);
+  const input = [{
+    ptr: { id: txId, index: txIndex },
+    value: '1000000',
+    addressing: [2147483648, 1316836692]
+  }];
+  const outAddress = 'Ae2tdPwUPEZ4Gg5gmqwW2t7ottKBMjWunmPt7DwKkAGsxx9XNSfWqrE1Gbk';
+  const { result: { cbor_encoded_tx, fee } } = Wallet.move(wallet, input, outAddress);
+  const { tx: { tx: { inputs, outputs }, witnesses } } = decodeRustTx(cbor_encoded_tx);
+  expect(inputs.length).toEqual(1);
+  expect(outputs.length).toEqual(1);
+  expect(witnesses.length).toEqual(1);
+  expect(inputs[0].id).toEqual(txId);
+  expect(inputs[0].index).toEqual(txIndex);
+  expect(outputs[0].address).toEqual(outAddress);
+  expect(1000000 - parseInt(outputs[0].value, 10)).toEqual(parseInt(fee, 10));
+  expect('PkWitness' in witnesses[0]).toEqual(true);
+  const [pub] = witnesses[0].PkWitness;
+  const [addressRoot, addressAttr] = cbor.decode(cbor.decode(bs58.decode(address))[0].value);
+  const addressRootHex = addressRoot.toString('hex');
+  const ext = [0, [0, Buffer.from(pub, 'hex')], addressAttr];
+  const hash = new SHA3(256);
+  hash.update(cbor.encode(ext));
+  const calculatedRootHex = blake2b(28).update(hash.digest()).digest('hex');
+  expect(calculatedRootHex).toEqual(addressRootHex);
+});
diff --git a/app/i18n/locales/en-US.json b/app/i18n/locales/en-US.json
index 560dc67e28..ed665953ca 100644
--- a/app/i18n/locales/en-US.json
+++ b/app/i18n/locales/en-US.json
@@ -229,11 +229,11 @@
   "wallet.transaction.assuranceLevel.medium": "medium",
   "wallet.transaction.confirmations": "confirmations",
   "wallet.transaction.conversion.rate": "Conversion rate",
-  "wallet.transaction.fee": "Fee",
   "wallet.transaction.export.dialog.exportButton.label": "Export",
   "wallet.transaction.export.dialog.infoText1": "The entire transaction history within your wallet will be exported to a file.",
   "wallet.transaction.export.dialog.title": "Export transactions to file",
   "wallet.transaction.export.exportIcon.tooltip": "Export to file",
+  "wallet.transaction.fee": "Fee",
   "wallet.transaction.received": "{currency} received",
   "wallet.transaction.sent": "{currency} sent",
   "wallet.transaction.state.failed": "Transaction failed",
diff --git a/app/i18n/locales/ja-JP.json b/app/i18n/locales/ja-JP.json
index cc811bd179..5c0de6b6f5 100644
--- a/app/i18n/locales/ja-JP.json
+++ b/app/i18n/locales/ja-JP.json
@@ -229,11 +229,11 @@
   "wallet.transaction.assuranceLevel.medium": "中",
   "wallet.transaction.confirmations": "確認",
   "wallet.transaction.conversion.rate": "コンバージョン率",
-  "wallet.transaction.fee": "手数料",
   "wallet.transaction.export.dialog.exportButton.label": "出力",
   "wallet.transaction.export.dialog.infoText1": "ウォレット内の全トランザクション歴がファイルに出力されます。",
   "wallet.transaction.export.dialog.title": "トランザクション歴をファイルに出力する",
   "wallet.transaction.export.exportIcon.tooltip": "ファイルに出力する",
+  "wallet.transaction.fee": "手数料",
   "wallet.transaction.received": "{currency} 受信済",
   "wallet.transaction.sent": "{currency} 送信済",
   "wallet.transaction.state.failed": "処理に失敗しました",
diff --git a/app/i18n/locales/ko-KR.json b/app/i18n/locales/ko-KR.json
index 5026ae3b0a..026d760425 100644
--- a/app/i18n/locales/ko-KR.json
+++ b/app/i18n/locales/ko-KR.json
@@ -229,11 +229,11 @@
   "wallet.transaction.assuranceLevel.medium": "중간",
   "wallet.transaction.confirmations": "확인",
   "wallet.transaction.conversion.rate": "환율",
-  "wallet.transaction.fee": "수수료",
   "wallet.transaction.export.dialog.exportButton.label": "출력",
   "wallet.transaction.export.dialog.infoText1": "지갑의 전체 거래내역이 파일로 출력됩니다",
   "wallet.transaction.export.dialog.title": "거래내역을 파일로 출력",
   "wallet.transaction.export.exportIcon.tooltip": "파일로 출력",
+  "wallet.transaction.fee": "수수료",
   "wallet.transaction.received": "{currency} 받음",
   "wallet.transaction.sent": "{currency} 보냄",
   "wallet.transaction.state.failed": "거래 실패",
diff --git a/app/i18n/locales/ru-RU.json b/app/i18n/locales/ru-RU.json
index 869c113554..f016ab9597 100644
--- a/app/i18n/locales/ru-RU.json
+++ b/app/i18n/locales/ru-RU.json
@@ -229,11 +229,11 @@
   "wallet.transaction.assuranceLevel.medium": "средний",
   "wallet.transaction.confirmations": "подтверждения",
   "wallet.transaction.conversion.rate": "Обменный курс",
-  "wallet.transaction.fee": "Комиссия",
   "wallet.transaction.export.dialog.exportButton.label": "Экспорт",
   "wallet.transaction.export.dialog.infoText1": "Вся история транзакций в Вашем кошельке будет экспортирована в файл.",
   "wallet.transaction.export.dialog.title": "Экспорт транзакций в файл",
   "wallet.transaction.export.exportIcon.tooltip": "Экспорт в файл",
+  "wallet.transaction.fee": "Комиссия",
   "wallet.transaction.received": "{currency} получено",
   "wallet.transaction.sent": "{currency} отправлено",
   "wallet.transaction.state.failed": "Не удалось провести транзакцию",
diff --git a/app/i18n/locales/terms-of-use/ada/ja-JP.md b/app/i18n/locales/terms-of-use/ada/ja-JP.md
index bf7ba5f6c9..96ecffdc01 100644
--- a/app/i18n/locales/terms-of-use/ada/ja-JP.md
+++ b/app/i18n/locales/terms-of-use/ada/ja-JP.md
@@ -23,7 +23,7 @@
 
 ## 3. ユーザーの表明
 
-ユーザーは、当社に対し、(a)ユーザーが自然人である場合には、ユーザーが18歳を超えていること【AMT：18歳は含まれないことを念のためご確認ください。】、(b)ユーザーは本規約を締結し、本規約に基づくユーザーの義務を履行する権限および権能を有していること、(c)ユーザーが当社に提供する情報はすべて真実、正確かつ完全であること、(d)ユーザーはユーザーによる本ソフトウェアへのアクセス、本ソフトウェアの利用または本ソフトウェアのインストールに関して関係法域のすべての法令を遵守すること、(e)ユーザーは本規約のすべての条項（第４条に定める規定を含みますが、これに限られません。）を遵守すること、ならびに(f)ユーザーは本ソフトウェアへのアクセス、本ソフトウェアの利用または本ソフトウェアのインストールに必要な正確かつ完全な情報を提供しており、今後も提供することを表明し、保証します。
+ユーザーは、当社に対し、(a)ユーザーが自然人である場合には、ユーザーが18歳を超えていること、(b)ユーザーは本規約を締結し、本規約に基づくユーザーの義務を履行する権限および権能を有していること、(c)ユーザーが当社に提供する情報はすべて真実、正確かつ完全であること、(d)ユーザーはユーザーによる本ソフトウェアへのアクセス、本ソフトウェアの利用または本ソフトウェアのインストールに関して関係法域のすべての法令を遵守すること、(e)ユーザーは本規約のすべての条項（第４条に定める規定を含みますが、これに限られません。）を遵守すること、ならびに(f)ユーザーは本ソフトウェアへのアクセス、本ソフトウェアの利用または本ソフトウェアのインストールに必要な正確かつ完全な情報を提供しており、今後も提供することを表明し、保証します。
 
 ## 4. 禁止される利用
 
diff --git a/app/i18n/locales/zh-Hans.json b/app/i18n/locales/zh-Hans.json
index b07c023273..d20930effc 100644
--- a/app/i18n/locales/zh-Hans.json
+++ b/app/i18n/locales/zh-Hans.json
@@ -229,11 +229,11 @@
   "wallet.transaction.assuranceLevel.medium": "中",
   "wallet.transaction.confirmations": "确认",
   "wallet.transaction.conversion.rate": "汇价",
-  "wallet.transaction.fee": "费用",
   "wallet.transaction.export.dialog.exportButton.label": "输出",
   "wallet.transaction.export.dialog.infoText1": "钱包中的所有交易记录将输出到文件中。",
   "wallet.transaction.export.dialog.title": "输出交易记录至文件",
   "wallet.transaction.export.exportIcon.tooltip": "输出文件",
+  "wallet.transaction.fee": "费用",
   "wallet.transaction.received": "已接收 {currency}",
   "wallet.transaction.sent": "已发送 {currency}",
   "wallet.transaction.state.failed": "交易失败",
diff --git a/app/i18n/locales/zh-Hant.json b/app/i18n/locales/zh-Hant.json
index 914e8b15ce..e8a5306010 100644
--- a/app/i18n/locales/zh-Hant.json
+++ b/app/i18n/locales/zh-Hant.json
@@ -227,17 +227,13 @@
   "wallet.transaction.assuranceLevel.high": "高",
   "wallet.transaction.assuranceLevel.low": "低",
   "wallet.transaction.assuranceLevel.medium": "適中",
-  "wallet.transaction.export.dialog.exportButton.label": "輸出",
-  "wallet.transaction.export.dialog.infoText1": "錢包中的所有交易記錄將輸出到文件中。",
-  "wallet.transaction.export.dialog.title": "輸出交易記錄至文件",
-  "wallet.transaction.export.exportIcon.tooltip": "輸出文件",  
   "wallet.transaction.confirmations": "確認",
   "wallet.transaction.conversion.rate": "匯率",
-  "wallet.transaction.fee": "費用",
   "wallet.transaction.export.dialog.exportButton.label": "輸出",
   "wallet.transaction.export.dialog.infoText1": "錢包中的所有交易記錄將輸出到文件中",
   "wallet.transaction.export.dialog.title": "輸出交易記錄至文件",
   "wallet.transaction.export.exportIcon.tooltip": "輸出文件",
+  "wallet.transaction.fee": "費用",
   "wallet.transaction.received": "已收到 {currency}",
   "wallet.transaction.sent": "已傳送 {currency}",
   "wallet.transaction.state.failed": "交易失敗",
diff --git a/chrome/manifest.development.json b/chrome/manifest.development.json
index bfe9fbafc5..b6476719a4 100644
--- a/chrome/manifest.development.json
+++ b/chrome/manifest.development.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.2.1",
   "name": "yoroi",
   "manifest_version": 2,
   "description": "[dev] Cardano ADA wallet",
diff --git a/chrome/manifest.mainnet.json b/chrome/manifest.mainnet.json
index 8e2901e7f8..50b9e1edc8 100644
--- a/chrome/manifest.mainnet.json
+++ b/chrome/manifest.mainnet.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.2.1",
   "name": "Yoroi",
   "manifest_version": 2,
   "description": "A simple, secure and fast Cardano ADA wallet.",
diff --git a/chrome/manifest.staging.json b/chrome/manifest.staging.json
index 05e9771eb0..cd7befd9da 100644
--- a/chrome/manifest.staging.json
+++ b/chrome/manifest.staging.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.2.0",
-  "version_name": "st-1.2.0", 
+  "version": "1.2.1",
+  "version_name": "st-1.2.1", 
   "name": "Yoroi Staging",
   "manifest_version": 2,
   "description": "[staging] Cardano ADA wallet",
diff --git a/features/settings-ui.feature b/features/settings-ui.feature
index 6abc63ca29..a5ccd008bb 100644
--- a/features/settings-ui.feature
+++ b/features/settings-ui.feature
@@ -158,9 +158,9 @@ Feature: Wallet UI Settings
     When I navigate to the general settings screen
     And I open General Settings language selection dropdown
     And I select Japanese language
-    Then I should see Japanese language as selected
+    Then The Japanese language should be selected
     When I refresh the page
-    Then I should see Japanese language as selected
+    Then The Japanese language should be selected
 
   @it-3
   Scenario: Yoroi Settings Screen / Terms of Use in Default English(IT-3)
diff --git a/features/step_definitions/common-steps.js b/features/step_definitions/common-steps.js
index 306276ff2c..bdaf15c418 100644
--- a/features/step_definitions/common-steps.js
+++ b/features/step_definitions/common-steps.js
@@ -1,11 +1,27 @@
 // @flow
 
-import { BeforeAll, Given, After, AfterAll } from 'cucumber';
+import { Before, BeforeAll, Given, After, AfterAll, setDefinitionFunctionWrapper } from 'cucumber';
 import { getMockServer, closeMockServer } from '../support/mockServer';
 import { buildFeatureData, getFeatureData, getFakeAddresses } from '../support/mockDataBuilder';
 import i18nHelper from '../support/helpers/i18n-helpers';
 
+const { promisify } = require('util');
+const fs = require('fs');
+const rimraf = require('rimraf');
+
+const screenshotsDir = './screenshots/';
+
+/** We need to keep track of our progress in testing to give unique names to screenshots */
+const testProgress = {
+  scenarioName: '',
+  lineNum: 0, // we need this to differentiate scenarios with multiple "examples"
+  step: 0
+};
+
 BeforeAll(() => {
+  rimraf.sync(screenshotsDir);
+  fs.mkdirSync(screenshotsDir);
+
   getMockServer({});
 });
 
@@ -13,10 +29,49 @@ AfterAll(() => {
   closeMockServer();
 });
 
+Before((scenario) => {
+  // cleanup scenario name so it is folder-name friendly
+  testProgress.scenarioName = scenario.pickle.name.replace(/[^0-9a-z_ ]/gi, '');
+  testProgress.lineNum = scenario.sourceLocation.line;
+  testProgress.step = 0;
+});
+
+
 After(async function () {
   await this.driver.quit();
 });
 
+const writeFile = promisify(fs.writeFile);
+
+/** Wrap every step to take screenshots for UI-based testing */
+setDefinitionFunctionWrapper((fn, _, pattern) => {
+  if (!pattern) {
+    return fn;
+  }
+  return async function (...args) {
+    const ret = await fn.apply(this, args);
+
+    // Regex patterns contain non-ascii characters.
+    // We want to remove this to get a filename-friendly string
+    const cleanString = pattern.toString().replace(/[^0-9a-z_ ]/gi, '');
+
+    if (cleanString.includes('I should see')) {
+      // path logic
+      const dir = `${screenshotsDir}/${testProgress.scenarioName}`;
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir);
+      }
+      const path = `${dir}/${testProgress.step}_${testProgress.lineNum}-${cleanString}.png`;
+
+      const screenshot = await this.driver.takeScreenshot();
+      await writeFile(path, screenshot, 'base64');
+    }
+
+    testProgress.step += 1;
+    return ret;
+  };
+});
+
 Given(/^I am testing "([^"]*)"$/, feature => {
   buildFeatureData(feature);
 });
diff --git a/features/step_definitions/general-settings-steps.js b/features/step_definitions/general-settings-steps.js
index 03c57029d5..b3daf4a693 100644
--- a/features/step_definitions/general-settings-steps.js
+++ b/features/step_definitions/general-settings-steps.js
@@ -33,7 +33,7 @@ Then(/^I should see secondary menu (.*) item disabled$/, async function (buttonN
   await this.waitUntilText(buttonSelector, label);
 });
 
-Then(/^I should see Japanese language as selected$/, async function () {
+Then(/^The Japanese language should be selected$/, async function () {
   this.driver.wait(async () => {
     const activeLanguage = await i18n.getActiveLanguage(this.driver);
     return activeLanguage === 'ja-JP';
diff --git a/js-cardano-wasm b/js-cardano-wasm
index def5d9a0eb..386cc1ebe9 160000
--- a/js-cardano-wasm
+++ b/js-cardano-wasm
@@ -1 +1 @@
-Subproject commit def5d9a0ebd69435d29e737c7e99ea04f692ab70
+Subproject commit 386cc1ebe9cba1a1bf90304a491221d6986cd865
diff --git a/js-cardano-wasm-build b/js-cardano-wasm-build
index 4d95151301..666a43ba34 100755
--- a/js-cardano-wasm-build
+++ b/js-cardano-wasm-build
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-RUST_TOOLCHAIN="$(cat rust-toolchain)"
+RUST_TOOLCHAIN="1.32.0"
 
 set +e
 pushd wallet-wasm
+rustup install ${RUST_TOOLCHAIN} && \
 rustup target add --toolchain ${RUST_TOOLCHAIN} wasm32-unknown-unknown && \
 cargo  +${RUST_TOOLCHAIN} build --target wasm32-unknown-unknown --release --verbose && \
 popd && \
diff --git a/package-lock.json b/package-lock.json
index 537d90c592..8460335c49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1333,6 +1333,30 @@
         }
       }
     },
+    "@babel/polyfill": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.2.5.tgz",
+      "integrity": "sha512-8Y/t3MWThtMLYr0YNC/Q76tqN1w30+b0uQMeFUYauG2UGTR19zyUtFrAzT23zNtBxPp+LbE5E/nwV/q/r3y6ug==",
+      "dev": true,
+      "requires": {
+        "core-js": "2.6.3",
+        "regenerator-runtime": "0.12.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
+          "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==",
+          "dev": true
+        }
+      }
+    },
     "@babel/preset-env": {
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.1.6.tgz",
@@ -2039,7 +2063,7 @@
       "integrity": "sha512-cjC3jUCh9spkroKue5PDSKH5RFQ/KNuZJhk3GwHYmB/8qqETxLOmMdLH+ohi/VukNzxDlMvIe7zScvLoOdhb6Q==",
       "dev": true,
       "requires": {
-        "diff": "3.2.0",
+        "diff": "3.5.0",
         "pad-right": "0.2.2",
         "repeat-string": "1.6.1"
       }
@@ -2189,55 +2213,10 @@
       }
     },
     "babel-core": {
-      "version": "6.26.3",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
-      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "babel-generator": "6.26.1",
-        "babel-helpers": "6.24.1",
-        "babel-messages": "6.23.0",
-        "babel-register": "6.26.0",
-        "babel-runtime": "6.26.0",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "convert-source-map": "1.5.1",
-        "debug": "2.6.9",
-        "json5": "0.5.1",
-        "lodash": "4.17.11",
-        "minimatch": "3.0.4",
-        "path-is-absolute": "1.0.1",
-        "private": "0.1.8",
-        "slash": "1.0.0",
-        "source-map": "0.5.7"
-      },
-      "dependencies": {
-        "babel-runtime": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
-          "requires": {
-            "core-js": "2.6.2",
-            "regenerator-runtime": "0.11.1"
-          }
-        },
-        "core-js": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz",
-          "integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
+      "version": "7.0.0-bridge.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
+      "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
+      "dev": true
     },
     "babel-eslint": {
       "version": "10.0.1",
@@ -2315,14 +2294,14 @@
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
           "dev": true,
           "requires": {
-            "core-js": "2.6.2",
+            "core-js": "2.6.3",
             "regenerator-runtime": "0.11.1"
           }
         },
         "core-js": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz",
-          "integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==",
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
+          "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==",
           "dev": true
         }
       }
@@ -2440,12 +2419,12 @@
       "dev": true
     },
     "babel-plugin-react-intl": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz",
-      "integrity": "sha1-PUORLoJNoAXgjo6COdW6eEN0uwA=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-3.0.1.tgz",
+      "integrity": "sha512-FqnEO+Tq7kJVUPKsSG3s5jaHi3pAC4RUR11IrscvjsfkOApLP2DtzNo6dtQ+tX+OzEzJx7cUms8aCw5BFyW5xg==",
       "dev": true,
       "requires": {
-        "babel-runtime": "6.3.19",
+        "@babel/runtime": "7.1.5",
         "intl-messageformat-parser": "1.4.0",
         "mkdirp": "0.5.1"
       }
@@ -2598,40 +2577,64 @@
       "requires": {
         "babel-core": "6.26.3",
         "babel-runtime": "6.26.0",
-        "core-js": "2.6.2",
+        "core-js": "2.6.3",
         "home-or-tmp": "2.0.0",
         "lodash": "4.17.11",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18"
       },
       "dependencies": {
+        "babel-core": {
+          "version": "6.26.3",
+          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+          "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.26.0",
+            "babel-generator": "6.26.1",
+            "babel-helpers": "6.24.1",
+            "babel-messages": "6.23.0",
+            "babel-register": "6.26.0",
+            "babel-runtime": "6.26.0",
+            "babel-template": "6.26.0",
+            "babel-traverse": "6.26.0",
+            "babel-types": "6.26.0",
+            "babylon": "6.18.0",
+            "convert-source-map": "1.5.1",
+            "debug": "2.6.9",
+            "json5": "0.5.1",
+            "lodash": "4.17.11",
+            "minimatch": "3.0.4",
+            "path-is-absolute": "1.0.1",
+            "private": "0.1.8",
+            "slash": "1.0.0",
+            "source-map": "0.5.7"
+          }
+        },
         "babel-runtime": {
           "version": "6.26.0",
           "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
           "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
           "dev": true,
           "requires": {
-            "core-js": "2.6.2",
+            "core-js": "2.6.3",
             "regenerator-runtime": "0.11.1"
           }
         },
         "core-js": {
-          "version": "2.6.2",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz",
-          "integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==",
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
+          "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
       }
     },
-    "babel-runtime": {
-      "version": "6.3.19",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.3.19.tgz",
-      "integrity": "sha1-8ttpbDyMN5iB4qU2ZeAhhwdNxoE=",
-      "dev": true,
-      "requires": {
-        "core-js": "1.2.7"
-      }
-    },
     "babel-template": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
@@ -3471,7 +3474,7 @@
         "anymatch": "2.0.0",
         "async-each": "1.0.1",
         "braces": "2.3.2",
-        "fsevents": "1.2.4",
+        "fsevents": "1.2.7",
         "glob-parent": "3.1.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -3670,20 +3673,47 @@
         "restore-cursor": "2.0.0"
       }
     },
-    "cli-table": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz",
-      "integrity": "sha1-9TsFJmqLGguTSz0IIebi3FkUriM=",
+    "cli-table3": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
+      "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
       "dev": true,
       "requires": {
-        "colors": "1.0.3"
+        "colors": "1.1.2",
+        "object-assign": "4.1.1",
+        "string-width": "2.1.1"
       },
       "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
         }
       }
     },
@@ -4479,70 +4509,71 @@
       }
     },
     "cucumber": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/cucumber/-/cucumber-4.2.1.tgz",
-      "integrity": "sha512-3gQ0Vv4kSHsvXEFC6b1c+TfLRDzWD1/kU7e5vm8Kh8j35b95k6favan9/4ixcBNqd7UsU1T6FYcawC87+DlNKw==",
+      "version": "git+https://github.com/SebastienGllmt/cucumber-js.git#965b44ed683ac8d8facbd3e242072d37f48426d6",
       "dev": true,
       "requires": {
+        "@babel/polyfill": "7.2.5",
         "assertion-error-formatter": "2.0.1",
-        "babel-runtime": "6.26.0",
-        "bluebird": "3.5.1",
-        "cli-table": "0.3.1",
+        "bluebird": "3.5.3",
+        "cli-table3": "0.5.1",
         "colors": "1.1.2",
         "commander": "2.15.0",
-        "cucumber-expressions": "5.0.18",
+        "cross-spawn": "6.0.5",
+        "cucumber-expressions": "6.0.1",
         "cucumber-tag-expressions": "1.1.1",
-        "duration": "0.2.0",
+        "duration": "0.2.2",
         "escape-string-regexp": "1.0.5",
         "figures": "2.0.0",
-        "gherkin": "5.0.0",
-        "glob": "7.1.2",
+        "gherkin": "5.1.0",
+        "glob": "7.1.3",
         "indent-string": "3.2.0",
         "is-generator": "1.0.3",
         "is-stream": "1.1.0",
         "knuth-shuffle-seeded": "1.0.6",
         "lodash": "4.17.11",
         "mz": "2.7.0",
-        "progress": "2.0.0",
+        "progress": "2.0.1",
         "resolve": "1.5.0",
-        "serialize-error": "2.1.0",
+        "serialize-error": "3.0.0",
         "stack-chain": "2.0.0",
         "stacktrace-js": "2.0.0",
-        "string-argv": "0.0.2",
+        "string-argv": "0.1.1",
         "title-case": "2.1.1",
         "util-arity": "1.1.0",
         "verror": "1.10.0"
       },
       "dependencies": {
-        "babel-runtime": {
-          "version": "6.26.0",
-          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-          "dev": true,
-          "requires": {
-            "core-js": "2.5.7",
-            "regenerator-runtime": "0.11.1"
-          }
-        },
         "bluebird": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
-          "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
           "dev": true
         },
-        "core-js": {
-          "version": "2.5.7",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-          "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
-          "dev": true
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.5.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.0"
+          }
         },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5"
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
           }
         },
         "indent-string": {
@@ -4550,19 +4581,13 @@
           "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
           "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
           "dev": true
-        },
-        "progress": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
-          "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
-          "dev": true
         }
       }
     },
     "cucumber-expressions": {
-      "version": "5.0.18",
-      "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-5.0.18.tgz",
-      "integrity": "sha1-bHB3nv0668Xp54U5OLERAyJClZY=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/cucumber-expressions/-/cucumber-expressions-6.0.1.tgz",
+      "integrity": "sha1-R8nFc3gcL/ch161bLNHJf0OZq44=",
       "dev": true,
       "requires": {
         "becke-ch--regex--s0-0-v1--base--pl--lib": "1.4.0"
@@ -4848,9 +4873,9 @@
       "dev": true
     },
     "diff": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-      "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
     "diffie-hellman": {
@@ -4924,22 +4949,24 @@
       "dev": true
     },
     "duration": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.0.tgz",
-      "integrity": "sha1-X5xN+q//ZV3phhEu/iXFl43YUUY=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/duration/-/duration-0.2.2.tgz",
+      "integrity": "sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==",
       "dev": true,
       "requires": {
-        "d": "0.1.1",
-        "es5-ext": "0.10.40"
+        "d": "1.0.0",
+        "es5-ext": "0.10.47"
       },
       "dependencies": {
-        "d": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
-          "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+        "es5-ext": {
+          "version": "0.10.47",
+          "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz",
+          "integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==",
           "dev": true,
           "requires": {
-            "es5-ext": "0.10.40"
+            "es6-iterator": "2.0.3",
+            "es6-symbol": "3.1.1",
+            "next-tick": "1.0.0"
           }
         }
       }
@@ -5050,6 +5077,15 @@
         "is-arrayish": "0.2.1"
       }
     },
+    "error-stack-parser": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz",
+      "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==",
+      "dev": true,
+      "requires": {
+        "stackframe": "1.0.4"
+      }
+    },
     "errorhandler": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz",
@@ -6751,13 +6787,13 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
+      "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
       "optional": true,
       "requires": {
         "nan": "2.10.0",
-        "node-pre-gyp": "0.10.0"
+        "node-pre-gyp": "0.10.3"
       },
       "dependencies": {
         "abbrev": {
@@ -6775,7 +6811,7 @@
           "optional": true
         },
         "are-we-there-yet": {
-          "version": "1.1.4",
+          "version": "1.1.5",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6796,7 +6832,7 @@
           }
         },
         "chownr": {
-          "version": "1.0.1",
+          "version": "1.1.1",
           "bundled": true,
           "optional": true
         },
@@ -6826,7 +6862,7 @@
           }
         },
         "deep-extend": {
-          "version": "0.5.1",
+          "version": "0.6.0",
           "bundled": true,
           "optional": true
         },
@@ -6845,7 +6881,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "minipass": "2.2.4"
+            "minipass": "2.3.5"
           }
         },
         "fs.realpath": {
@@ -6865,11 +6901,11 @@
             "signal-exit": "3.0.2",
             "string-width": "1.0.2",
             "strip-ansi": "3.0.1",
-            "wide-align": "1.1.2"
+            "wide-align": "1.1.3"
           }
         },
         "glob": {
-          "version": "7.1.2",
+          "version": "7.1.3",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6887,7 +6923,7 @@
           "optional": true
         },
         "iconv-lite": {
-          "version": "0.4.21",
+          "version": "0.4.24",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -6944,19 +6980,19 @@
           "bundled": true
         },
         "minipass": {
-          "version": "2.2.4",
+          "version": "2.3.5",
           "bundled": true,
           "requires": {
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           }
         },
         "minizlib": {
-          "version": "1.1.0",
+          "version": "1.2.1",
           "bundled": true,
           "optional": true,
           "requires": {
-            "minipass": "2.2.4"
+            "minipass": "2.3.5"
           }
         },
         "mkdirp": {
@@ -6972,30 +7008,30 @@
           "optional": true
         },
         "needle": {
-          "version": "2.2.0",
+          "version": "2.2.4",
           "bundled": true,
           "optional": true,
           "requires": {
             "debug": "2.6.9",
-            "iconv-lite": "0.4.21",
+            "iconv-lite": "0.4.24",
             "sax": "1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.10.0",
+          "version": "0.10.3",
           "bundled": true,
           "optional": true,
           "requires": {
             "detect-libc": "1.0.3",
             "mkdirp": "0.5.1",
-            "needle": "2.2.0",
+            "needle": "2.2.4",
             "nopt": "4.0.1",
-            "npm-packlist": "1.1.10",
+            "npm-packlist": "1.2.0",
             "npmlog": "4.1.2",
-            "rc": "1.2.7",
-            "rimraf": "2.6.2",
-            "semver": "5.5.0",
-            "tar": "4.4.1"
+            "rc": "1.2.8",
+            "rimraf": "2.6.3",
+            "semver": "5.6.0",
+            "tar": "4.4.8"
           }
         },
         "nopt": {
@@ -7008,17 +7044,17 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.3",
+          "version": "1.0.5",
           "bundled": true,
           "optional": true
         },
         "npm-packlist": {
-          "version": "1.1.10",
+          "version": "1.2.0",
           "bundled": true,
           "optional": true,
           "requires": {
             "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.3"
+            "npm-bundled": "1.0.5"
           }
         },
         "npmlog": {
@@ -7026,7 +7062,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.4",
+            "are-we-there-yet": "1.1.5",
             "console-control-strings": "1.1.0",
             "gauge": "2.7.4",
             "set-blocking": "2.0.0"
@@ -7078,11 +7114,11 @@
           "optional": true
         },
         "rc": {
-          "version": "1.2.7",
+          "version": "1.2.8",
           "bundled": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.5.1",
+            "deep-extend": "0.6.0",
             "ini": "1.3.5",
             "minimist": "1.2.0",
             "strip-json-comments": "2.0.1"
@@ -7104,21 +7140,21 @@
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
+            "safe-buffer": "5.1.2",
             "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "rimraf": {
-          "version": "2.6.2",
+          "version": "2.6.3",
           "bundled": true,
           "optional": true,
           "requires": {
-            "glob": "7.1.2"
+            "glob": "7.1.3"
           }
         },
         "safe-buffer": {
-          "version": "5.1.1",
+          "version": "5.1.2",
           "bundled": true
         },
         "safer-buffer": {
@@ -7132,7 +7168,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.5.0",
+          "version": "5.6.0",
           "bundled": true,
           "optional": true
         },
@@ -7160,7 +7196,7 @@
           "bundled": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "5.1.2"
           }
         },
         "strip-ansi": {
@@ -7176,17 +7212,17 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.1",
+          "version": "4.4.8",
           "bundled": true,
           "optional": true,
           "requires": {
-            "chownr": "1.0.1",
+            "chownr": "1.1.1",
             "fs-minipass": "1.2.5",
-            "minipass": "2.2.4",
-            "minizlib": "1.1.0",
+            "minipass": "2.3.5",
+            "minizlib": "1.2.1",
             "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.1",
-            "yallist": "3.0.2"
+            "safe-buffer": "5.1.2",
+            "yallist": "3.0.3"
           }
         },
         "util-deprecate": {
@@ -7195,7 +7231,7 @@
           "optional": true
         },
         "wide-align": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "optional": true,
           "requires": {
@@ -7207,7 +7243,7 @@
           "bundled": true
         },
         "yallist": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "bundled": true
         }
       }
@@ -7371,9 +7407,9 @@
       }
     },
     "gherkin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.0.0.tgz",
-      "integrity": "sha1-lt70EZjsOQgli1Ea909lWidk0qE=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/gherkin/-/gherkin-5.1.0.tgz",
+      "integrity": "sha1-aEu7A63STq9731RPWAM+so+zxtU=",
       "dev": true
     },
     "glob": {
@@ -8991,6 +9027,43 @@
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
           "dev": true
         },
+        "babel-core": {
+          "version": "6.26.3",
+          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+          "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.26.0",
+            "babel-generator": "6.26.1",
+            "babel-helpers": "6.24.1",
+            "babel-messages": "6.23.0",
+            "babel-register": "6.26.0",
+            "babel-runtime": "6.26.0",
+            "babel-template": "6.26.0",
+            "babel-traverse": "6.26.0",
+            "babel-types": "6.26.0",
+            "babylon": "6.18.0",
+            "convert-source-map": "1.5.1",
+            "debug": "2.6.9",
+            "json5": "0.5.1",
+            "lodash": "4.17.11",
+            "minimatch": "3.0.4",
+            "path-is-absolute": "1.0.1",
+            "private": "0.1.8",
+            "slash": "1.0.0",
+            "source-map": "0.5.7"
+          }
+        },
+        "babel-runtime": {
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
+          "requires": {
+            "core-js": "2.6.3",
+            "regenerator-runtime": "0.11.1"
+          }
+        },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
@@ -9002,6 +9075,12 @@
             "repeat-element": "1.1.2"
           }
         },
+        "core-js": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
+          "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "0.1.5",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
@@ -9055,6 +9134,12 @@
             "parse-glob": "3.0.4",
             "regex-cache": "0.4.4"
           }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
@@ -9065,7 +9150,7 @@
       "dev": true,
       "requires": {
         "chalk": "2.3.2",
-        "diff": "3.2.0",
+        "diff": "3.5.0",
         "jest-get-type": "22.4.3",
         "pretty-format": "23.6.0"
       }
@@ -9474,6 +9559,43 @@
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
           "dev": true
         },
+        "babel-core": {
+          "version": "6.26.3",
+          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+          "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.26.0",
+            "babel-generator": "6.26.1",
+            "babel-helpers": "6.24.1",
+            "babel-messages": "6.23.0",
+            "babel-register": "6.26.0",
+            "babel-runtime": "6.26.0",
+            "babel-template": "6.26.0",
+            "babel-traverse": "6.26.0",
+            "babel-types": "6.26.0",
+            "babylon": "6.18.0",
+            "convert-source-map": "1.5.1",
+            "debug": "2.6.9",
+            "json5": "0.5.1",
+            "lodash": "4.17.11",
+            "minimatch": "3.0.4",
+            "path-is-absolute": "1.0.1",
+            "private": "0.1.8",
+            "slash": "1.0.0",
+            "source-map": "0.5.7"
+          }
+        },
+        "babel-runtime": {
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
+          "requires": {
+            "core-js": "2.6.3",
+            "regenerator-runtime": "0.11.1"
+          }
+        },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
@@ -9502,6 +9624,12 @@
             "wrap-ansi": "2.1.0"
           }
         },
+        "core-js": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.3.tgz",
+          "integrity": "sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "0.1.5",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
@@ -9571,6 +9699,12 @@
             "regex-cache": "0.4.4"
           }
         },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -11397,6 +11531,12 @@
       "integrity": "sha512-nJmSswG4As/MkRq7QZFuH/sf/yuv8ODdMZrY4Bedjp77a5MK4A6s7YbBB64c9u79EBUOfXUXBvArmvzTD0X+6g==",
       "dev": true
     },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -16708,7 +16848,7 @@
             "anymatch": "2.0.0",
             "async-each": "1.0.1",
             "braces": "2.3.1",
-            "fsevents": "1.2.4",
+            "fsevents": "1.2.7",
             "glob-parent": "3.1.0",
             "inherits": "2.0.3",
             "is-binary-path": "1.0.1",
@@ -19855,7 +19995,7 @@
         "capture-exit": "1.2.0",
         "exec-sh": "0.2.2",
         "fb-watchman": "2.0.0",
-        "fsevents": "1.2.4",
+        "fsevents": "1.2.7",
         "micromatch": "3.1.10",
         "minimist": "1.2.0",
         "walker": "1.0.7",
@@ -20151,9 +20291,9 @@
       }
     },
     "serialize-error": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
-      "integrity": "sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-3.0.0.tgz",
+      "integrity": "sha512-+y3nkkG/go1Vdw+2f/+XUXM1DXX1XcxTl99FfiD/OEPUNw4uo0i6FKABfTAN5ZcgGtjTRZcEbxcE/jtXbEY19A==",
       "dev": true
     },
     "serve-static": {
@@ -20555,20 +20695,12 @@
       "dev": true
     },
     "stack-generator": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.2.tgz",
-      "integrity": "sha512-Qj3X+vY7qQ0OOLQomEihHk5SSnSPCI3z4RfB8kDk9lnzwznBODlkWODitEo8sHpp0a2VdSy3yuJkabNsQN5RGA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.3.tgz",
+      "integrity": "sha512-kdzGoqrnqsMxOEuXsXyQTmvWXZmG0f3Ql2GDx5NtmZs59sT2Bt9Vdyq0XdtxUi58q/+nxtbF9KOQ9HkV1QznGg==",
       "dev": true,
       "requires": {
         "stackframe": "1.0.4"
-      },
-      "dependencies": {
-        "stackframe": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-          "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
-          "dev": true
-        }
       }
     },
     "stack-utils": {
@@ -20577,6 +20709,12 @@
       "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
       "dev": true
     },
+    "stackframe": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
+      "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+      "dev": true
+    },
     "stacktrace-gps": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz",
@@ -20592,12 +20730,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
           "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
           "dev": true
-        },
-        "stackframe": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-          "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
-          "dev": true
         }
       }
     },
@@ -20607,26 +20739,9 @@
       "integrity": "sha1-d2ymRqlbxsayuQd2U2p/xyxt21g=",
       "dev": true,
       "requires": {
-        "error-stack-parser": "2.0.1",
-        "stack-generator": "2.0.2",
+        "error-stack-parser": "2.0.2",
+        "stack-generator": "2.0.3",
         "stacktrace-gps": "3.0.2"
-      },
-      "dependencies": {
-        "error-stack-parser": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.1.tgz",
-          "integrity": "sha1-oyArj7AxFKqbQKDjZp5IsrZaAQo=",
-          "dev": true,
-          "requires": {
-            "stackframe": "1.0.4"
-          }
-        },
-        "stackframe": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-          "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
-          "dev": true
-        }
       }
     },
     "static-extend": {
@@ -20736,9 +20851,9 @@
       "dev": true
     },
     "string-argv": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz",
-      "integrity": "sha1-2sMECGkMIfPDYwo/86BYd73L1zY=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.1.1.tgz",
+      "integrity": "sha512-El1Va5ehZ0XTj3Ekw4WFidXvTmt9SrC0+eigdojgtJMVtPkF0qbBe9fyNSl9eQf+kUHnTSQxdQYzuHfZy8V+DQ==",
       "dev": true
     },
     "string-length": {
diff --git a/package.json b/package.json
index c407e8f9b7..48105d4df5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Cardano ADA wallet",
   "scripts": {
     "start": "node scripts/start",
@@ -65,15 +65,16 @@
     "babel-eslint": "10.0.1",
     "babel-loader": "8.0.4",
     "babel-plugin-add-module-exports": "0.2.1",
-    "babel-plugin-react-intl": "2.3.1",
+    "babel-plugin-react-intl": "3.0.1",
     "babel-preset-react-optimize": "1.0.1",
+    "blake2b": "2.1.3",
     "chai": "3.2.0",
     "chromedriver": "2.40.0",
     "config": "1.30.0",
     "config-webpack": "1.0.4",
     "crx": "3.2.1",
     "css-loader": "0.25.0",
-    "cucumber": "4.2.1",
+    "cucumber": "git+https://github.com/SebastienGllmt/cucumber-js.git",
     "eslint": "5.8.0",
     "eslint-config-airbnb": "17.1.0",
     "eslint-plugin-flowtype": "3.2.0",
@@ -100,6 +101,7 @@
     "rimraf": "2.4.3",
     "sass-loader": "6.0.7",
     "selenium-webdriver": "git+https://github.com/SebastienGllmt/selenium-webdriver-fix.git",
+    "sha3": "2.0.0",
     "shelljs": "0.7.0",
     "style-loader": "0.13.1",
     "url-loader": "1.0.1",
@@ -112,7 +114,7 @@
     "autoprefixer": "7.2.5",
     "axios": "0.18.0",
     "bignumber.js": "4.0.0",
-    "bip39": "2.5.0",
+    "bip39": "2.3.0",
     "bluebird": "3.3.4",
     "bs58": "4.0.1",
     "cbor": "4.1.4",
diff --git a/setup_cardano_crypto.sh b/setup_cardano_crypto.sh
index 119403efa9..e89e3d0e65 100755
--- a/setup_cardano_crypto.sh
+++ b/setup_cardano_crypto.sh
@@ -2,9 +2,10 @@
 
 git submodule update --init --recursive && \
 cd js-cardano-wasm && \
-git checkout def5d9a0ebd69435d29e737c7e99ea04f692ab70 && \
+git checkout 386cc1ebe9cba1a1bf90304a491221d6986cd865 && \
+git submodule update
 cd rust && \
-git checkout 8b441cbbeba32ada20d065399083a16d85a5fe29 && \
+git checkout 9bef10d1bbd1321d98aa6b30ba030631806ad153 && \
 cd .. && \
 npm install && \
 ../js-cardano-wasm-build && \