diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx index a631763ad..e99323388 100644 --- a/ui/component/button/view.jsx +++ b/ui/component/button/view.jsx @@ -14,7 +14,6 @@ type Props = { href: ?string, title: ?string, label: ?string, - largestLabel: ?string, icon: ?string, iconRight: ?string, disabled: ?boolean, @@ -48,7 +47,6 @@ const Button = forwardRef((props: Props, ref: any) => { href, title, label, - largestLabel, icon, // This should rarely be used. Regular buttons should just use `icon` // `iconRight` is used for the header (home) button with the LBRY icon and external links that are displayed inline @@ -92,35 +90,8 @@ const Button = forwardRef((props: Props, ref: any) => { const content = ( - {icon && } - - {label && ( -
-
- - {largestLabel || label} -
- {label} -
-
-
-
- )} - + {icon && } + {label && {label}} {children && children} {iconRight && }
@@ -156,7 +127,7 @@ const Button = forwardRef((props: Props, ref: any) => { return ( { + onClick={e => { e.stopPropagation(); }} to={`/$/${PAGES.AUTH}?redirect=${pathname}`} @@ -176,7 +147,7 @@ const Button = forwardRef((props: Props, ref: any) => { to={path} title={title} disabled={disabled} - onClick={(e) => { + onClick={e => { e.stopPropagation(); if (onClick) { onClick(); @@ -194,7 +165,7 @@ const Button = forwardRef((props: Props, ref: any) => { title={title} aria-label={description || label || title} className={combinedClassName} - onClick={(e) => { + onClick={e => { if (onClick) { e.stopPropagation(); onClick(e); diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx index fa3d9eb80..0ba51fe05 100644 --- a/ui/component/claimTilesDiscover/view.jsx +++ b/ui/component/claimTilesDiscover/view.jsx @@ -4,7 +4,6 @@ import { createNormalizedClaimSearchKey, MATURE_TAGS } from 'lbry-redux'; import ClaimPreviewTile from 'component/claimPreviewTile'; type Props = { - prefixUris?: Array, uris: Array, doClaimSearch: ({}) => void, showNsfw: boolean, @@ -40,7 +39,6 @@ function ClaimTilesDiscover(props: Props) { pageSize = 8, releaseTime, claimType, - prefixUris, timestamp, } = props; const [hasSearched, setHasSearched] = React.useState(false); @@ -94,7 +92,7 @@ function ClaimTilesDiscover(props: Props) { } const claimSearchCacheQuery = createNormalizedClaimSearchKey(options); - const uris = (prefixUris || []).concat(claimSearchByQuery[claimSearchCacheQuery] || []); + const uris = claimSearchByQuery[claimSearchCacheQuery] || []; const shouldPerformSearch = !hasSearched || uris.length === 0; // Don't use the query from createNormalizedClaimSearchKey for the effect since that doesn't include page & release_time const optionsStringForEffect = JSON.stringify(options); diff --git a/ui/component/subscribeButton/view.jsx b/ui/component/subscribeButton/view.jsx index 6aa00ab7b..57ecda021 100644 --- a/ui/component/subscribeButton/view.jsx +++ b/ui/component/subscribeButton/view.jsx @@ -46,17 +46,10 @@ export default function SubscribeButton(props: Props) { const unfollowOverride = isSubscribed && isHovering && __('Unfollow'); const label = isMobile && shrinkOnMobile ? '' : unfollowOverride || subscriptionLabel; - let longestStr = __('Following'); - - if (__('Following').length < __('Unfollow').length) { - longestStr = __('Unfollow'); - } - return permanentUrl ? (