Add tags to publish page, infinite scroll, navigation improvements #2593

Merged
neb-b merged 21 commits from infinite into master 2019-07-02 04:54:36 +02:00
4 changed files with 20 additions and 3 deletions
Showing only changes of commit be85c74b2a - Show all commits

View file

@ -77,10 +77,10 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
const content = ( const content = (
<span className="button__content"> <span className="button__content">
{icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />} {icon && <Icon icon={icon} size={iconSize} />}
{label && <span className="button__label">{label}</span>} {label && <span className="button__label">{label}</span>}
{children && children} {children && children}
{iconRight && <Icon icon={iconRight} iconColor={iconColor} size={iconSize} />} {iconRight && <Icon icon={iconRight} size={iconSize} />}
</span> </span>
); );

View file

@ -0,0 +1,16 @@
import { connect } from 'react-redux';
import { selectFollowedTags } from 'lbry-redux';
import { selectSubscriptions } from 'redux/selectors/subscriptions';
import TagsEdit from './view';
const select = state => ({
followedTags: selectFollowedTags(state),
subscribedChannels: selectSubscriptions(state),
});
const perform = {};
export default connect(
select,
perform
)(TagsEdit);

View file

@ -73,7 +73,8 @@ export default function SubscriptionsPage(props: Props) {
onClick={() => onClick()} onClick={() => onClick()}
/> />
} }
uris={viewingSuggestedSubs ? suggestedSubscriptions.map(sub => sub.uri) : uris} // Fix the need to reverse this
uris={viewingSuggestedSubs ? suggestedSubscriptions.map(sub => sub.uri) : uris.reverse()}
/> />
</div> </div>
</Page> </Page>