From c94d22994fe4816898136299eda2f2b034081b19 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 2 Nov 2020 14:16:31 -0500 Subject: [PATCH] only show bell for users with notifications on --- ui/component/subscribeButton/index.js | 2 ++ ui/component/subscribeButton/view.jsx | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/component/subscribeButton/index.js b/ui/component/subscribeButton/index.js index 2460858eb..b44b8584b 100644 --- a/ui/component/subscribeButton/index.js +++ b/ui/component/subscribeButton/index.js @@ -7,6 +7,7 @@ import { } from 'redux/selectors/subscriptions'; import { makeSelectPermanentUrlForUri } from 'lbry-redux'; import { doToast } from 'redux/actions/notifications'; +import { selectUser } from 'redux/selectors/user'; import SubscribeButton from './view'; const select = (state, props) => ({ @@ -14,6 +15,7 @@ const select = (state, props) => ({ firstRunCompleted: selectFirstRunCompleted(state), permanentUrl: makeSelectPermanentUrlForUri(props.uri)(state), notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state), + user: selectUser(state), }); export default connect(select, { diff --git a/ui/component/subscribeButton/view.jsx b/ui/component/subscribeButton/view.jsx index ebd29f26c..9f5100157 100644 --- a/ui/component/subscribeButton/view.jsx +++ b/ui/component/subscribeButton/view.jsx @@ -21,6 +21,7 @@ type Props = { doToast: ({ message: string }) => void, shrinkOnMobile: boolean, notificationsDisabled: boolean, + user: ?User, }; export default function SubscribeButton(props: Props) { @@ -33,12 +34,14 @@ export default function SubscribeButton(props: Props) { doToast, shrinkOnMobile = false, notificationsDisabled, + user, } = props; const buttonRef = useRef(); const isMobile = useIsMobile(); let isHovering = useHover(buttonRef); isHovering = isMobile ? true : isHovering; + const uiNotificationsEnabled = user && user.experimental_ui; const { channelName } = parseURI(permanentUrl); const claimName = '@' + channelName; @@ -77,7 +80,7 @@ export default function SubscribeButton(props: Props) { } }} /> - {isSubscribed && ( + {isSubscribed && uiNotificationsEnabled && (