chore(merge): merge dev

.eslintrc

@@ -26,6 +26,7 @@
     "func-names": "off",
     "no-console": ["error", { "allow": ["warn", "error"] }],
     "no-param-reassign": "off",
+    "import/no-extraneous-dependencies": "off",
     "import/prefer-default-export": "off",
     "radix": "off",
     "simple-import-sort/imports": [

.storybook/main.js

@@ -24,6 +24,7 @@ module.exports = {
 
     // Make whatever fine-grained changes you need
     config.resolve.alias = {
+      '@core': path.resolve(__dirname, '..', 'packages/blockchain-wallet-v4/src/'),
       components: path.resolve(__dirname, '..', 'packages/blockchain-wallet-v4-frontend/src/components/'),
       middleware: path.resolve(__dirname, '..', 'packages/blockchain-wallet-v4-frontend/src/middleware/'),
       data: path.resolve(__dirname, '..', 'packages/blockchain-wallet-v4-frontend/src/data/'),

config/mocks/wallet-options-v4.json

@@ -12,18 +12,18 @@
         }
       },
       "coinListing": "",
-      "erc20s": ["AAVE", "PAX", "USDC", "USDT", "WDGLD", "YFI"],
+      "coinRename": "CLOUT",
       "sift": {
         "apiKey": "0ecd212038"
       },
       "featureFlags": {
+        "cEURSweepstake": true,
         "eddInterestFileUpload": true,
         "legacyMagicEmailLink": false,
         "legacyMobilePairing": false,
         "legacyWalletRecovery": false,
         "recurringBuys": true,
-        "signupCountry": true,
-        "ssoDummy": false
+        "signupCountry": true
       }
     }
   },

config/paths.js

@@ -11,5 +11,6 @@ module.exports = {
   envConfig: resolveRoot('config/env'),
   src: resolveRoot('packages/blockchain-wallet-v4-frontend/src'),
   sslConfig: resolveRoot('config/ssl'),
+  tsConfig: resolveRoot('tsconfig.json'),
   wellKnownConfig: resolveRoot('.well-known')
 }

lang/en.json

@@ -353,7 +353,7 @@
     "copy.forms.amount_min": "The minimum amount is {amount}",
     "copy.free": "FREE",
     "copy.from": "From",
-    "copy.from:": "From",
+    "copy.has_new_name": "has a new name",
     "copy.here": "here",
     "copy.holdings": "Holdings",
     "copy.home": "Home",
@@ -373,6 +373,7 @@
     "copy.new_swap": "New Swap",
     "copy.next": "Next",
     "copy.no_payment_methods": "No payment methods available.",
+    "copy.no_results": "No Results",
     "copy.not_enough_eth": "ETH is required to send {coin}. You do not have enough ETH in your Ether Wallet to perform a transaction. Note, ETH must be held in \"My Ether Wallet\" for this transaction, not the Ether Trading Wallet.",
     "copy.not_enough_eth1": "ETH is required to send {coin}. You do not have enough ETH in your Ether Wallet to perform a transaction. Note, ETH must be held in your Ether Wallet for this transaction, not Ether Trading Account.",
     "copy.not_now": "Not Now",
@@ -392,6 +393,7 @@
     "copy.receive_to": "Receive to",
     "copy.refunded": "Refunded",
     "copy.reset": "Reset",
+    "copy.results": "Results",
     "copy.saved": "Saved",
     "copy.select_swap_wallets": "Select the Wallet you want to Swap from and the crypto you want to receive.",
     "copy.sold": "Sold",
@@ -514,6 +516,7 @@
     "layouts.wallet.header.announcements.emailreminder.emailsent": "- An email was sent to {email}",
     "layouts.wallet.header.announcements.emailreminder.resend": "Resend Email",
     "layouts.wallet.header.announcements.newcoin.description": "Wrapped Digital Gold (wDGLD) is an ERC-20 tokenized version of DGLD.",
+    "layouts.wallet.header.announcements.coin_rename.description": "Heads up: {symbol} has renamed to {displaySymbol}. All balances are unaffected.",
     "layouts.wallet.header.general": "General",
     "layouts.wallet.header.preferences": "Preferences",
     "layouts.wallet.header.Sign Out": "Sign Out",
