Merge branch 'development' into feat/sell-p1

config/mocks/wallet-options-v4.json

@@ -11,10 +11,6 @@
           "wallet": {}
         }
       },
-      "ads": {
-        "blacklist": ["LT", "LU", "UK", "US"],
-        "url": "https://games.bitcoin.com/slots?cma=20190619_blockchainwalletS&utm_source=blockchainwallet_S&utm_medium=banner&utm_campaign=20190619_blockchainwalletS"
-      },
       "coins": {
         "EUR": {
           "availability": {},

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

@@ -100,7 +100,7 @@
     "lodash.debounce": "4.0.8",
     "matchmedia-polyfill": "0.3.2",
     "moment": "2.27.0",
-    "postal-codes-js": "2.0.0",
+    "postal-codes-js": "2.5.0",
     "prop-types": "15.7.2",
     "qrcode.react": "0.9.3",
     "qs": "6.7.0",

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/selectors.ts

@@ -16,8 +16,6 @@ export const getData = createDeepEqualSelector(
     selectors.router.getPathname,
     selectors.core.kvStore.lockbox.getDevices,
     selectors.core.settings.getCountryCode,
-    selectors.core.walletOptions.getAdsBlacklist,
-    selectors.core.walletOptions.getAdsUrl,
     selectors.core.walletOptions.getDomains,
     selectors.core.walletOptions.getSupportedCoins
   ],
@@ -28,8 +26,6 @@ export const getData = createDeepEqualSelector(
     pathname,
     lockboxDevicesR,
     countryCodeR,
-    adsBlacklistR,
-    adsUrlR,
     domainsR,
     supportedCoinsR
   ) => {
@@ -65,8 +61,6 @@ export const getData = createDeepEqualSelector(
       )
 
       return {
-        adsBlacklist: adsBlacklistR.getOrElse([]),
-        adsUrl: adsUrlR.getOrElse(''),
         coins,
         countryCode,
         domains,

packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/template.success.tsx

@@ -1,12 +1,12 @@
-import Balances from './Balances'
-import Footer from './Footer'
-import Navigation from './Navigation'
 import PropTypes from 'prop-types'
 import React from 'react'
 import styled from 'styled-components'
 
 import media, { useMedia } from 'services/ResponsiveService'
 
+import Balances from './Balances'
+import Navigation from './Navigation'
+
 import { Props as OwnProps, SuccessStateType } from '.'
 
 export const Container = styled.div<{ toggled?: boolean }>`
@@ -52,7 +52,6 @@ const MenuLeft = (props: Props) => {
       {!isLaptop && <Balances />}
       <Overflow>
         <Navigation {...props} />
-        <Footer {...props} />
       </Overflow>
     </Container>
   )

packages/blockchain-wallet-v4/src/redux/walletOptions/selectors.ts

@@ -35,9 +35,6 @@ export const getAnalyticsSiteId = state =>
   getWebOptions(state).map(path(['application', 'analyticsSiteId']))
 export const getAnnouncements = state =>
   getWebOptions(state).map(path(['application', 'announcements']))
-export const getAdsBlacklist = state =>
-  getWebOptions(state).map(path(['ads', 'blacklist']))
-export const getAdsUrl = state => getWebOptions(state).map(path(['ads', 'url']))
 
 // coins
 export const getSupportedCoins = createDeepEqualSelector(

yarn.lock

@@ -7437,7 +7437,7 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detect-node@^2.0.3, detect-node@^2.0.4:
+detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
@@ -15026,12 +15026,12 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postal-codes-js@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postal-codes-js/-/postal-codes-js-2.0.0.tgz#2f14ea7a334381cedecf05d7c4b9ab0a7dbb24f7"
-  integrity sha1-LxTqejNDgc7ezwXXxLmrCn27JPc=
+postal-codes-js@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/postal-codes-js/-/postal-codes-js-2.5.0.tgz#7dd80e1ea8f4a896e8a2ba01b390bb8b16623e5d"
+  integrity sha512-brdrls0ClvHZiVnY1bUtPvMHJBy1MNhq/YBSHnMcsYHRVi0uIcsRSrR6ngpMOVqjbFhDW/ESA4rswkapZzlgcQ==
   dependencies:
-    detect-node "^2.0.3"
+    detect-node "^2.0.4"
     path "^0.12.7"
 
 postcss-flexbugs-fixes@^4.1.0: