Fix 5932 "no way to buy Paid Images or Posts"
- FileRenderInitiator: we don't display if it's not Audio or Video ("playables"). But only do that if it's free or was purchased, otherwise there's no button to buy it. - FileRenderInline: if the user have not purchased it, don't show anything (not even the spinner).
This commit is contained in:
parent
b101cb304f
commit
9e13596104
3 changed files with 25 additions and 3 deletions
|
@ -120,7 +120,9 @@ export default function FileRenderInitiator(props: Props) {
|
||||||
but for playables, always render so area can be used to fill with floating player
|
but for playables, always render so area can be used to fill with floating player
|
||||||
*/
|
*/
|
||||||
if (isPlaying && !isPlayable) {
|
if (isPlaying && !isPlayable) {
|
||||||
return null;
|
if (isFree || claimWasPurchased) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const showAppNag = IS_WEB && RENDER_MODES.UNSUPPORTED_IN_THIS_APP.includes(renderMode);
|
const showAppNag = IS_WEB && RENDER_MODES.UNSUPPORTED_IN_THIS_APP.includes(renderMode);
|
||||||
|
|
|
@ -1,16 +1,19 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { makeSelectFileInfoForUri, makeSelectStreamingUrlForUri } from 'lbry-redux';
|
import { makeSelectFileInfoForUri, makeSelectStreamingUrlForUri, makeSelectClaimWasPurchased } from 'lbry-redux';
|
||||||
import { doClaimEligiblePurchaseRewards } from 'redux/actions/rewards';
|
import { doClaimEligiblePurchaseRewards } from 'redux/actions/rewards';
|
||||||
import { makeSelectFileRenderModeForUri, selectPrimaryUri } from 'redux/selectors/content';
|
import { makeSelectFileRenderModeForUri, selectPrimaryUri } from 'redux/selectors/content';
|
||||||
import { withRouter } from 'react-router';
|
import { withRouter } from 'react-router';
|
||||||
import { doAnalyticsView } from 'redux/actions/app';
|
import { doAnalyticsView } from 'redux/actions/app';
|
||||||
import FileRenderInline from './view';
|
import FileRenderInline from './view';
|
||||||
|
import { makeSelectCostInfoForUri } from 'lbryinc';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
fileInfo: makeSelectFileInfoForUri(props.uri)(state),
|
fileInfo: makeSelectFileInfoForUri(props.uri)(state),
|
||||||
isPlaying: selectPrimaryUri(state) === props.uri,
|
isPlaying: selectPrimaryUri(state) === props.uri,
|
||||||
streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
|
streamingUrl: makeSelectStreamingUrlForUri(props.uri)(state),
|
||||||
renderMode: makeSelectFileRenderModeForUri(props.uri)(state),
|
renderMode: makeSelectFileRenderModeForUri(props.uri)(state),
|
||||||
|
costInfo: makeSelectCostInfoForUri(props.uri)(state),
|
||||||
|
claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = (dispatch) => ({
|
const perform = (dispatch) => ({
|
||||||
|
|
|
@ -12,11 +12,24 @@ type Props = {
|
||||||
streamingUrl?: string,
|
streamingUrl?: string,
|
||||||
triggerAnalyticsView: (string, number) => Promise<any>,
|
triggerAnalyticsView: (string, number) => Promise<any>,
|
||||||
claimRewards: () => void,
|
claimRewards: () => void,
|
||||||
|
costInfo: any,
|
||||||
|
claimWasPurchased: boolean,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function FileRenderInline(props: Props) {
|
export default function FileRenderInline(props: Props) {
|
||||||
const { isPlaying, fileInfo, uri, streamingUrl, triggerAnalyticsView, claimRewards, renderMode } = props;
|
const {
|
||||||
|
isPlaying,
|
||||||
|
fileInfo,
|
||||||
|
uri,
|
||||||
|
streamingUrl,
|
||||||
|
triggerAnalyticsView,
|
||||||
|
claimRewards,
|
||||||
|
renderMode,
|
||||||
|
costInfo,
|
||||||
|
claimWasPurchased,
|
||||||
|
} = props;
|
||||||
const [playTime, setPlayTime] = useState();
|
const [playTime, setPlayTime] = useState();
|
||||||
|
const isFree = !costInfo || (costInfo.cost !== undefined && costInfo.cost === 0);
|
||||||
const isReadyToView = fileInfo && fileInfo.completed;
|
const isReadyToView = fileInfo && fileInfo.completed;
|
||||||
const isReadyToPlay = streamingUrl || isReadyToView;
|
const isReadyToPlay = streamingUrl || isReadyToView;
|
||||||
|
|
||||||
|
@ -52,5 +65,9 @@ export default function FileRenderInline(props: Props) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isFree && !claimWasPurchased) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return renderContent ? <FileRender uri={uri} /> : <LoadingScreen isDocument />;
|
return renderContent ? <FileRender uri={uri} /> : <LoadingScreen isDocument />;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue