diff --git a/ui/component/claimMenuList/index.js b/ui/component/claimMenuList/index.js index ddf7ebdf7..262a356f5 100644 --- a/ui/component/claimMenuList/index.js +++ b/ui/component/claimMenuList/index.js @@ -8,6 +8,7 @@ import { makeSelectCollectionIsMine, COLLECTIONS_CONSTS, makeSelectEditedCollectionForId, + makeSelectClaimIsMine, } from 'lbry-redux'; import { makeSelectChannelIsMuted } from 'redux/selectors/blocked'; import { doChannelMute, doChannelUnmute } from 'redux/actions/blocked'; @@ -24,7 +25,6 @@ import { makeSelectChannelIsAdminBlocked, } from 'redux/selectors/comments'; import { doToast } from 'redux/actions/notifications'; -import { makeSelectSigningIsMine } from 'redux/selectors/content'; import { doChannelSubscribe, doChannelUnsubscribe } from 'redux/actions/subscriptions'; import { makeSelectIsSubscribed } from 'redux/selectors/subscriptions'; import { selectUserVerifiedEmail } from 'redux/selectors/user'; @@ -45,7 +45,7 @@ const select = (state, props) => { contentClaim, contentSigningChannel, contentChannelUri, - claimIsMine: makeSelectSigningIsMine(props.uri)(state), + claimIsMine: makeSelectClaimIsMine(props.uri)(state), hasClaimInWatchLater: makeSelectCollectionForIdHasClaimUrl( COLLECTIONS_CONSTS.WATCH_LATER_ID, contentPermanentUri diff --git a/ui/modal/modalRemoveFile/index.js b/ui/modal/modalRemoveFile/index.js index 9d8dbfb9c..529364bde 100644 --- a/ui/modal/modalRemoveFile/index.js +++ b/ui/modal/modalRemoveFile/index.js @@ -5,13 +5,13 @@ import { doResolveUri, makeSelectClaimForUri, makeSelectIsAbandoningClaimForUri, + makeSelectClaimIsMine, } from 'lbry-redux'; import { doHideModal } from 'redux/actions/app'; import ModalRemoveFile from './view'; -import { makeSelectSigningIsMine } from 'redux/selectors/content'; const select = (state, props) => ({ - claimIsMine: makeSelectSigningIsMine(props.uri)(state), + claimIsMine: makeSelectClaimIsMine(props.uri)(state), title: makeSelectTitleForUri(props.uri)(state), claim: makeSelectClaimForUri(props.uri)(state), isAbandoning: makeSelectIsAbandoningClaimForUri(props.uri)(state), diff --git a/ui/redux/selectors/content.js b/ui/redux/selectors/content.js index faaa4acc5..67fcf9e6b 100644 --- a/ui/redux/selectors/content.js +++ b/ui/redux/selectors/content.js @@ -11,8 +11,6 @@ import { parseURI, makeSelectContentTypeForUri, makeSelectFileNameForUri, - normalizeURI, - selectMyActiveClaims, selectClaimIdsByUri, } from 'lbry-redux'; import { makeSelectRecommendedContentForUri } from 'redux/selectors/search'; @@ -247,24 +245,6 @@ export const makeSelectInsufficientCreditsForUri = (uri: string) => } ); -export const makeSelectSigningIsMine = (rawUri: string) => { - let uri; - try { - uri = normalizeURI(rawUri); - } catch (e) {} - - return createSelector(selectClaimsByUri, selectMyActiveClaims, (claims, myClaims) => { - try { - parseURI(uri); - } catch (e) { - return false; - } - const signingChannel = claims && claims[uri] && (claims[uri].signing_channel || claims[uri]); - - return signingChannel && myClaims.has(signingChannel.claim_id); - }); -}; - export const makeSelectRecommendationId = (claimId: string) => createSelector(selectState, (state) => state.recommendationId[claimId]);