Merge branch 'development' into chore/release-it

.circleci/config.yml

@@ -1,8 +1,7 @@
 version: 2
 
 references:
-  workspace_root: &workspace_root
-    /home/circleci
+  workspace_root: &workspace_root /home/circleci
 
   attach_workspace: &attach_workspace
     attach_workspace:
@@ -13,8 +12,7 @@ references:
     docker:
       - image: circleci/node:10.12.0-jessie-browsers
 
-  npm_cache_key: &npm_cache_key
-      v7-dependency-npm-{{ checksum "yarn.lock" }}
+  npm_cache_key: &npm_cache_key v8-dependency-npm-{{ checksum "yarn.lock" }}
 
   restore_node_modules: &restore_node_modules
     restore_cache:
@@ -25,9 +23,9 @@ references:
   restore_repo: &restore_repo
     restore_cache:
       keys:
-        - v7-repo-{{ .Branch }}-{{ .Revision }}
-        - v7-repo-{{ .Branch }}
-        - v7-repo
+        - v8-repo-{{ .Branch }}-{{ .Revision }}
+        - v8-repo-{{ .Branch }}
+        - v8-repo
 
 jobs:
   pull_code:
@@ -36,7 +34,7 @@ jobs:
       - *restore_repo
       - checkout
       - save_cache:
-          key: v7-repo-{{ .Branch }}-{{ .Revision }}
+          key: v8-repo-{{ .Branch }}-{{ .Revision }}
           paths:
             - .
   npm_install:

config/mocks/wallet-options-v4.json

@@ -156,11 +156,48 @@
           "coinCode": "XLM",
           "coinTicker": "XLM",
           "colorCode": "xlm",
-          "displayName": "Stellar",
           "config": {
             "network": "public",
             "sendTimeOutSeconds": 10
           },
