feat(lint): fix merge and lint error

.well-known/assetlinks.json

@@ -22,5 +22,17 @@
       "package_name": "piuk.blockchain.android",
       "sha256_cert_fingerprints": ["87:A6:E8:9E:2E:45:84:8C:1D:DC:43:02:1E:95:81:2A:AE:70:B0:B5:4C:6C:32:0C:71:DB:4D:FF:83:F7:B6:A0"]
     }
+  },
+  {
+    "relation": [
+      "delegate_permission/common.handle_all_urls"
+    ],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "com.blockchain.wallet.internal",
+      "sha256_cert_fingerprints": [
+        "43:6A:C2:D1:DC:31:7D:7B:C3:85:EB:6F:24:76:9C:6A:29:6C:8E:5A:22:21:A5:01:3A:C9:36:E8:53:12:BC:EF"
+      ]
+    }
   }
 ]

config/mocks/wallet-options-v4.json

@@ -18,7 +18,9 @@
         "addCheckoutPaymentProvider": false,
         "addStripePaymentProvider": false,
         "cEURRewards": true,
+        "completeYourProfile": true,
         "developerMobilePairing": true,
+        "mergeAndUpgrade": false,
         "eddInterestFileUpload": true,
         "flexiblePricingModel": false,
         "pollForMagicLinkData": true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.61.8",
+  "version": "4.62.0",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {
@@ -16,8 +16,8 @@
     "blockchain",
     "blockchain.info",
     "blockchain.com",
-    "react",
-    "redux",
+    "bitcoin",
+    "ethereum",
     "wallet"
   ],
   "engines": {
@@ -119,15 +119,12 @@
     "@storybook/cli": "6.3.6",
     "@storybook/react": "6.3.6",
     "@storybook/storybook-deployer": "2.8.10",
-    "@types/axios": "0.14.0",
     "@types/hoist-non-react-statics": "3.3.1",
     "@types/jest": "26.0.22",
-    "@types/moment": "2.13.0",
     "@types/node": "14.14.41",
     "@types/ramda": "0.26.39",
     "@types/react": "17.0.3",
     "@types/react-redux": "7.1.16",
-    "@types/redux": "3.6.0",
     "@types/redux-form": "8.2.3",
     "@types/styled-components": "5.1.9",
     "@types/uuid": "8.3.0",
@@ -138,6 +135,7 @@
     "babel-plugin-inline-react-svg": "2.0.1",
     "babel-plugin-module-resolver": "4.1.0",
     "babel-plugin-react-html-attrs": "3.0.5",
+    "base64url": "3.0.1",
     "bs58": "4.0.1",
     "cache-loader": "4.1.0",
     "case-sensitive-paths-webpack-plugin": "2.4.0",

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

@@ -143,6 +143,7 @@ const DarkTheme: DefaultTheme = {
   'logo-quaternary': '#B2D5E5',
   'logo-quinary': '#10ADE4',
   // Exchange
+  exchangeLogin: '#0E121B',
   exchangeNight: '#0A0D10',
   exchangeTurquoise: '#42F1B8',
   // Action

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

@@ -141,6 +141,7 @@ const Default = {
   'logo-quaternary': '#B2D5E5',
   'logo-quinary': '#10ADE4',
   // EXCHANGE
+  exchangeLogin: '#0E121B',
   exchangeNight: '#0A0D10',
   exchangeTurquoise: '#42F1B8',
   // Action

packages/blockchain-info-components/src/Images/Images.ts

@@ -1,3 +1,4 @@
+import accountIcons from './img/account-icons.svg'
 import adBitcoinGames from './img/ad-bitcoin-games.png'
 import adBitcoinGames2 from './img/ad-bitcoin-games@2x.png'
 import airdropEnrolled from './img/airdrop-enrolled.png'
@@ -68,7 +69,10 @@ import emptyTx from './img/empty-tx.svg'
 import ethAirdrop from './img/eth-airdrop.png'
 import ethAirdrop2 from './img/eth-airdrop@2x.png'
 import exchange from './img/exchange.svg'
+import exchangeGrayscale from './img/exchange-grayscale.svg'
 import exchangeLogo from './img/exchange-logo.svg'
+import exchangeNoBackground from './img/exchange-no-background.svg'
+import explorerLogo from './img/explorer-logo.svg'
 import facebookWhite from './img/facebook-white.svg'
 import failedKyc from './img/failed-kyc.png'
 import failedKyc2 from './img/failed-kyc@2x.png'
@@ -163,6 +167,9 @@ import visaLogo from './img/visa-logo.svg'
 import visaNewLogo from './img/visa-new-logo.svg'
 import wallet from './img/wallet.svg'
 import walletBlue from './img/wallet-blue.svg'
+import walletGrayscale from './img/wallet-grayscale.svg'
+import walletLogo from './img/wallet-logo.svg'
+import walletNoBackground from './img/wallet-no-background.svg'
 import walletConnectCircleLogo from './img/walletconnect-logo-circle-blue.svg'
 import warningCircleFilled from './img/warning-circle-filled.png'
 import worldAlert from './img/world-alert.jpg'
@@ -173,6 +180,7 @@ import yubikey from './img/yubikey.svg'
 
 const Images = {
   ...coins,
+  'account-icons': accountIcons,
   'ad-bitcoin-games': adBitcoinGames,
   'ad-bitcoin-games2': adBitcoinGames2,
   'airdrop-enrolled': airdropEnrolled,
@@ -243,7 +251,10 @@ const Images = {
   'eth-airdrop': ethAirdrop,
   'eth-airdrop2': ethAirdrop2,
   exchange,
+  'exchange-grayscale': exchangeGrayscale,
   'exchange-logo': exchangeLogo,
+  'exchange-no-background': exchangeNoBackground,
+  'explorer-logo': explorerLogo,
   'facebook-white': facebookWhite,
   'failed-kyc': failedKyc,
   'failed-kyc2': failedKyc2,
@@ -338,6 +349,9 @@ const Images = {
   'visa-new-logo': visaNewLogo,
   wallet,
   'wallet-blue': walletBlue,
+  'wallet-grayscale': walletGrayscale,
+  'wallet-logo': walletLogo,
+  'wallet-no-background': walletNoBackground,
   'walletconnect-circle-logo': walletConnectCircleLogo,
   'warning-circle-filled': warningCircleFilled,
   'world-alert': worldAlert,