lists for all

ui/component/claimMenuList/index.js

@@ -16,8 +16,6 @@ import { doSetActiveChannel, doSetIncognito, doOpenModal } from 'redux/actions/a
 import { doCommentModBlock, doCommentModUnBlock } from 'redux/actions/comments';
 import { makeSelectChannelIsBlocked } from 'redux/selectors/comments';
 import { doToast } from 'redux/actions/notifications';
-import { makeSelectUserPropForProp } from 'redux/selectors/user';
-import * as USER from 'constants/user';
 import { makeSelectSigningIsMine } from 'redux/selectors/content';
 import { doChannelSubscribe, doChannelUnsubscribe } from 'redux/actions/subscriptions';
 import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions';
@@ -38,7 +36,6 @@ const select = (state, props) => {
     claimInCollection: makeSelectCollectionForIdHasClaimUrl(props.collectionId, permanentUri)(state),
     collectionName: makeSelectNameForCollectionId(props.collectionId)(state),
     isMyCollection: makeSelectCollectionIsMine(props.collectionId)(state),
-    hasExperimentalUi: makeSelectUserPropForProp(USER.EXPERIMENTAL_UI)(state),
     editedCollection: makeSelectEditedCollectionForId(props.collectionId)(state),
   };
 };

ui/component/claimMenuList/view.jsx

