From bb0436d0ee0a60117864bae907865ee09bf52046 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 00:22:13 -0400
Subject: [PATCH 01/16] fix: empty recent tx list styling

---
 src/ui/component/transactionList/view.jsx | 2 +-
 src/ui/scss/component/_main.scss          | 4 ++--
 src/ui/scss/component/_table.scss         | 4 ++++
 static/locales/en.json                    | 4 +---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ui/component/transactionList/view.jsx b/src/ui/component/transactionList/view.jsx
index ca3ba5172..06ce95e38 100644
--- a/src/ui/component/transactionList/view.jsx
+++ b/src/ui/component/transactionList/view.jsx
@@ -121,7 +121,7 @@ class TransactionList extends React.PureComponent<Props> {
         )}
 
         {!loading && !transactionList.length && (
-          <p className="main--empty empty">{emptyMessage || __('No transactions.')}</p>
+          <h2 className="main--empty empty">{emptyMessage || __('No transactions.')}</h2>
         )}
 
         {!!transactionList.length && (
diff --git a/src/ui/scss/component/_main.scss b/src/ui/scss/component/_main.scss
index f996e5a0e..d0f1e476d 100644
--- a/src/ui/scss/component/_main.scss
+++ b/src/ui/scss/component/_main.scss
@@ -78,8 +78,8 @@
   align-items: center;
   display: flex;
   flex-direction: column;
-  padding-top: 100px;
-  padding-bottom: 100px;
+  margin-top: 100px;
+  margin-bottom: 100px;
   text-align: center;
 }
 
diff --git a/src/ui/scss/component/_table.scss b/src/ui/scss/component/_table.scss
index df0dbab62..6e251accf 100644
--- a/src/ui/scss/component/_table.scss
+++ b/src/ui/scss/component/_table.scss
@@ -18,6 +18,10 @@ table,
   }
 }
 
+.table--empty {
+  // padding: var(--spacing-large);
+}
+
 td {
   overflow: hidden;
 }
diff --git a/static/locales/en.json b/static/locales/en.json
index 1e077b038..8cbfde76f 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -473,8 +473,6 @@
   "Editing": "Editing",
   "Edit Your Channel": "Edit Your Channel",
   "Editing Your Channel": "Editing Your Channel",
-  "We can explain... We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use it.": "We can explain... We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use it.",
-  "We can explain... \n\n We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use it.": "We can explain... \n\n We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use it.",
   "We can explain...": "We can explain...",
   "We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use": "We know this page won't win any design awards, we have a cool idea for channel edits in the future. We just wanted to release a very very very basic version that just barely kinda works so people can use",
   "We know this page won't win any design awards, we just wanted to release a very very very basic version that just barely kinda works so people can use": "We know this page won't win any design awards, we just wanted to release a very very very basic version that just barely kinda works so people can use",
@@ -484,4 +482,4 @@
   "Filter": "Filter",
   "Rendering document.": "Rendering document.",
   "Sorry, looks like we can't load the document.": "Sorry, looks like we can't load the document."
-}
\ No newline at end of file
+}

From ce85c972b660c3a9197842bd84bad23e490659de Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 00:29:39 -0400
Subject: [PATCH 02/16] add missing icons

---
 src/ui/component/claimPreview/view.jsx  |  2 +-
 src/ui/component/common/icon-custom.jsx | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/ui/component/claimPreview/view.jsx b/src/ui/component/claimPreview/view.jsx
