diff --git a/ui/component/claimMenuList/index.js b/ui/component/claimMenuList/index.js index 5f985dd5c..5b7ff2407 100644 --- a/ui/component/claimMenuList/index.js +++ b/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), }; }; diff --git a/ui/component/claimMenuList/view.jsx b/ui/component/claimMenuList/view.jsx index c945f242b..a541a0a39 100644 --- a/ui/component/claimMenuList/view.jsx +++ b/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) { - {hasExperimentalUi && ( + {/* WATCH LATER */} + {isPlayable && !collectionId && ( <> - {/* WATCH LATER */} - {isPlayable && !collectionId && ( - <> - { - doToast({ - message: __('Item %action% Watch Later', { - action: hasClaimInWatchLater ? __('removed from') : __('added to'), - }), - }); - doCollectionEdit(COLLECTIONS_CONSTS.WATCH_LATER_ID, { - claims: [contentClaim], - remove: hasClaimInWatchLater, - type: 'playlist', - }); - }} - > - - - {hasClaimInWatchLater ? __('In Watch Later') : __('Watch Later')} - - - > - )} + { + doToast({ + message: __('Item %action% Watch Later', { + action: hasClaimInWatchLater ? __('removed from') : __('added to'), + }), + }); + doCollectionEdit(COLLECTIONS_CONSTS.WATCH_LATER_ID, { + claims: [contentClaim], + remove: hasClaimInWatchLater, + type: 'playlist', + }); + }} + > + + + {hasClaimInWatchLater ? __('In Watch Later') : __('Watch Later')} + + {/* COLLECTION OPERATIONS */} {collectionId && collectionName && isCollectionClaim && ( <> diff --git a/ui/component/fileActions/index.js b/ui/component/fileActions/index.js index a47576dd6..0e15bb7ea 100644 --- a/ui/component/fileActions/index.js +++ b/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) => ({ diff --git a/ui/component/fileActions/view.jsx b/ui/component/fileActions/view.jsx index afbfc8966..d2f4558fa 100644 --- a/ui/component/fileActions/view.jsx +++ b/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 && } - {hasExperimentalUi && } + ({ unseenCount: selectUnseenNotificationCount(state), user: selectUser(state), homepageData: selectHomepageData(state), - hasExperimentalUi: makeSelectUserPropForProp(USER.EXPERIMENTAL_UI)(state), }); export default connect(select, { diff --git a/ui/component/sideNavigation/view.jsx b/ui/component/sideNavigation/view.jsx index ddff64de2..2397a1e25 100644 --- a/ui/component/sideNavigation/view.jsx +++ b/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}`,