diff --git a/src/ui/component/channelTile/view.jsx b/src/ui/component/channelTile/view.jsx index f82615989..14c616f2d 100644 --- a/src/ui/component/channelTile/view.jsx +++ b/src/ui/component/channelTile/view.jsx @@ -45,26 +45,26 @@ class ChannelTile extends React.PureComponent { subscriptionUri = `lbry://${claim.permanent_url}`; } - const onClick = () => navigate('/show', { uri }); + const onClick = () => navigate('/show', { uri, page: 1 }); return (
-
- {isResolvingUri &&
{__('Loading...')}
} +
+ {isResolvingUri &&
{__('Loading...')}
} {!isResolvingUri && ( -
+
-
+
{totalItems > 0 && ( {totalItems} {totalItems === 1 ? 'publish' : 'publishes'} @@ -75,8 +75,8 @@ class ChannelTile extends React.PureComponent { )} {subscriptionUri && ( -
- +
+
)}
diff --git a/src/ui/page/channel/view.jsx b/src/ui/page/channel/view.jsx index ff348eefb..004e718cc 100644 --- a/src/ui/page/channel/view.jsx +++ b/src/ui/page/channel/view.jsx @@ -32,11 +32,11 @@ class ChannelPage extends React.PureComponent { fetchClaims(uri, page || 1); } - componentWillReceiveProps(nextProps: Props) { - const { page, fetchClaims } = this.props; + componentDidUpdate(prevProps: Props) { + const { page, fetchClaims, uri } = this.props; - if (nextProps.page && page !== nextProps.page) { - fetchClaims(nextProps.uri, nextProps.page); + if (prevProps.page && prevProps.page && page !== prevProps.page) { + fetchClaims(uri, page); } } @@ -80,21 +80,21 @@ class ChannelPage extends React.PureComponent { claimsInChannel && claimsInChannel.length ? ( ) : ( - !fetching && {__('No content found.')} + !fetching && {__('No content found.')} ); return ( -
-

+
+

{name} {fetching && }

-
+
-
{contentList}
+
{contentList}
{(!fetching || (claimsInChannel && claimsInChannel.length)) && totalPages > 1 && (
- + this.changePage(e.selected + 1)} forcePage={currentPage} initialPage={currentPage} - containerClassName="pagination" + containerClassName='pagination' /> this.paginate(e, totalPages)} label={__('Go to page:')} - type="text" - name="paginate-file" + type='text' + name='paginate-file' /> )} - {!channelIsMine && } + {!channelIsMine && } ); }