per channel notification settings take 2

ui/component/fileThumbnail/view.jsx

@@ -37,7 +37,7 @@ function FileThumbnail(props: Props) {
     );
   }
 
-  const url = passedThumbnail || uri ? thumbnailFromClaim : Placeholder;
+  const url = passedThumbnail || (uri ? thumbnailFromClaim : Placeholder);
 
   return (
     <div

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, {

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 && (
         <Button
           button="alt"
           icon={notificationsDisabled ? ICONS.BELL : ICONS.BELL_ON}

ui/scss/component/_channel.scss

@@ -187,8 +187,11 @@ $metadata-z-index: 1;
 
   > .button,
   > .button-group .button {
-    padding: 0 var(--spacing-xs);
+    padding: 0 var(--spacing-s);
+  }
 
+  > .button,
+  > .button-group {
     &:not(:last-child) {
       margin-right: var(--spacing-m);
     }

yarn.lock

@@ -7411,15 +7411,11 @@ lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-<<<<<<< HEAD
-lbry-redux@lbryio/lbry-redux#04789190b060f27bf0c438a9af449b4a18ef4925:
-  version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/04789190b060f27bf0c438a9af449b4a18ef4925"
-=======
+
 lbry-redux@lbryio/lbry-redux#4d11f319141ba49a26f06053c42c01f00dd4feaf:
   version "0.0.1"
   resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4d11f319141ba49a26f06053c42c01f00dd4feaf"
->>>>>>> per channel notification settings
+
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"