diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js index 20d4d0d236f..39d10e0bead 100644 --- a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/index.js @@ -11,7 +11,7 @@ class NavigationContainer extends React.PureComponent { render () { return ( { - const canBuy = Remote.Success.is(canTrade) - return { menuOpened, settingsOpened, canBuy, pathname } + (menuOpened, settingsOpened, canTradeR, pathname) => { + const canTrade = canTradeR.getOrElse(false) + return { menuOpened, settingsOpened, canTrade, pathname } } ) diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js index cb585d976b9..df555aa1095 100644 --- a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js +++ b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js @@ -63,7 +63,7 @@ const SubMenuItem = styled.li` ` const Navigation = props => { - const { menuOpened, settingsOpened, handleCloseMenu, canBuy, pathname, ...rest } = props + const { menuOpened, settingsOpened, handleCloseMenu, canTrade, pathname, ...rest } = props return ( @@ -102,7 +102,7 @@ const Navigation = props => { - {canBuy && ( + {canTrade && ( @@ -156,7 +156,7 @@ const Navigation = props => { Navigation.propTypes = { menuOpened: PropTypes.bool.isRequired, settingsOpened: PropTypes.bool.isRequired, - canBuy: PropTypes.bool.isRequired, + canTrade: PropTypes.bool.isRequired, pathname: PropTypes.string.isRequired, handleCloseMenu: PropTypes.func.isRequired } diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/FaqContent/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/FaqContent/index.js index 844bb6b9417..61c9c6d15ab 100644 --- a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/FaqContent/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/FaqContent/index.js @@ -11,6 +11,7 @@ const FaqDescription = styled.div` const FaqContent = [ { groupTitleMsg: , + whitelist: ['coinify'], groupQuestions: [{ answerId: '', question: , @@ -86,6 +87,7 @@ const FaqContent = [ }] }, { groupTitleMsg: , + whitelist: ['sfox'], groupQuestions: [{ answerId: '', question: , @@ -147,7 +149,8 @@ const FaqContent = [ }] }, { - groupTitleMsg: , + groupTitleMsg: , + whitelist: ['n/a'], groupQuestions: [{ answerId: '', question: , diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/index.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/index.js index 4d9aeff3860..df6306f705d 100644 --- a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/TrayRight/Faq/index.js @@ -5,13 +5,16 @@ import { any, assoc, contains, curry, filter, map, path, toLower } from 'ramda' import FaqContent from './FaqContent' import { getData } from './selectors' +import { selectors } from 'data' import Faq from './template.js' class FaqContainer extends React.PureComponent { render () { - const { data, handleTrayRightToggle } = this.props + const { data, canTrade, handleTrayRightToggle } = this.props const { search } = data + const partner = canTrade.cata({ Success: (val) => val || 'n/a', Loading: () => false, Failure: () => false, NotAsked: () => false }) + // Search for matching messages in the component subtree starting const containsRecursive = curry((search, x) => { if (path(['props', 'defaultMessage'], x)) { @@ -23,6 +26,10 @@ class FaqContainer extends React.PureComponent { } }) + const whitelistContent = (contentPart) => { + return contentPart.whitelist ? contentPart.whitelist.includes(partner) : true + } + const filterContent = (contentPart) => { if (search) { const filteredGroupQuestions = filter(q => @@ -34,14 +41,18 @@ class FaqContainer extends React.PureComponent { } } + const whitelistedContent = filter(whitelistContent, FaqContent) + const filteredContent = map(filterContent, whitelistedContent) + return ( - + ) } } const mapStateToProps = (state) => ({ - data: getData(state) + data: getData(state), + canTrade: selectors.exchange.getCanTrade(state) }) FaqContainer.contextTypes = {