diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a4beefb..2ff890e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Persistence to Transaction List Filter Selection ([#2048](https://github.com/lbryio/lbry-desktop/pull/2048)) * Subscription improvements ([#2031](https://github.com/lbryio/lbry-desktop/pull/2031)) * Adds Persistence to File List Filter Selections ([#2050](https://github.com/lbryio/lbry-desktop/pull/2050)) + * Add more share options for channel page ([#2088](https://github.com/lbryio/lbry-desktop/pull/2088)) ### Changed * Upgraded to lbrynet v0.30.0 ([#1998](https://github.com/lbryio/lbry-desktop/pull/1998)) diff --git a/src/renderer/page/channel/index.js b/src/renderer/page/channel/index.js index f7cbf28b0..498bd92eb 100644 --- a/src/renderer/page/channel/index.js +++ b/src/renderer/page/channel/index.js @@ -9,6 +9,7 @@ import { makeSelectClaimIsMine, makeSelectTotalPagesForChannel, selectCurrentParams, + doNotify, } from 'lbry-redux'; import { doNavigate } from 'redux/actions/navigation'; import ChannelPage from './view'; @@ -27,6 +28,7 @@ const perform = dispatch => ({ fetchClaims: (uri, page) => dispatch(doFetchClaimsByChannel(uri, page)), fetchClaimCount: uri => dispatch(doFetchClaimCountByChannel(uri)), navigate: (path, params) => dispatch(doNavigate(path, params)), + openModal: (modal, props) => dispatch(doNotify(modal, props)), }); export default connect( diff --git a/src/renderer/page/channel/view.jsx b/src/renderer/page/channel/view.jsx index 5638c4172..641a91680 100644 --- a/src/renderer/page/channel/view.jsx +++ b/src/renderer/page/channel/view.jsx @@ -4,11 +4,13 @@ import BusyIndicator from 'component/common/busy-indicator'; import { FormField, FormRow } from 'component/common/form'; import ReactPaginate from 'react-paginate'; import SubscribeButton from 'component/subscribeButton'; -import ViewOnWebButton from 'component/viewOnWebButton'; import Page from 'component/page'; import FileList from 'component/fileList'; import HiddenNsfwClaims from 'component/hiddenNsfwClaims'; import type { Claim } from 'types/claim'; +import Button from 'component/button'; +import { MODALS } from 'lbry-redux'; +import * as icons from 'constants/icons'; type Props = { uri: string, @@ -22,6 +24,7 @@ type Props = { fetchClaims: (string, number) => void, fetchClaimCount: string => void, navigate: (string, {}) => void, + openModal: ({ id: string }, { uri: string }) => void, }; class ChannelPage extends React.PureComponent { @@ -67,10 +70,18 @@ class ChannelPage extends React.PureComponent { } render() { - const { uri, fetching, claimsInChannel, claim, page, totalPages, channelIsMine } = this.props; - const { name, permanent_url: permanentUrl, claim_id: claimId } = claim; + const { + uri, + fetching, + claimsInChannel, + claim, + page, + totalPages, + channelIsMine, + openModal, + } = this.props; + const { name, permanent_url: permanentUrl } = claim; const currentPage = parseInt((page || 1) - 1, 10); - const contentList = claimsInChannel && claimsInChannel.length ? ( @@ -88,7 +99,12 @@ class ChannelPage extends React.PureComponent {
- +
{contentList}
{(!fetching || (claimsInChannel && claimsInChannel.length)) &&