+          "displayName": "Stellar",
+          "exchangeAddresses": [
+            "GA4BYMUO5D7OLGVJWZ2D5FCWU7SB63FNZ4QUU574SMNA6ELK5TZD3SO3",
+            "GA5XIGA5C7QTPTWXQHY6MCJRMTRZDOSHR6EFIBNDQTCQHG262N4GGKTM",
+            "GABSZVZBYEO5F4V5LZKV7GR4SAJ5IKJGGOF43BIN42FNDUG7QPH6IMRQ",
+            "GAHK7EEG2WWHVKDNT4CEQFZGKF2LGDSW2IVM4S5DP42RBW3K6BTODB4A",
+            "GAW4E6NGM4NPNX2LO2BKDPCCTUX3FJLKWHPU4VQPGBIBQGD6JTVF5C7C",
+            "GAWPTHY6233GRWZZ7JXDMVXDUDCVQVVQ2SXCSTG3R3CNP5LQPDAHNBKL",
+            "GB3RMPTL47E4ULVANHBNCXSXM2ZA5JFY5ISDRERPCXNJUDEO73QFZUNK",
+            "GB6YPGW5JFMMP2QB2USQ33EUWTXVL4ZT5ITUNCY3YKVWOJPP57CANOF3",
+            "GB7GRJ5DTE3AA2TCVHQS2LAD3D7NFG7YLTOEWEBVRNUUI2Q3TJ5UQIFM",
+            "GBKTJSNUSR6OCXA5WDWGT33MNSCNQHOBQUBYC7TVS7BOXDKWFNHI4QNH",
+            "GBOEEVARKVASOQSSXCAHNTGJTVALJE2QM3AQQ2K3VXACQ6JJREQRJZKB",
+            "GBSTRH4QOTWNSVA6E4HFERETX4ZLSR3CIUBLK7AXYII277PFJC4BBYOG",
+            "GBSTRUSD7IRX73RQZBL3RQUH6KS3O4NYFY3QCALDLZD77XMZOPWAVTUK",
+            "GBTBVILDGCOIK26EPEHYCMKM7J5MTQ4FD5DO37GVTTBP45TVGRAROQHP",
+            "GBUQWP3BOUZX34TOND2QV7QQ7K7VJTG6VSE7WMLBTMDJLLAW7YKGU6EP",
+            "GBV4ZDEPNQ2FKSPKGJP2YKDAIZWQ2XKRQD4V4ACH3TCTFY6KPY3OAVS7",
+            "GBVOL67TMUQBGL4TZYNMY3ZQ5WGQYFPFD5VJRWXR72VA33VFNL225PL5",
+            "GBWZHAVWY23QKKDJW7TXLSIHY5EX4NIB37O4NMRKN2SKNWOSE5TEPCY3",
+            "GC4KAS6W2YCGJGLP633A6F6AKTCV4WSLMTMIQRSEQE5QRRVKSX7THV6S",
+            "GCGNWKCJ3KHRLPM3TM6N7D3W5YKDJFL6A2YCXFXNMRTZ4Q66MEMZ6FI2",
+            "GCLDH6L6FBLTD3H3B23D6TIFVVTFBLZMNBC3ZOI6FGI5GPQROL4FOXIN",
+            "GCNSGHUCG5VMGLT5RIYYZSO7VQULQKAJ62QA33DBC5PPBSO57LFWVV6P",
+            "GCO2IP3MJNUOKS4PUDI4C7LGGMQDJGXG3COYX3WSB4HHNAHKYV5YL3VC",
+            "GCVBUIXKKLH2DYHZRSLZUIZSVJUL74RTW6FVCCEYB2OE3RH7RVDBPCFG",
+            "GCXDR4QZ4OTVX6433DPTXELCSEWQ4E5BIPVRRJMUR6M3NT4JCVIDALZO",
+            "GDBCHKTHJUKDGSIQSTBUXFWVP3QVART5LED6KRZQ5X4Z5WLT4BGYXWCI",
+            "GDMXNQBJMS3FYI4PFSYCCB4XODQMNMTKPQ5HIKOUWBOWJ2P3CF6WASBE",
+            "GDRSWSKJCIB6Z65UA7W5RG62A7M5K3A5IHMED6DYHLPLWLVQCOOGDQ7S",
+            "GDU2FEL6THGGOFDHHP4I5FHNWY4S2SXYUBCEDB5ZREMD6UFRT4SYWSW2",
+            "GDZCEWJ5TVXUTFH6V5CVDQDE43KRXYUFRHKI7X64EWMVOVYYZJFWIFQ2",
+            "GDP34WXZRCSHVUDQLGKJKOBMS5LOQPHCIADZU5POEF3IICZ7XNQJ65Y6",
+            "GARAR5QR7WRL24MQMSO4INWV7C5SE4EE2YVXTLD6ORONYFHSUAGZYSLN",
+            "GCWYV4ZICBNDYJ3HE7GHPF3MJPIH63QNCWYPFTC5BQOIODUEI7HJBJVS",
+            "GDQP2KPQGKIHYJGXNUIYOMHARUARCA7DJT5FO2FFOOKY3B2WSQHG4W37",
+            "GBQ6RTEHEHXFPKSWCIM4KSVQXBANLFMVV6FJIZDLTF3ZOGFHTBDZUYDD"
+          ],
           "hasLockboxSupport": true,
           "icons": {
             "default": "xlm-circle-filled",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.12.22",
+  "version": "4.12.24",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {
@@ -113,14 +113,14 @@
     "onetime": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
   },
   "devDependencies": {
-    "@babel/cli": "7.2.3",
-    "@babel/core": "7.2.2",
+    "@babel/cli": "7.4.4",
+    "@babel/core": "7.4.4",
     "@babel/node": "7.2.2",
-    "@babel/polyfill": "7.2.5",
+    "@babel/plugin-proposal-class-properties": "7.4.4",
+    "@babel/plugin-proposal-object-rest-spread": "7.4.4",
+    "@babel/polyfill": "7.4.4",
+    "@babel/preset-env": "7.4.4",
     "@babel/preset-react": "7.0.0",
-    "@babel/plugin-proposal-class-properties": "7.3.0",
-    "@babel/plugin-proposal-object-rest-spread": "7.3.1",
-    "@babel/preset-env": "7.3.1",
     "@storybook/addon-actions": "4.1.9",
     "@storybook/addon-info": "4.1.9",
     "@storybook/addon-links": "4.1.9",
@@ -132,20 +132,20 @@
     "babel-istanbul": "0.12.2",
     "babel-jest": "23.6.0",
     "babel-loader": "8.0.5",
-    "babel-plugin-inline-react-svg": "1.0.1",
-    "babel-plugin-module-resolver": "3.1.3",
+    "babel-plugin-inline-react-svg": "1.1.0",
+    "babel-plugin-module-resolver": "3.2.0",
     "babel-plugin-react-html-attrs": "2.1.0",
     "babel-plugin-react-intl": "3.0.1",
     "babel-plugin-styled-components": "1.10.0",
     "bs58": "4.0.1",
-    "case-sensitive-paths-webpack-plugin": "2.1.2",
+    "case-sensitive-paths-webpack-plugin": "2.2.0",
     "chalk": "2.4.2",
     "clean-webpack-plugin": "1.0.1",
     "copy-webpack-plugin": "4.6.0",
     "commitizen": "3.0.5",
     "coveralls": "3.0.2",
     "cross-env": "5.2.0",
-    "css-loader": "1.0.1",
+    "css-loader": "2.1.1",
     "cz-conventional-changelog": "2.1.0",
     "enzyme": "3.8.0",
     "enzyme-adapter-react-16": "1.7.1",
@@ -182,18 +182,18 @@
     "react-intl-translations-manager": "5.0.3",
     "react-test-renderer": "16.6.3",
     "redux-mock-store": "1.5.3",
-    "redux-saga-test-plan": "3.7.0",
+    "redux-saga-test-plan": "4.0.0-beta.2",
     "release-it": "11.0.0",
     "rimraf": "2.6.3",
     "staged-git-files": "1.1.2",
     "standard": "12.0.1",
     "style-loader": "0.23.1",
-    "thread-loader": "2.1.1",
-    "uglifyjs-webpack-plugin": "2.1.1",
-    "webpack": "4.29.0",
-    "webpack-bundle-analyzer": "3.0.3",
-    "webpack-cli": "3.2.1",
-    "webpack-dev-server": "3.1.14",
+    "thread-loader": "2.1.2",
+    "uglifyjs-webpack-plugin": "2.1.2",
+    "webpack": "4.30.0",
+    "webpack-bundle-analyzer": "3.3.2",
+    "webpack-cli": "3.3.2",
+    "webpack-dev-server": "3.3.1",
     "wsrun": "2.2.1"
   }
 }