@@ -1536,7 +1539,7 @@
     "scenes.exchange.empty.connected.cartridge": "Connected",
     "scenes.exchange.empty.notconnected.cartridge": "Not Connected",
     "scenes.exchange.empty.walletconnect.body": "Easily connect your Wallet to the Exchange and send crypto back and forth. No need to copy past wallet addresses all while keeping control of your private keys.",
-    "scenes.exchange.empty.walletconnect.header": "Wallet Connect",
+    "scenes.exchange.empty.walletconnect.header": "Exchange Link",
     "scenes.exchange.exchangeform.limit_info.upgrade": "Upgrade",
     "scenes.exchange.exchangeform.refreshlatest": "Refresh status.",
     "scenes.exchange.exchangeform.to": "Receive",

lang/es.json

@@ -354,7 +354,6 @@
     "copy.forms.amount_min": "",
     "copy.free": "GRATIS",
     "copy.from": "Desde",
-    "copy.from:": "Desde",
     "copy.here": "aquí",
     "copy.holdings": "",
     "copy.home": "",

lang/fr.json

@@ -354,7 +354,6 @@
     "copy.forms.amount_min": "",
     "copy.free": "",
     "copy.from": "",
-    "copy.from:": "",
     "copy.here": "",
     "copy.holdings": "",
     "copy.home": "",

lang/pt.json

@@ -354,7 +354,6 @@
     "copy.forms.amount_min": "",
     "copy.free": "GRATUITO",
     "copy.from": "De",
-    "copy.from:": "De",
     "copy.here": "Aqui",
     "copy.holdings": "",
     "copy.home": "",

lang/ru.json

@@ -354,7 +354,6 @@
     "copy.forms.amount_min": "",
     "copy.free": "БЕСПЛАТНО",
     "copy.from": "От",
-    "copy.from:": "От",
     "copy.here": "здесь",
     "copy.holdings": "",
     "copy.home": "",

lang/tr.json

@@ -354,7 +354,6 @@
     "copy.forms.amount_min": "",
     "copy.free": "ÜCRETSİZ",
     "copy.from": "Gönderen",
-    "copy.from:": "Gönderen",
     "copy.here": "burada",
     "copy.holdings": "",
     "copy.home": "",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.56.12",
