diff --git a/src/ui/component/fileProperties/index.js b/src/ui/component/fileProperties/index.js index 94ec7b703..0d5a0c0dd 100644 --- a/src/ui/component/fileProperties/index.js +++ b/src/ui/component/fileProperties/index.js @@ -1,16 +1,13 @@ import { connect } from 'react-redux'; -import { makeSelectFilePartlyDownloaded, makeSelectClaimIsMine, makeSelectClaimForUri } from 'lbry-redux'; -import { selectRewardContentClaimIds } from 'lbryinc'; +import { makeSelectFilePartlyDownloaded, makeSelectClaimIsMine } from 'lbry-redux'; import { makeSelectIsSubscribed, makeSelectIsNew } from 'redux/selectors/subscriptions'; import FileProperties from './view'; const select = (state, props) => ({ - rewardedContentClaimIds: selectRewardContentClaimIds(state, props), downloaded: makeSelectFilePartlyDownloaded(props.uri)(state), isSubscribed: makeSelectIsSubscribed(props.uri)(state), isNew: makeSelectIsNew(props.uri)(state), claimIsMine: makeSelectClaimIsMine(props.uri)(state), - claim: makeSelectClaimForUri(props.uri)(state), }); export default connect( diff --git a/src/ui/component/fileProperties/view.jsx b/src/ui/component/fileProperties/view.jsx index 80327886d..5368f5f36 100644 --- a/src/ui/component/fileProperties/view.jsx +++ b/src/ui/component/fileProperties/view.jsx @@ -11,20 +11,15 @@ type Props = { claimIsMine: boolean, isSubscribed: boolean, isNew: boolean, - claim: Claim, - rewardedContentClaimIds: Array, }; export default function FileProperties(props: Props) { - const { uri, downloaded, claimIsMine, rewardedContentClaimIds, isSubscribed, claim } = props; - const { claim_id: claimId } = claim; - const isRewardContent = rewardedContentClaimIds.includes(claimId); + const { uri, downloaded, claimIsMine, isSubscribed } = props; return (
{isSubscribed && } {!claimIsMine && downloaded && } - {isRewardContent && }
diff --git a/src/ui/component/rewardSummary/index.js b/src/ui/component/rewardSummary/index.js index cc4f84caa..d58cd8f07 100644 --- a/src/ui/component/rewardSummary/index.js +++ b/src/ui/component/rewardSummary/index.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import { selectUnclaimedRewardValue, selectFetchingRewards, doFetchRewardedContent } from 'lbryinc'; +import { selectUnclaimedRewardValue, selectFetchingRewards } from 'lbryinc'; import RewardSummary from './view'; const select = state => ({ @@ -7,11 +7,7 @@ const select = state => ({ fetching: selectFetchingRewards(state), }); -const perform = dispatch => ({ - fetchRewardedContent: () => dispatch(doFetchRewardedContent()), -}); - export default connect( select, - perform + null )(RewardSummary); diff --git a/src/ui/component/rewardTotal/index.js b/src/ui/component/rewardTotal/index.js index 0a4e0e886..6228a14ed 100644 --- a/src/ui/component/rewardTotal/index.js +++ b/src/ui/component/rewardTotal/index.js @@ -1,11 +1,5 @@ import { connect } from 'react-redux'; -import { - selectUnclaimedRewardValue, - selectFetchingRewards, - doRewardList, - doFetchRewardedContent, - selectClaimedRewards, -} from 'lbryinc'; +import { selectUnclaimedRewardValue, selectFetchingRewards, doRewardList, selectClaimedRewards } from 'lbryinc'; import RewardSummary from './view'; const select = state => ({ @@ -16,7 +10,6 @@ const select = state => ({ const perform = dispatch => ({ fetchRewards: () => dispatch(doRewardList()), - fetchRewardedContent: () => dispatch(doFetchRewardedContent()), }); export default connect( diff --git a/src/ui/page/file/index.js b/src/ui/page/file/index.js index b0f1c6c8e..f494a2598 100644 --- a/src/ui/page/file/index.js +++ b/src/ui/page/file/index.js @@ -1,6 +1,5 @@ import { connect } from 'react-redux'; import * as settings from 'constants/settings'; -import { selectRewardContentClaimIds } from 'redux/selectors/content'; import { doRemoveUnreadSubscription } from 'redux/actions/subscriptions'; import { doSetClientSetting } from 'redux/actions/settings'; import { doSetContentHistoryItem } from 'redux/actions/content'; @@ -32,7 +31,6 @@ const select = (state, props) => ({ metadata: makeSelectMetadataForUri(props.uri)(state), obscureNsfw: !selectShowMatureContent(state), fileInfo: makeSelectFileInfoForUri(props.uri)(state), - rewardedContentClaimIds: selectRewardContentClaimIds(state, props), claimIsMine: makeSelectClaimIsMine(props.uri)(state), isSubscribed: makeSelectIsSubscribed(props.uri)(state), channelUri: makeSelectChannelForClaimUri(props.uri, true)(state), diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx index 3ce4d09da..4e6e123f5 100644 --- a/src/ui/page/file/view.jsx +++ b/src/ui/page/file/view.jsx @@ -7,7 +7,6 @@ import FileViewerInitiator from 'component/fileViewerInitiator'; import FilePrice from 'component/filePrice'; import FileDetails from 'component/fileDetails'; import FileActions from 'component/fileActions'; -import Icon from 'component/common/icon'; import DateTime from 'component/dateTime'; import Button from 'component/button'; import Page from 'component/page'; @@ -27,7 +26,6 @@ type Props = { fileInfo: FileListItem, contentType: string, uri: string, - rewardedContentClaimIds: Array, claimIsMine: boolean, costInfo: ?{ cost: number }, fetchFileInfo: string => void, @@ -101,7 +99,6 @@ class FilePage extends React.Component { claim, contentType, uri, - rewardedContentClaimIds, openModal, claimIsMine, prepareEdit, @@ -117,7 +114,6 @@ class FilePage extends React.Component { // File info const { signing_channel: signingChannel } = claim; const channelName = signingChannel && signingChannel.name; - const isRewardContent = (rewardedContentClaimIds || []).includes(claim.claim_id); const webShareable = costInfo && costInfo.cost === 0 && contentType && ['video', 'image', 'audio'].includes(contentType.split('/')[0]); // We want to use the short form uri for editing @@ -239,7 +235,6 @@ class FilePage extends React.Component {
- {isRewardContent && } {nsfw &&
{__('Mature')}
}
diff --git a/src/ui/redux/selectors/content.js b/src/ui/redux/selectors/content.js index 5c2d6c5db..f436fa7f9 100644 --- a/src/ui/redux/selectors/content.js +++ b/src/ui/redux/selectors/content.js @@ -25,11 +25,6 @@ export const makeSelectIsPlaying = (uri: string) => playingUri => playingUri === uri ); -export const selectRewardContentClaimIds = createSelector( - selectState, - state => state.rewardedContentClaimIds -); - export const makeSelectContentPositionForUri = (uri: string) => createSelector( selectState,