index 839d79f27..851d914c2 100644
--- a/src/ui/component/claimPreview/view.jsx
+++ b/src/ui/component/claimPreview/view.jsx
@@ -59,7 +59,7 @@ function ClaimPreview(props: Props) {
   let shouldHide = abandoned || (!claimIsMine && obscureNsfw && nsfw);
 
   // This will be replaced once blocking is done at the wallet server level
-  if (claim && !shouldHide) {
+  if (claim && !shouldHide && blackListedOutpoints) {
     for (let i = 0; i < blackListedOutpoints.length; i += 1) {
       const outpoint = blackListedOutpoints[i];
       if (outpoint.txid === claim.txid && outpoint.nout === claim.nout) {
diff --git a/src/ui/component/common/icon-custom.jsx b/src/ui/component/common/icon-custom.jsx
index 19a42c81e..059f51491 100644
--- a/src/ui/component/common/icon-custom.jsx
+++ b/src/ui/component/common/icon-custom.jsx
@@ -240,4 +240,17 @@ export const icons = {
       <path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z" />
     </g>
   ),
+  [ICONS.ALERT]: buildIcon(
+    <g>
+      <circle cx="12" cy="12" r="10" />
+      <line x1="12" y1="8" x2="12" y2="12" />
+      <line x1="12" y1="16" x2="12" y2="16" />
+    </g>
+  ),
+  [ICONS.UNLOCK]: buildIcon(
+    <g>
+      <rect x="3" y="11" width="18" height="11" rx="2" ry="2" />
+      <path d="M7 11V7a5 5 0 0 1 9.9-1" />
+    </g>
+  ),
 };

From 21a2e4c55098bb6b4abaa45c1934ab35d1765459 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 00:31:02 -0400
Subject: [PATCH 03/16] fix typo

---
 src/ui/component/tag/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/component/tag/view.jsx b/src/ui/component/tag/view.jsx
index 77845330a..f16d52f9b 100644
--- a/src/ui/component/tag/view.jsx
+++ b/src/ui/component/tag/view.jsx
@@ -19,7 +19,7 @@ export default function Tag(props: Props) {
   if (!onClick) {
     title = __('View tag');
   } else {
-    type === 'add' ? __('Add tag') : __('Remove tag');
+    title = type === 'add' ? __('Add tag') : __('Remove tag');
   }
 
   return (

From 9ca18433ffad66fe1d813eb704e99854a6c6c6e5 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 00:39:17 -0400
Subject: [PATCH 04/16] consistent language with follow/unfollow

---
 src/ui/component/subscribeButton/view.jsx | 21 +++------------------
 src/ui/page/tags/view.jsx                 | 17 +++++++++--------
 src/ui/util/use-hover.js                  | 23 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 src/ui/util/use-hover.js

diff --git a/src/ui/component/subscribeButton/view.jsx b/src/ui/component/subscribeButton/view.jsx
index e9c0b266d..cdaea453a 100644
--- a/src/ui/component/subscribeButton/view.jsx
+++ b/src/ui/component/subscribeButton/view.jsx
@@ -1,9 +1,10 @@
 // @flow
 import * as MODALS from 'constants/modal_types';
 import * as ICONS from 'constants/icons';
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useRef } from 'react';
 import { parseURI } from 'lbry-redux';
 import Button from 'component/button';
+import useHover from 'util/use-hover';
 
 type SubscribtionArgs = {
   channelName: string,
@@ -33,28 +34,12 @@ export default function SubscribeButton(props: Props) {
     doToast,
   } = props;
   const buttonRef = useRef();
-  const [isHovering, setIsHovering] = useState(false);
+  const isHovering = useHover(buttonRef);
   const { claimName } = parseURI(uri);
   const subscriptionHandler = isSubscribed ? doChannelUnsubscribe : doChannelSubscribe;
   const subscriptionLabel = isSubscribed ? __('Following') : __('Follow');
   const unfollowOverride = isSubscribed && isHovering && __('Unfollow');
 
-  useEffect(() => {
-    function handleHover() {
-      setIsHovering(!isHovering);
-    }
-
-    const button = buttonRef.current;
-    if (button) {
-      button.addEventListener('mouseover', handleHover);
-      button.addEventListener('mouseleave', handleHover);
-      return () => {
-        button.removeEventListener('mouseover', handleHover);
-        button.removeEventListener('mouseleave', handleHover);
-      };
-    }
-  }, [buttonRef, isHovering]);
-
   return (
     <Button
       ref={buttonRef}
diff --git a/src/ui/page/tags/view.jsx b/src/ui/page/tags/view.jsx
index ee912a72c..cbf9e8ea0 100644
--- a/src/ui/page/tags/view.jsx
+++ b/src/ui/page/tags/view.jsx
@@ -1,8 +1,9 @@
 // @flow
-import React from 'react';
+import React, { createRef } from 'react';
 import Page from 'component/page';
 import ClaimListDiscover from 'component/claimListDiscover';
 import Button from 'component/button';
+import useHover from 'util/use-hover';
 
 type Props = {
   location: { search: string },
@@ -16,6 +17,8 @@ function TagsPage(props: Props) {
     followedTags,
     doToggleTagFollow,
   } = props;
+  const buttonRef = createRef();
+  const isHovering = useHover(buttonRef);
 
   const urlParams = new URLSearchParams(search);
   const tagsQuery = urlParams.get('t') || '';
@@ -25,18 +28,16 @@ function TagsPage(props: Props) {
   const tag = tags[0];
 
   const isFollowing = followedTags.map(({ name }) => name).includes(tag);
+  let label = isFollowing ? __('Following') : __('Follow');
+  if (isHovering && isFollowing) {
+    label = __('Unfollow');
+  }
 
   return (
     <Page>
       <ClaimListDiscover
         tags={tags}
-        meta={
-          <Button
-            button="link"
-            onClick={() => doToggleTagFollow(tag)}
-            label={isFollowing ? __('Following') : __('Follow')}
-          />
-        }
+        meta={<Button ref={buttonRef} button="link" onClick={() => doToggleTagFollow(tag)} label={label} />}
       />
     </Page>
   );
diff --git a/src/ui/util/use-hover.js b/src/ui/util/use-hover.js
new file mode 100644
index 000000000..ced655826
--- /dev/null
+++ b/src/ui/util/use-hover.js
@@ -0,0 +1,23 @@
+import { useEffect, useState } from 'react';
+
+export default function useHover(ref) {
+  const [isHovering, setIsHovering] = useState(false);
+
+  useEffect(() => {
+    function handleHover() {
+      setIsHovering(!isHovering);
+    }
+
+    const refElement = ref.current;
+    if (refElement) {
+      refElement.addEventListener('mouseover', handleHover);
+      refElement.addEventListener('mouseleave', handleHover);
+      return () => {
+        refElement.removeEventListener('mouseover', handleHover);
+        refElement.removeEventListener('mouseleave', handleHover);
+      };
+    }
+  }, [ref, isHovering]);
+
+  return isHovering;
+}

From 63364b664c1f82a9ae34eb30f9ad8a2454158613 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 00:49:21 -0400
Subject: [PATCH 05/16] fix: publish bid help text

---
 src/ui/component/publishForm/view.jsx | 6 ++++--
 src/ui/component/publishName/view.jsx | 4 ++--
 src/ui/redux/selectors/publish.js     | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index dfd7d57c8..c97fd0bc9 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -106,8 +106,10 @@ function PublishForm(props: Props) {
 
     if (channelName) {
       // resolve without the channel name so we know the winning bid for it
-      const uriLessChannel = buildURI({ contentName: name });
-      resolveUri(uriLessChannel);
+      try {
+        const uriLessChannel = buildURI({ contentName: name });
+        resolveUri(uriLessChannel);
+      } catch (e) {}
     }
 
     if (uri) {
diff --git a/src/ui/component/publishName/view.jsx b/src/ui/component/publishName/view.jsx
index ee03f8f0a..af458af21 100644
--- a/src/ui/component/publishName/view.jsx
+++ b/src/ui/component/publishName/view.jsx
@@ -20,7 +20,7 @@ type Props = {
   updatePublishForm: ({}) => void,
 };
 
-function PublishText(props: Props) {
+function PublishName(props: Props) {
   const {
     name,
     channel,
@@ -120,4 +120,4 @@ function PublishText(props: Props) {
   );
 }
 
-export default PublishText;
+export default PublishName;
diff --git a/src/ui/redux/selectors/publish.js b/src/ui/redux/selectors/publish.js
index 6127c33fe..3d9e96f04 100644
--- a/src/ui/redux/selectors/publish.js
+++ b/src/ui/redux/selectors/publish.js
@@ -97,14 +97,14 @@ export const selectTakeOverAmount = createSelector(
     const claimForShortUri = claimsByUri[shortUri];
 
     if (!myClaimForUri && claimForShortUri) {
-      return claimForShortUri.effective_amount;
+      return claimForShortUri.meta.effective_amount;
     } else if (myClaimForUri && claimForShortUri) {
       // https://github.com/lbryio/lbry/issues/1476
       // We should check the current effective_amount on my claim to see how much additional lbc
       // is needed to win the claim. Currently this is not possible during a takeover.
       // With this, we could say something like, "You have x lbc in support, if you bid y additional LBC you will control the claim"
       // For now just ignore supports. We will just show the winning claim's bid amount
-      return claimForShortUri.effective_amount || claimForShortUri.amount;
+      return claimForShortUri.meta.effective_amount || claimForShortUri.amount;
     }
 
     return null;

From fd181ebde28589f1d43d7734c40a86102dfc6d20 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 11:07:31 -0400
Subject: [PATCH 06/16] more descriptive tag search input label

---
 src/ui/component/tagsSearch/view.jsx | 2 +-
 src/ui/scss/component/_table.scss    | 4 ----
 static/locales/en.json               | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/ui/component/tagsSearch/view.jsx b/src/ui/component/tagsSearch/view.jsx
index ce883ab7b..0fef53f8a 100644
--- a/src/ui/component/tagsSearch/view.jsx
+++ b/src/ui/component/tagsSearch/view.jsx
@@ -69,7 +69,7 @@ export default function TagSelect(props: Props) {
     <div>
       <Form onSubmit={handleSubmit}>
         <FormField
-          label={__('Tags')}
+          label={__('Tag Search')}
           onChange={onChange}
           placeholder={__('Search for more tags')}
           type="text"
diff --git a/src/ui/scss/component/_table.scss b/src/ui/scss/component/_table.scss
index 6e251accf..df0dbab62 100644
--- a/src/ui/scss/component/_table.scss
+++ b/src/ui/scss/component/_table.scss
@@ -18,10 +18,6 @@ table,
   }
 }
 
-.table--empty {
-  // padding: var(--spacing-large);
-}
-
 td {
   overflow: hidden;
 }
diff --git a/static/locales/en.json b/static/locales/en.json
index 8cbfde76f..85b12ae56 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -368,7 +368,6 @@
   "Add to your library": "Add to your library",
   "Web link": "Web link",
   "Facebook": "Facebook",
-  "": "",
   "Twitter": "Twitter",
   "View on Spee.ch": "View on Spee.ch",
   "LBRY App link": "LBRY App link",

From 52bc0e7a1ad174a8c559a506fb20a9436ff69cab Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 17:00:05 -0400
Subject: [PATCH 07/16] mature tags

---
 src/ui/component/claimTags/view.jsx       |  4 ++--
 src/ui/component/common/credit-amount.jsx |  2 +-
 src/ui/component/publishForm/view.jsx     |  1 +
 src/ui/component/tag/view.jsx             |  8 ++++++--
 src/ui/component/tagsSearch/view.jsx      |  7 ++++++-
 src/ui/component/tagsSelect/view.jsx      | 17 +++++++++++++++--
 src/ui/constants/tags.js                  | 14 --------------
 src/ui/page/file/view.jsx                 |  2 +-
 src/ui/reducers.js                        | 15 ++-------------
 src/ui/redux/actions/publish.js           |  2 ++
 src/ui/scss/component/_badge.scss         |  9 +++++++++
 src/ui/scss/component/_tags.scss          | 11 ++++++++++-
 src/ui/store.js                           |  3 +++
 13 files changed, 58 insertions(+), 37 deletions(-)
 delete mode 100644 src/ui/constants/tags.js

diff --git a/src/ui/component/claimTags/view.jsx b/src/ui/component/claimTags/view.jsx
index 8a64e8750..dde5d7382 100644
--- a/src/ui/component/claimTags/view.jsx
+++ b/src/ui/component/claimTags/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import classnames from 'classnames';
-import Button from 'component/button';
+import Tag from 'component/tag';
 
 const SLIM_TAGS = 1;
 const NORMAL_TAGS = 4;
@@ -45,7 +45,7 @@ export default function ClaimTags(props: Props) {
   return (
     <div className={classnames('file-properties', { 'file-properties--large': type === 'large' })}>
       {tagsToDisplay.map(tag => (
-        <Button key={tag} title={tag} navigate={`$/tags?t=${tag}`} className="tag" label={tag} />
+        <Tag key={tag} title={tag} name={tag} />
       ))}
     </div>
   );
diff --git a/src/ui/component/common/credit-amount.jsx b/src/ui/component/common/credit-amount.jsx
index 5af75e353..a8df18839 100644
--- a/src/ui/component/common/credit-amount.jsx
+++ b/src/ui/component/common/credit-amount.jsx
@@ -44,7 +44,7 @@ class CreditAmount extends React.PureComponent<Props> {
 
     let amountText;
     if (showFree && isFree) {
-      amountText = __('FREE');
+      amountText = __('Free');
     } else {
       amountText = formattedAmount;
 
diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index c97fd0bc9..ddca4b98d 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -132,6 +132,7 @@ function PublishForm(props: Props) {
         <div className="card">
           <TagSelect
             title={false}
+            suggestMature
             help={__('The better your tags are, the easier it will be for people to discover your content.')}
             empty={__('No tags added')}
             onSelect={tag => updatePublishForm({ tags: [...tags, tag] })}
diff --git a/src/ui/component/tag/view.jsx b/src/ui/component/tag/view.jsx
index f16d52f9b..b47050e6d 100644
--- a/src/ui/component/tag/view.jsx
+++ b/src/ui/component/tag/view.jsx
@@ -2,6 +2,7 @@
 import * as ICONS from 'constants/icons';
 import React from 'react';
 import classnames from 'classnames';
+import { MATURE_TAGS } from 'lbry-redux';
 import Button from 'component/button';
 
 type Props = {
@@ -13,8 +14,9 @@ type Props = {
 
 export default function Tag(props: Props) {
   const { name, onClick, type = 'link', disabled = false } = props;
-
+  const isMature = MATURE_TAGS.includes(name);
   const clickProps = onClick ? { onClick } : { navigate: `/$/tags?t=${name}` };
+
   let title;
   if (!onClick) {
     title = __('View tag');
@@ -28,8 +30,10 @@ export default function Tag(props: Props) {
       disabled={disabled}
       title={title}
       className={classnames('tag', {
-        'tag--add': type === 'add',
         'tag--remove': type === 'remove',
+        // tag--add only adjusts the color, which causes issues with mature tag color clashing
+        'tag--add': !isMature && type === 'add',
+        'tag--mature': isMature,
       })}
       label={name}
       iconSize={12}
diff --git a/src/ui/component/tagsSearch/view.jsx b/src/ui/component/tagsSearch/view.jsx
index 0fef53f8a..10cf3cdb3 100644
--- a/src/ui/component/tagsSearch/view.jsx
+++ b/src/ui/component/tagsSearch/view.jsx
@@ -16,10 +16,11 @@ type Props = {
   doToggleTagFollow: string => void,
   doAddTag: string => void,
   onSelect?: Tag => void,
+  suggestMature?: boolean,
 };
 
 export default function TagSelect(props: Props) {
-  const { unfollowedTags = [], followedTags = [], doToggleTagFollow, doAddTag, onSelect } = props;
+  const { unfollowedTags = [], followedTags = [], doToggleTagFollow, doAddTag, onSelect, suggestMature } = props;
   const [newTag, setNewTag] = useState('');
 
   let tags = unfollowedTags.slice();
@@ -34,6 +35,10 @@ export default function TagSelect(props: Props) {
     .filter(doesTagMatch)
     .slice(0, 5);
 
+  if (!newTag && suggestMature) {
+    suggestedTags.push('mature');
+  }
+
   const suggestedTransitions = useTransition(suggestedTags, tag => tag, unfollowedTagsAnimation);
 
   function onChange(e) {
diff --git a/src/ui/component/tagsSelect/view.jsx b/src/ui/component/tagsSelect/view.jsx
index f74d7ec07..92b780942 100644
--- a/src/ui/component/tagsSelect/view.jsx
+++ b/src/ui/component/tagsSelect/view.jsx
@@ -11,6 +11,7 @@ type Props = {
   showClose: boolean,
   followedTags: Array<Tag>,
   doToggleTagFollow: string => void,
+  suggestMature: boolean,
 
   // Ovverides
   // The default component is for following tags
@@ -29,10 +30,22 @@ const tagsAnimation = {
 };
 
 export default function TagSelect(props: Props) {
-  const { showClose, followedTags, doToggleTagFollow, title, help, empty, tagsChosen, onSelect, onRemove } = props;
+  const {
+    showClose,
+    followedTags,
+    doToggleTagFollow,
+    title,
+    help,
+    empty,
+    tagsChosen,
+    onSelect,
+    onRemove,
+    suggestMature,
+  } = props;
   const [hasClosed, setHasClosed] = usePersistedState('tag-select:has-closed', false);
   const tagsToDisplay = tagsChosen || followedTags;
   const transitions = useTransition(tagsToDisplay, tag => tag.name, tagsAnimation);
+  const hasMatureTag = tagsToDisplay.map(tag => tag.name).includes('mature');
 
   function handleClose() {
     setHasClosed(true);
@@ -73,7 +86,7 @@ export default function TagSelect(props: Props) {
               <div className="empty">{empty || __("You aren't following any tags, try searching for one.")}</div>
             )}
           </ul>
-          <TagsSearch onSelect={onSelect} />
+          <TagsSearch onSelect={onSelect} suggestMature={suggestMature && !hasMatureTag} />
           {help !== false && (
             <p className="help">{help || __("The tags you follow will change what's trending for you.")}</p>
           )}
diff --git a/src/ui/constants/tags.js b/src/ui/constants/tags.js
deleted file mode 100644
index c7f34095a..000000000
--- a/src/ui/constants/tags.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const defaultFollowedTags = [
-  'blockchain',
-  'news',
-  'learning',
-  'technology',
-  'automotive',
-  'economics',
-  'food',
-  'science',
-  'art',
-  'nature',
-];
-
-export const defaultKnownTags = ['beliefs', 'funny', 'gaming', 'pop culture', 'music', 'sports', 'weapons'];
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index e3117f97a..f9c4a52db 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -312,7 +312,7 @@ class FilePage extends React.Component<Props> {
             />
             <div className="file-properties">
               {isRewardContent && <Icon size={20} iconColor="red" icon={icons.FEATURED} />}
-              {nsfw && <div className="badge badge--nsfw">MATURE</div>}
+              {nsfw && <div className="badge badge--mature">{__('Mature')}</div>}
               <FilePrice badge uri={normalizeURI(uri)} />
             </div>
           </div>
diff --git a/src/ui/reducers.js b/src/ui/reducers.js
index f60b713ff..43e83882a 100644
--- a/src/ui/reducers.js
+++ b/src/ui/reducers.js
@@ -6,7 +6,7 @@ import {
   searchReducer,
   walletReducer,
   notificationsReducer,
-  tagsReducerBuilder,
+  tagsReducer,
   commentReducer,
 } from 'lbry-redux';
 import { userReducer, rewardsReducer, costInfoReducer, blacklistReducer, homepageReducer, statsReducer } from 'lbryinc';
@@ -16,17 +16,6 @@ import contentReducer from 'redux/reducers/content';
 import settingsReducer from 'redux/reducers/settings';
 import subscriptionsReducer from 'redux/reducers/subscriptions';
 import publishReducer from 'redux/reducers/publish';
-import { defaultKnownTags, defaultFollowedTags } from 'constants/tags';
-
-function getDefaultKnownTags() {
-  return defaultFollowedTags.concat(defaultKnownTags).reduce(
-    (tagsMap, tag) => ({
-      ...tagsMap,
-      [tag]: { name: tag },
-    }),
-    {}
-  );
-}
 
 export default history =>
   combineReducers({
@@ -47,7 +36,7 @@ export default history =>
     settings: settingsReducer,
     stats: statsReducer,
     subscriptions: subscriptionsReducer,
-    tags: tagsReducerBuilder({ followedTags: defaultFollowedTags, knownTags: getDefaultKnownTags() }),
+    tags: tagsReducer,
     user: userReducer,
     wallet: walletReducer,
   });
diff --git a/src/ui/redux/actions/publish.js b/src/ui/redux/actions/publish.js
index 663d26c7d..b09f2d017 100644
--- a/src/ui/redux/actions/publish.js
+++ b/src/ui/redux/actions/publish.js
@@ -155,6 +155,7 @@ export const doPrepareEdit = (claim: StreamClaim, uri: string, fileInfo: FileLis
     license_url: licenseUrl,
     thumbnail,
     title,
+    tags,
   } = value;
 
   const publishData: UpdatePublishFormData = {
@@ -171,6 +172,7 @@ export const doPrepareEdit = (claim: StreamClaim, uri: string, fileInfo: FileLis
     uploadThumbnailStatus: thumbnail ? THUMBNAIL_STATUSES.MANUAL : undefined,
     licenseUrl,
     nsfw: isClaimNsfw(claim),
+    tags: tags ? tags.map(tag => ({ name: tag })) : [],
   };
 
   if (channelName) {
diff --git a/src/ui/scss/component/_badge.scss b/src/ui/scss/component/_badge.scss
index 4ca0e8ba6..e320d5daf 100644
--- a/src/ui/scss/component/_badge.scss
+++ b/src/ui/scss/component/_badge.scss
@@ -19,3 +19,12 @@
   background-color: $lbry-red-2;
   color: $lbry-white;
 }
+
+.badge--mature {
+  background-color: lighten($lbry-grape-1, 10%);
+  color: $lbry-black;
+
+  svg {
+    stroke: $lbry-black;
+  }
+}
diff --git a/src/ui/scss/component/_tags.scss b/src/ui/scss/component/_tags.scss
index 17db46b35..8dd2c4e89 100644
--- a/src/ui/scss/component/_tags.scss
+++ b/src/ui/scss/component/_tags.scss
@@ -34,6 +34,7 @@ $main: $lbry-teal-5;
 }
 
 .tag {
+  @extend .badge;
   @extend .badge--tag;
   user-select: none;
   cursor: pointer;
@@ -61,12 +62,20 @@ $main: $lbry-teal-5;
 }
 
 .tag--remove {
-  @extend .tag;
   max-width: 20rem;
 }
 
 .tag--add {
   background-color: lighten($lbry-teal-5, 60%);
+
+  &.tag--mature {
+    @extend .badge--mature;
+  }
+}
+
+.tag--mature {
+  @extend .badge--mature;
+  // Lighten the color a little so it doesn't stand out as much on claim previews
 }
 
 .tag__action-label {
diff --git a/src/ui/store.js b/src/ui/store.js
index 0b48beaa8..7d3b10a51 100644
--- a/src/ui/store.js
+++ b/src/ui/store.js
@@ -74,6 +74,7 @@ const appFilter = createFilter('app', ['hasClickedComment', 'searchOptionsExpand
 // We only need to persist the receiveAddress for the wallet
 const walletFilter = createFilter('wallet', ['receiveAddress']);
 const searchFilter = createFilter('search', ['options']);
+const tagsFilter = createFilter('tags', ['followedTags']);
 const whiteListedReducers = [
   // @if TARGET='app'
   'publish',
@@ -86,6 +87,7 @@ const whiteListedReducers = [
   'search',
   'tags',
 ];
+
 const persistOptions = {
   whitelist: whiteListedReducers,
   // Order is important. Needs to be compressed last or other transforms can't
@@ -98,6 +100,7 @@ const persistOptions = {
     // @endif
     appFilter,
     searchFilter,
+    tagsFilter,
     compressor,
   ],
   debounce: 5000,

From 186f0b34a126edf1b68ef7bedc5d928a96bdff15 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 17:02:28 -0400
Subject: [PATCH 08/16] decrease channel cover height to be closer to youtube

---
 src/ui/scss/init/_vars.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/scss/init/_vars.scss b/src/ui/scss/init/_vars.scss
index 68ed9c726..a5977a5cc 100644
--- a/src/ui/scss/init/_vars.scss
+++ b/src/ui/scss/init/_vars.scss
@@ -73,7 +73,7 @@ $large-breakpoint: 1921px;
   // Image
   --thumbnail-preview-height: 100px;
   --thumbnail-preview-width: 177px;
-  --cover-photo-height: 300px;
+  --cover-photo-height: 160px;
   --channel-thumbnail-width: 10rem;
   --file-list-thumbnail-width: 10rem;
 }

From 4f4d35f838885949dd555d541a4cf5574d439575 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 17:07:09 -0400
Subject: [PATCH 09/16] update lbry-redux

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index ec5256ca4..44244d736 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#c83489e78ed368d368ad25552fce25e7de2d64b5",
+    "lbry-redux": "lbryio/lbry-redux#009ae8b8fac991c306179b66ac76066e92e16322",
     "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index 5d8fa8d07..a71903788 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6646,9 +6646,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#c83489e78ed368d368ad25552fce25e7de2d64b5:
+lbry-redux@lbryio/lbry-redux#009ae8b8fac991c306179b66ac76066e92e16322:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/c83489e78ed368d368ad25552fce25e7de2d64b5"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/009ae8b8fac991c306179b66ac76066e92e16322"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"

From c635f14df0dfed038c5241d0c85304a42483159d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 17:09:58 -0400
Subject: [PATCH 10/16] v0.34.0-rc.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 44244d736..8384700d7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.34.0-rc.4",
+  "version": "0.34.0-rc.5",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"

From d70d964d0c324c6303e5d5b54d93780ecd67a27d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jul 2019 17:21:46 -0400
Subject: [PATCH 11/16] fix: wording on claim search filters

---
 src/ui/component/claimListDiscover/view.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ui/component/claimListDiscover/view.jsx b/src/ui/component/claimListDiscover/view.jsx
index 9a34e40a9..6f9325650 100644
--- a/src/ui/component/claimListDiscover/view.jsx
+++ b/src/ui/component/claimListDiscover/view.jsx
@@ -22,7 +22,7 @@ const TYPE_TRENDING = 'trending';
 const TYPE_TOP = 'top';
 const TYPE_NEW = 'new';
 const SEARCH_FILTER_TYPES = [SEARCH_SORT_YOU, SEARCH_SORT_CHANNELS, SEARCH_SORT_ALL];
-const SEARCH_TYPES = ['trending', 'top', 'new'];
+const SEARCH_TYPES = [TYPE_TRENDING, TYPE_TOP, TYPE_NEW];
 const SEARCH_TIMES = [TIME_DAY, TIME_WEEK, TIME_MONTH, TIME_YEAR, TIME_ALL];
 
 type Props = {
@@ -138,7 +138,9 @@ function ClaimListDiscover(props: Props) {
           {SEARCH_TIMES.map(time => (
             <option key={time} value={time}>
               {/* i18fixme */}
-              {__('This')} {toCapitalCase(time)}
+              {time === TIME_DAY && __('Today')}
+              {time !== TIME_ALL && time !== TIME_DAY && `${__('This')} ${toCapitalCase(time)}`}
+              {time === TIME_ALL && __('All time')}
             </option>
           ))}
         </FormField>

From 1d79aa453798e31a5d6a7de45b86bc5fe127326b Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 3 Jul 2019 00:33:24 -0400
Subject: [PATCH 12/16] remove fs from web build on selectAsset

---
 src/ui/component/selectAsset/view.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ui/component/selectAsset/view.jsx b/src/ui/component/selectAsset/view.jsx
index 9596bd9d3..0e45297a3 100644
--- a/src/ui/component/selectAsset/view.jsx
+++ b/src/ui/component/selectAsset/view.jsx
@@ -4,7 +4,9 @@ import React, { useState } from 'react';
 import { FormField } from 'component/common/form';
 import FileSelector from 'component/common/file-selector';
 import Button from 'component/button';
+// @if TARGET='app'
 import fs from 'fs';
+// @endif
 import path from 'path';
 import uuid from 'uuid/v4';
 
@@ -34,6 +36,7 @@ function SelectAsset(props: Props) {
 
   function doUploadAsset(filePath, thumbnailBuffer) {
     let thumbnail, fileExt, fileName, fileType;
+    // @if TARGET='app'
     if (filePath) {
       thumbnail = fs.readFileSync(filePath);
       fileExt = path.extname(filePath);
@@ -47,6 +50,7 @@ function SelectAsset(props: Props) {
     } else {
       return null;
     }
+    // @endif
 
     const uploadError = (error = '') => {
       console.log('error', error);

From 101f511e85c46c1ad4fe2e6f53ba648bbbb4847b Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 3 Jul 2019 00:43:32 -0400
Subject: [PATCH 13/16] pass mature tags in not_tags param to claim_search

---
 src/ui/component/claimListDiscover/index.js |  3 +++
 src/ui/component/claimListDiscover/view.jsx | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/ui/component/claimListDiscover/index.js b/src/ui/component/claimListDiscover/index.js
index a781cfbb2..c8c1b12ca 100644
--- a/src/ui/component/claimListDiscover/index.js
+++ b/src/ui/component/claimListDiscover/index.js
@@ -1,12 +1,15 @@
+import * as SETTINGS from 'constants/settings';
 import { connect } from 'react-redux';
 import { doClaimSearch, selectLastClaimSearchUris, selectFetchingClaimSearch, doToggleTagFollow } from 'lbry-redux';
 import { selectSubscriptions } from 'redux/selectors/subscriptions';
+import { makeSelectClientSetting } from 'redux/selectors/settings';
 import ClaimListDiscover from './view';
 
 const select = state => ({
   uris: selectLastClaimSearchUris(state),
   loading: selectFetchingClaimSearch(state),
   subscribedChannels: selectSubscriptions(state),
+  showNsfw: makeSelectClientSetting(SETTINGS.SHOW_NSFW)(state),
 });
 
 const perform = {
diff --git a/src/ui/component/claimListDiscover/view.jsx b/src/ui/component/claimListDiscover/view.jsx
index 6f9325650..f911e9e3c 100644
--- a/src/ui/component/claimListDiscover/view.jsx
+++ b/src/ui/component/claimListDiscover/view.jsx
@@ -3,6 +3,7 @@ import type { Node } from 'react';
 import React, { useEffect, useState } from 'react';
 import moment from 'moment';
 import usePersistedState from 'util/use-persisted-state';
+import { MATURE_TAGS } from 'lbry-redux';
 import { FormField } from 'component/common/form';
 import ClaimList from 'component/claimList';
 import Tag from 'component/tag';
@@ -35,10 +36,11 @@ type Props = {
   personal: boolean,
   doToggleTagFollow: string => void,
   meta?: Node,
+  showNsfw: boolean,
 };
 
 function ClaimListDiscover(props: Props) {
-  const { doClaimSearch, uris, tags, loading, personal, injectedItem, meta, subscribedChannels } = props;
+  const { doClaimSearch, uris, tags, loading, personal, injectedItem, meta, subscribedChannels, showNsfw } = props;
   const [personalSort, setPersonalSort] = usePersistedState('claim-list-discover:personalSort', SEARCH_SORT_YOU);
   const [typeSort, setTypeSort] = usePersistedState('claim-list-discover:typeSort', TYPE_TRENDING);
   const [timeSort, setTimeSort] = usePersistedState('claim-list-discover:timeSort', TIME_WEEK);
@@ -54,6 +56,7 @@ function ClaimListDiscover(props: Props) {
       order_by?: Array<string>,
       channel_ids?: Array<string>,
       release_time?: string,
+      not_tags?: Array<string>,
     } = { page_size: PAGE_SIZE, page };
     const newTags = tagsString.split(',');
     const newChannelIds = channelsIdString.split(',');
@@ -64,6 +67,10 @@ function ClaimListDiscover(props: Props) {
       options.channel_ids = newChannelIds;
     }
 
+    if (!showNsfw) {
+      options.not_tags = MATURE_TAGS;
+    }
+
     if (typeSort === TYPE_TRENDING) {
       options.order_by = ['trending_global', 'trending_mixed'];
     } else if (typeSort === TYPE_NEW) {
@@ -81,7 +88,7 @@ function ClaimListDiscover(props: Props) {
     }
 
     doClaimSearch(20, options);
-  }, [personal, personalSort, typeSort, timeSort, doClaimSearch, page, tagsString, channelsIdString]);
+  }, [personal, personalSort, typeSort, timeSort, doClaimSearch, page, tagsString, channelsIdString, showNsfw]);
 
   function getLabel(type) {
     if (type === SEARCH_SORT_ALL) {

From 8aef97f8cd31b9b6ca82ef76c872715dfda17c21 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Wed, 3 Jul 2019 10:49:28 -0400
Subject: [PATCH 14/16] better handle uris on publish page

---
 package.json                          | 2 +-
 src/ui/component/publishForm/view.jsx | 5 +++--
 src/ui/component/publishName/view.jsx | 2 +-
 src/ui/component/selectAsset/view.jsx | 7 +++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8384700d7..485c46ec6 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#009ae8b8fac991c306179b66ac76066e92e16322",
+    "lbry-redux": "lbryio/lbry-redux#cf4bf4c4896d300827c7e07cdf17ca669394fcc4",
     "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/src/ui/component/publishForm/view.jsx b/src/ui/component/publishForm/view.jsx
index ddca4b98d..c8d5e1c50 100644
--- a/src/ui/component/publishForm/view.jsx
+++ b/src/ui/component/publishForm/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import React, { useEffect, Fragment } from 'react';
 import { CHANNEL_NEW, CHANNEL_ANONYMOUS } from 'constants/claim';
-import { buildURI, THUMBNAIL_STATUSES } from 'lbry-redux';
+import { buildURI, isURIValid, THUMBNAIL_STATUSES } from 'lbry-redux';
 import Button from 'component/button';
 import ChannelSection from 'component/selectChannel';
 import classnames from 'classnames';
@@ -112,7 +112,8 @@ function PublishForm(props: Props) {
       } catch (e) {}
     }
 
-    if (uri) {
+    const isValid = isURIValid(uri);
+    if (uri && isValid) {
       resolveUri(uri);
       updatePublishForm({ uri });
     }
diff --git a/src/ui/component/publishName/view.jsx b/src/ui/component/publishName/view.jsx
index af458af21..b5862dea7 100644
--- a/src/ui/component/publishName/view.jsx
+++ b/src/ui/component/publishName/view.jsx
@@ -49,7 +49,7 @@ function PublishName(props: Props) {
     if (!name) {
       nameError = __('A name is required');
     } else if (!isNameValid(name, false)) {
-      nameError = __('LBRY names cannot contain that symbol ($, #, @)');
+      nameError = __('LBRY names cannot contain spaces or reserved symbols ($#@;/"<>%{}|^~[]`)');
     }
 
     setNameError(nameError);
diff --git a/src/ui/component/selectAsset/view.jsx b/src/ui/component/selectAsset/view.jsx
index 0e45297a3..3662b3ef5 100644
--- a/src/ui/component/selectAsset/view.jsx
+++ b/src/ui/component/selectAsset/view.jsx
@@ -36,7 +36,11 @@ function SelectAsset(props: Props) {
 
   function doUploadAsset(filePath, thumbnailBuffer) {
     let thumbnail, fileExt, fileName, fileType;
-    // @if TARGET='app'
+    if (IS_WEB) {
+      console.error('no upload support for web');
+      return;
+    }
+
     if (filePath) {
       thumbnail = fs.readFileSync(filePath);
       fileExt = path.extname(filePath);
@@ -50,7 +54,6 @@ function SelectAsset(props: Props) {
     } else {
       return null;
     }
-    // @endif
 
     const uploadError = (error = '') => {
       console.log('error', error);

From 137b63e1dadeb681db7a91fa5774affc0c51ea7c Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 5 Jul 2019 13:58:23 -0400
Subject: [PATCH 15/16] update lbry-redux

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 485c46ec6..d3cbd8313 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "jsmediatags": "^3.8.1",
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
-    "lbry-redux": "lbryio/lbry-redux#cf4bf4c4896d300827c7e07cdf17ca669394fcc4",
+    "lbry-redux": "lbryio/lbry-redux#c83489e78ed368d368ad25552fce25e7de2d64b5",
     "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index a71903788..5d8fa8d07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6646,9 +6646,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
     yargs "^13.2.2"
     zstd-codec "^0.1.1"
 
-lbry-redux@lbryio/lbry-redux#009ae8b8fac991c306179b66ac76066e92e16322:
+lbry-redux@lbryio/lbry-redux#c83489e78ed368d368ad25552fce25e7de2d64b5:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/009ae8b8fac991c306179b66ac76066e92e16322"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/c83489e78ed368d368ad25552fce25e7de2d64b5"
   dependencies:
     proxy-polyfill "0.1.6"
     reselect "^3.0.0"

From 22281c76e4fba7e992a8ea55772da16af762e1e4 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Fri, 5 Jul 2019 14:01:19 -0400
Subject: [PATCH 16/16] update blocklist handling

---
 src/ui/component/claimPreview/view.jsx | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/ui/component/claimPreview/view.jsx b/src/ui/component/claimPreview/view.jsx
index 851d914c2..5450fc776 100644
--- a/src/ui/component/claimPreview/view.jsx
+++ b/src/ui/component/claimPreview/view.jsx
@@ -56,17 +56,14 @@ function ClaimPreview(props: Props) {
   const abandoned = !isResolvingUri && !claim && !placeholder;
   const { isChannel } = parseURI(uri);
   const claimsInChannel = (claim && claim.meta.claims_in_channel) || 0;
-  let shouldHide = abandoned || (!claimIsMine && obscureNsfw && nsfw);
-
-  // This will be replaced once blocking is done at the wallet server level
-  if (claim && !shouldHide && blackListedOutpoints) {
-    for (let i = 0; i < blackListedOutpoints.length; i += 1) {
-      const outpoint = blackListedOutpoints[i];
-      if (outpoint.txid === claim.txid && outpoint.nout === claim.nout) {
-        shouldHide = true;
-      }
-    }
-  }
+  const shouldHide =
+    abandoned ||
+    (!claimIsMine && obscureNsfw && nsfw) ||
+    (claim &&
+      blackListedOutpoints &&
+      blackListedOutpoints.reduce((hide, outpoint) => {
+        return hide || (outpoint.txid === claim.txid && outpoint.nout === claim.nout);
+      }));
 
   function handleContextMenu(e) {
     e.preventDefault();