+  "version": "4.57.4",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {
@@ -30,7 +30,8 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged && node ./scripts/commitHook.js"
+      "pre-commit": "lint-staged && node ./scripts/commitHook.js",
+      "pre-push": "node ./scripts/checkForCircularDeps.js"
     }
   },
   "lint-staged": {
@@ -109,13 +110,13 @@
     "@commitlint/cli": "12.1.4",
     "@commitlint/config-conventional": "12.1.4",
     "@formatjs/cli": "4.2.28",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.1",
     "@react-theming/storybook-addon": "1.1.1",
     "@storybook/addon-actions": "6.3.6",
     "@storybook/addon-essentials": "6.3.6",
     "@storybook/addon-info": "5.3.21",
     "@storybook/addon-links": "6.3.6",
     "@storybook/cli": "6.3.6",
-    "storybook-dark-mode": "1.0.8",
     "@storybook/react": "6.3.6",
     "@storybook/storybook-deployer": "2.8.10",
     "@types/axios": "0.14.0",
@@ -138,13 +139,14 @@
     "babel-plugin-module-resolver": "4.1.0",
     "babel-plugin-react-html-attrs": "3.0.5",
     "bs58": "4.0.1",
+    "cache-loader": "4.1.0",
     "case-sensitive-paths-webpack-plugin": "2.4.0",
     "chalk": "4.1.1",
-    "clean-webpack-plugin": "3.0.0",
-    "copy-webpack-plugin": "6.4.1",
+    "clean-webpack-plugin": "4.0.0",
+    "copy-webpack-plugin": "7.0.0",
     "coveralls": "3.1.1",
     "cross-env": "7.0.3",
-    "css-loader": "3.4.2",
+    "css-loader": "4.3.0",
     "cz-conventional-changelog": "3.3.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
@@ -167,14 +169,14 @@
     "eslint-plugin-sort-keys-fix": "1.1.1",
     "eslint-plugin-typescript-sort-keys": "1.7.0",
     "express": "4.17.1",
-    "favicons-webpack-plugin": "3.0.1",
-    "file-loader": "6.2.0",
-    "fork-ts-checker-webpack-plugin": "6.2.12",
+    "favicons": "6.2.2",
+    "favicons-webpack-plugin": "5.0.2",
+    "fork-ts-checker-webpack-plugin": "6.3.3",
     "futoin-hkdf": "1.4.2",
     "generate-changelog": "1.8.0",
     "hoist-non-react-statics": "3.3.2",
     "html-replace-webpack-plugin": "2.6.0",
-    "html-webpack-plugin": "4.0.3",
+    "html-webpack-plugin": "5.3.2",
     "husky": "3.0.5",
     "identity-obj-proxy": "3.0.0",
     "istanbul": "0.4.5",
@@ -183,35 +185,37 @@
     "jest-css-modules": "2.1.0",
     "jest-fetch-mock": "3.0.3",
     "lint-staged": "10.5.4",
+    "madge": "5.0.1",
     "mock-socket": "9.0.3",
+    "node-polyfill-webpack-plugin": "1.1.4",
     "prettier": "2.3.2",
     "prettier-config-constellation": "0.0.5",
-    "react-hot-loader": "4.13.0",
+    "react-refresh": "0.10.0",
     "redux-mock-store": "1.5.4",
     "redux-saga-test-plan": "4.0.3",
     "release-it": "12.4.1",
     "rimraf": "3.0.2",
     "staged-git-files": "1.2.0",
-    "style-loader": "1.1.3",
+    "storybook-dark-mode": "1.0.8",
+    "style-loader": "2.0.0",
     "stylelint": "13.13.1",
     "stylelint-config-constellation": "0.0.5",
     "stylelint-config-prettier": "8.0.2",
     "stylelint-config-recommended": "4.0.0",
     "stylelint-config-styled-components": "0.1.1",
     "stylelint-prettier": "1.2.0",
     "stylelint-processor-styled-components": "1.10.0",
-    "terser-webpack-plugin": "2.3.5",
+    "terser-webpack-plugin": "5.2.4",
     "themeprovider-storybook": "1.7.2",
-    "thread-loader": "2.1.3",
+    "thread-loader": "3.0.4",
     "ts-jest": "27.0.4",
-    "ts-loader": "7.0.5",
+    "ts-loader": "8.3.0",
     "typecov": "0.2.3",
     "typescript": "3.8.3",
-    "webpack": "4.46.0",
-    "webpack-bundle-analyzer": "3.9.0",
-    "webpack-cli": "3.3.12",
-    "webpack-dev-server": "3.11.2",
+    "webpack": "5.53.0",
+    "webpack-bundle-analyzer": "4.4.2",
+    "webpack-cli": "4.8.0",
+    "webpack-dev-server": "4.2.1",
     "wsrun": "5.2.4"
-  },
-  "dependencies": {}
+  }
 }

packages/blockchain-info-components/src/Fonts/Inter/index.js

@@ -1,67 +1,36 @@
 import { createGlobalStyle } from 'styled-components'
 