@@ -41,7 +41,6 @@ type Props = {
   collectionId: string,
   isMyCollection: boolean,
   doToast: ({ message: string }) => void,
-  hasExperimentalUi: boolean,
   claimIsMine: boolean,
   fileInfo: FileListItem,
   prepareEdit: ({}, string, {}) => void,
@@ -72,7 +71,6 @@ function ClaimMenuList(props: Props) {
     collectionName,
     isMyCollection,
     doToast,
-    hasExperimentalUi,
     claimIsMine,
     fileInfo,
     prepareEdit,
@@ -189,33 +187,29 @@ function ClaimMenuList(props: Props) {
         <Icon size={20} icon={ICONS.MORE_VERTICAL} />
       </MenuButton>
       <MenuList className="menu__list">
-        {hasExperimentalUi && (
+        {/* WATCH LATER */}
+        {isPlayable && !collectionId && (
           <>
-            {/* WATCH LATER */}
+            <MenuItem
-            {isPlayable && !collectionId && (
+              className="comment__menu-option"
-              <>
+              onSelect={() => {
-                <MenuItem
+                doToast({
-                  className="comment__menu-option"
+                  message: __('Item %action% Watch Later', {
-                  onSelect={() => {
+                    action: hasClaimInWatchLater ? __('removed from') : __('added to'),
-                    doToast({
+                  }),
-                      message: __('Item %action% Watch Later', {
+                });
-                        action: hasClaimInWatchLater ? __('removed from') : __('added to'),
+                doCollectionEdit(COLLECTIONS_CONSTS.WATCH_LATER_ID, {
-                      }),
+                  claims: [contentClaim],
-                    });
+                  remove: hasClaimInWatchLater,
-                    doCollectionEdit(COLLECTIONS_CONSTS.WATCH_LATER_ID, {
+                  type: 'playlist',
-                      claims: [contentClaim],
+                });
-                      remove: hasClaimInWatchLater,
+              }}
-                      type: 'playlist',
+            >
-                    });
+              <div className="menu__link">
-                  }}
+                <Icon aria-hidden icon={hasClaimInWatchLater ? ICONS.DELETE : ICONS.TIME} />
-                >
+                {hasClaimInWatchLater ? __('In Watch Later') : __('Watch Later')}
-                  <div className="menu__link">
+              </div>
-                    <Icon aria-hidden icon={hasClaimInWatchLater ? ICONS.DELETE : ICONS.TIME} />
+            </MenuItem>
-                    {hasClaimInWatchLater ? __('In Watch Later') : __('Watch Later')}
-                  </div>
-                </MenuItem>
-              </>
-            )}
             {/* COLLECTION OPERATIONS */}
             {collectionId && collectionName && isCollectionClaim && (
               <>

ui/component/fileActions/index.js

@@ -9,14 +9,12 @@ import {
   makeSelectTagInClaimOrChannelForUri,
 } from 'lbry-redux';
 import { DISABLE_COMMENTS_TAG } from 'constants/tags';
-import { makeSelectUserPropForProp } from 'redux/selectors/user';
 import { makeSelectCostInfoForUri } from 'lbryinc';
 import { doSetPlayingUri } from 'redux/actions/content';
 import { doToast } from 'redux/actions/notifications';
 import { doOpenModal, doSetActiveChannel, doSetIncognito } from 'redux/actions/app';
 import fs from 'fs';
 import FileActions from './view';
-import * as USER from 'constants/user';
 import { makeSelectFileRenderModeForUri } from 'redux/selectors/content';
 
 const select = (state, props) => ({
@@ -28,7 +26,6 @@ const select = (state, props) => ({
   myChannels: selectMyChannelClaims(state),
   isLivestreamClaim: makeSelectClaimIsStreamPlaceholder(props.uri)(state),
   reactionsDisabled: makeSelectTagInClaimOrChannelForUri(props.uri, DISABLE_COMMENTS_TAG)(state),
-  hasExperimentalUi: makeSelectUserPropForProp(USER.EXPERIMENTAL_UI)(state),
 });
 
 const perform = (dispatch) => ({

ui/component/fileActions/view.jsx

@@ -28,7 +28,6 @@ type Props = {
   clearPlayingUri: () => void,
   isLivestreamClaim: boolean,
   reactionsDisabled: boolean,
-  hasExperimentalUi: boolean,
 };
 
 function FileActions(props: Props) {
@@ -46,7 +45,6 @@ function FileActions(props: Props) {
     doToast,
     isLivestreamClaim,
     reactionsDisabled,
-    hasExperimentalUi,
   } = props;
   const {
     push,
@@ -92,7 +90,7 @@ function FileActions(props: Props) {
     <>
       {ENABLE_FILE_REACTIONS && !reactionsDisabled && <FileReactions uri={uri} />}
       <ClaimSupportButton uri={uri} fileAction />
-      {hasExperimentalUi && <ClaimCollectionAddButton uri={uri} fileAction />}
+      <ClaimCollectionAddButton uri={uri} fileAction />
       <Button
         button="alt"
         className="button--file-action"

ui/component/sideNavigation/index.js

@@ -2,11 +2,10 @@ import { connect } from 'react-redux';
 import { selectSubscriptions } from 'redux/selectors/subscriptions';
 import { selectPurchaseUriSuccess, doClearPurchasedUriSuccess } from 'lbry-redux';
 import { selectFollowedTags } from 'redux/selectors/tags';
-import { selectUserVerifiedEmail, selectUser, makeSelectUserPropForProp } from 'redux/selectors/user';
+import { selectUserVerifiedEmail, selectUser } from 'redux/selectors/user';
 import { selectHomepageData, selectLanguage } from 'redux/selectors/settings';
 import { doSignOut } from 'redux/actions/app';
 import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
-import * as USER from 'constants/user';
 
 import SideNavigation from './view';
 
@@ -19,7 +18,6 @@ const select = (state) => ({
   unseenCount: selectUnseenNotificationCount(state),
   user: selectUser(state),
   homepageData: selectHomepageData(state),
-  hasExperimentalUi: makeSelectUserPropForProp(USER.EXPERIMENTAL_UI)(state),
 });
 
 export default connect(select, {

ui/component/sideNavigation/view.jsx

@@ -46,7 +46,6 @@ type Props = {
   doClearPurchasedUriSuccess: () => void,
   user: ?User,
   homepageData: any,
-  hasExperimentalUi: boolean,
 };
 
 type SideNavLink = {
@@ -74,7 +73,6 @@ function SideNavigation(props: Props) {
     homepageData,
     user,
     followedTags,
-    hasExperimentalUi,
   } = props;
 
   const { EXTRA_SIDEBAR_LINKS } = homepageData;
@@ -221,7 +219,7 @@ function SideNavigation(props: Props) {
 
   SIDE_LINKS.push(HOME);
   SIDE_LINKS.push(RECENT_FROM_FOLLOWING);
-  if (!SIMPLE_SITE && hasExperimentalUi) {
+  if (!SIMPLE_SITE) {
     FULL_LINKS.push({
       title: 'Lists',
       link: `/$/${PAGES.LISTS}`,
@@ -231,7 +229,7 @@ function SideNavigation(props: Props) {
   }
   if (!SIMPLE_SITE) {
     SIDE_LINKS.push(...FULL_LINKS);
-  } else if (SIMPLE_SITE && hasExperimentalUi) {
+  } else if (SIMPLE_SITE) {
     SIDE_LINKS.push({
       title: 'Lists',
       link: `/$/${PAGES.LISTS}`,