packages/blockchain-info-components/src/Colors/DarkMode.js

@@ -24,6 +24,7 @@ export default {
   'gray-4': '#444444',
   'gray-5': '#eeeeee',
   'gray-6': '#797979',
+  'gray-7': '#677185',
   // Whites
   white: '#1c1c1c',
   'white-blue': '#0c0c0c',
@@ -38,6 +39,7 @@ export default {
   'navy-blue': '#1F283C',
   'darkblue-gray': '#2C343C',
   'lightblue-gray': '#B1B8C7',
+  blue: '#0c6cf2',
   // Alphas
   halftransparentgrey: 'rgba(0, 0, 0, 0.5)',
   whiteAlpha75: 'rgba(0,0,0,0.75)',

packages/blockchain-info-components/src/Colors/Default.js

@@ -24,10 +24,11 @@ export default {
   'gray-4': '#757679',
   'gray-5': '#5F5F5F',
   'gray-6': '#383838',
+  'gray-7': '#677185',
   // Whites
   white: '#FFFFFF',
-  'white-blue': '#F5F7F9',
-  silver: '#cecece',
+  'white-blue': '#f0f2f7',
+  silver: '#CECECE',
   porcelain: '#F4F6F7',
   // Blacks
   black: '#000000',
@@ -38,6 +39,7 @@ export default {
   'navy-blue': '#27324B',
   'darkblue-gray': '#222D38',
   'lightblue-gray': '#B1B8C7',
+  blue: '#0c6cf2',
   // Alphas
   halftransparentgrey: 'rgba(0, 0, 0, 0.5)',
   whiteAlpha75: 'rgba(255,255,255,0.75)',