-import InterBlackOtf from './fonts/Inter-Black.otf'
-import InterBlackTtf from './fonts/Inter-Black.ttf'
-import InterBlackItalicOtf from './fonts/Inter-BlackItalic.otf'
-import InterBlackItalicTtf from './fonts/Inter-BlackItalic.ttf'
-import InterBoldOtf from './fonts/Inter-Bold.otf'
-import InterBoldTtf from './fonts/Inter-Bold.ttf'
-import InterExtraBoldOtf from './fonts/Inter-ExtraBold.otf'
-import InterExtraBoldTtf from './fonts/Inter-ExtraBold.ttf'
-import InterExtraLightOtf from './fonts/Inter-ExtraLight-BETA.otf'
-import InterExtraLightTtf from './fonts/Inter-ExtraLight-BETA.ttf'
-import InterLightOtf from './fonts/Inter-Light-BETA.otf'
-import InterLightTtf from './fonts/Inter-Light-BETA.ttf'
-import InterMediumOtf from './fonts/Inter-Medium.otf'
-import InterMediumTtf from './fonts/Inter-Medium.ttf'
-import InterRegularOtf from './fonts/Inter-Regular.otf'
-import InterRegularTtf from './fonts/Inter-Regular.ttf'
-import InterSemiBoldOtf from './fonts/Inter-SemiBold.otf'
-import InterSemiBoldTtf from './fonts/Inter-SemiBold.ttf'
-import InterThinOtf from './fonts/Inter-Thin-BETA.otf'
-import InterThinTtf from './fonts/Inter-Thin-BETA.ttf'
+import InterBlackWoff2 from './fonts/Inter-Black.woff2'
+import InterBlackItalicWoff2 from './fonts/Inter-BlackItalic.woff2'
+import InterBoldWoff2 from './fonts/Inter-Bold.woff2'
+import InterExtraBoldWoff2 from './fonts/Inter-ExtraBold.woff2'
+import InterExtraLightWoff2 from './fonts/Inter-ExtraLight.woff2'
+import InterLightWoff2 from './fonts/Inter-Light.woff2'
+import InterMediumWoff2 from './fonts/Inter-Medium.woff2'
+import InterRegularWoff2 from './fonts/Inter-Regular.woff2'
+import InterSemiBoldWoff2 from './fonts/Inter-SemiBold.woff2'
+import InterThinWoff2 from './fonts/Inter-Thin.woff2'
 
-const FontFace = (name, otf, ttf, weight) => `
+const FontFace = (name, woff2, weight) => `
   @font-face {
     font-family: '${name}';
-    src: url('${otf}'),
-      url('${ttf}') format('truetype');
+    src: url('${woff2}') format('woff2');
     font-weight: ${weight};
     font-style: normal;
     font-stretch: normal;
   }
 `
 
-const InterThin = FontFace('Inter', InterThinOtf, InterThinTtf, '100')
-const InterExtraLight = FontFace(
-  'Inter',
-  InterExtraLightOtf,
-  InterExtraLightTtf,
-  '200'
-)
-const InterLight = FontFace('Inter', InterLightOtf, InterLightTtf, '300')
-const InterRegular = FontFace('Inter', InterRegularOtf, InterRegularTtf, '400')
-const InterMedium = FontFace('Inter', InterMediumOtf, InterMediumTtf, '500')
-const InterSemiBold = FontFace(
-  'Inter',
-  InterSemiBoldOtf,
-  InterSemiBoldTtf,
-  '600'
-)
-const InterExtraBold = FontFace(
-  'Inter',
-  InterExtraBoldOtf,
-  InterExtraBoldTtf,
-  '800'
-)
-const InterBold = FontFace('Inter', InterBoldOtf, InterBoldTtf, '700')
-const InterBlack = FontFace('Inter', InterBlackOtf, InterBlackTtf, '900')
-const InterBlackItalic = FontFace(
-  'Inter',
-  InterBlackItalicOtf,
-  InterBlackItalicTtf,
-  '900'
-)
+const InterThin = FontFace('Inter', InterThinWoff2, '100')
+const InterExtraLight = FontFace('Inter', InterExtraLightWoff2, '200')
+const InterLight = FontFace('Inter', InterLightWoff2, '300')
+const InterRegular = FontFace('Inter', InterRegularWoff2, '400')
+const InterMedium = FontFace('Inter', InterMediumWoff2, '500')
+const InterSemiBold = FontFace('Inter', InterSemiBoldWoff2, '600')
+const InterExtraBold = FontFace('Inter', InterExtraBoldWoff2, '800')
+const InterBold = FontFace('Inter', InterBoldWoff2, '700')
+const InterBlack = FontFace('Inter', InterBlackWoff2, '900')
+const InterBlackItalic = FontFace('Inter', InterBlackItalicWoff2, '900')
 
 export const FontGlobalStyles = createGlobalStyle`
   ${InterThin}