feat(exchange-promo): merge dev and fix conflicts

.eslintrc

@@ -20,11 +20,15 @@
     {
       "files": ["*.{ts,tsx}"],
       "parser": "@typescript-eslint/parser",
+      "parserOptions": {
+        "project": "./tsconfig.json"
+      },
       "plugins": ["typescript-sort-keys"],
       "rules": {
         "typescript-sort-keys/interface": 2,
         "typescript-sort-keys/string-enum": 2,
-        "@typescript-eslint/no-unused-vars": 2
+        "@typescript-eslint/no-unused-vars": 2,
+        "@typescript-eslint/switch-exhaustiveness-check": 2
       }
     }
   ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.32.4",
+  "version": "4.32.5",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {
@@ -126,8 +126,8 @@
     "@types/redux": "3.6.0",
     "@types/redux-form": "7.4.2",
     "@types/styled-components": "4.0.3",
-    "@typescript-eslint/eslint-plugin": "2.13.0",
-    "@typescript-eslint/parser": "2.13.0",
+    "@typescript-eslint/eslint-plugin": "2.28.0",
+    "@typescript-eslint/parser": "2.28.0",
     "babel-eslint": "10.1.0",
     "babel-jest": "25.3.0",
     "babel-loader": "8.1.0",

packages/blockchain-info-components/index.d.ts

@@ -3,6 +3,7 @@ import { DefaultTheme } from 'styled-components'
 import { IcoMoonType } from './src/Icons/Icomoon'
 import { ImageType } from './src/Images/Images'
 
+export const Badge: StatelessComponent<any>
 export const Banner: StatelessComponent<any>
 export const BlockchainLoader: StatelessComponent<{
   width?: string
@@ -69,6 +70,10 @@ export const ComponentDropdown: React.ComponentClass<{
   callback?: () => void
 }>
 
+export function Color(
+  color: keyof DefaultTheme
+): DefaultTheme[keyof DefaultTheme]
+
 export const FontGlobalStyles: StatelessComponent<{}>
 export const HeartbeatLoader: StatelessComponent<{
   width?: string

packages/blockchain-wallet-v4-frontend/package.json

@@ -94,7 +94,6 @@
       "src"
     ],
     "moduleNameMapper": {
-      "services/(.*)": "<rootDir>/src/services/$1",
       "\\.(pdf|jpg|jpeg|png|gif|eot|otf|svg|ttf|woff|woff2)$": "<rootDir>/src/__mocks__/fileMock.js",
       "\\.(css|scss)$": "<rootDir>/../../node_modules/identity-obj-proxy"
     }

packages/blockchain-wallet-v4-frontend/src/components/Balances/wallet/selectors.ts

@@ -1,7 +1,7 @@
-import * as Currency from 'blockchain-wallet-v4/src/exchange/currency'
 import { add, lift, pathOr, prop, reduce } from 'ramda'
 import { createDeepEqualSelector } from 'services/ReselectHelper'
 import { Exchange, Remote } from 'blockchain-wallet-v4/src'
+import { formatFiat } from 'core/exchange/currency'
 import { RemoteDataType, SBBalancesType } from 'core/types'
 import { selectors } from 'data'
 import BigNumber from 'bignumber.js'
@@ -242,7 +242,7 @@ export const getTotalBalance = createDeepEqualSelector(
       xlmBalance,
       currency
     ) => {
-      const total = Currency.formatFiat(
+      const total = formatFiat(
         Number(btcBalance) +
           Number(ethBalance) +
           Number(bchBalance) +

packages/blockchain-wallet-v4-frontend/src/components/DropdownLanguage/index.js

@@ -24,7 +24,7 @@ class DropdownLanguageContainer extends React.PureComponent {
 
     return (
       <SimpleDropdown
-        color='white'
+        color='whiteFade900'
         uppercase={false}
         items={languageList}
         selectedValue={currentLanguage}

packages/blockchain-wallet-v4-frontend/src/components/Form/FormGroup/index.js

@@ -6,7 +6,7 @@ const Wrapper = styled.div`
   display: flex;
   position: relative;
   flex-direction: ${props => (props.inline ? 'row' : 'column')};
-  margin-bottom: ${props => (props.margin ? props.margin : '10px')};
+  margin-bottom: ${props => (props.margin ? props.margin : '16px')};
   > div {
     margin-right: ${props => (props.inline ? '15px' : '0px')};
     &:last-child {

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBchAddresses/selectors.ts

@@ -1,4 +1,4 @@
-import { ADDRESS_TYPES } from 'blockchain-wallet-v4/src/redux/payment/btc/utils'
+import { ADDRESS_TYPES } from 'core/redux/payment/btc/utils'
 import {
   assoc,
   assocPath,

packages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBtcAddresses/index.tsx

@@ -5,18 +5,6 @@ import { SkeletonRectangle } from 'blockchain-info-components'
 import React from 'react'
 import SelectBoxBtc from './template'
 
-type LinkStatePropsType = {
-  data: RemoteDataType<
-    string,
-    {
-      data: Array<AccountTypes>
-    }
-  >
-  supportedCoins: SupportedCoinsType
-}
-
-type Props = LinkStatePropsType
-
 class SelectBoxBtcAddresses extends React.PureComponent<Props> {
   render () {
     const { data, ...rest } = this.props
@@ -42,4 +30,17 @@ const mapStateToProps = (state, ownProps) => ({
   data: getData(state, ownProps)
 })
 
-export default connect(mapStateToProps)(SelectBoxBtcAddresses)
+const connector = connect(mapStateToProps)
+
+type LinkStatePropsType = {
+  data: RemoteDataType<
+    string,
+    {
+      data: Array<AccountTypes>
+    }
+  >
+  supportedCoins: SupportedCoinsType
+}
+type Props = LinkStatePropsType
+
+export default connector(SelectBoxBtcAddresses)