LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Swap pinnedUrls vs. pinnedClaimIds precedence

Browse source 
pinnedUrls = resolve
pinnedClaimIds = claim_search

Make `pinnedClaimIds` take precedence for now, since the homepage is defining both to support Android.

For some reason, I previously made `pinnedUrls` the priority, thinking this should be the "correct" one to use when the SDK is fixed.
This commit is contained in:
infinite-persistence 2022-04-01 23:24:46 +08:00 committed by Thomas Zarebczan
parent c36fd425a7
commit 3e5290d8b0
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flow-typed/homepage.js vendored
View file

@ -19,7 +19,7 @@ declare type RowDataItem = {
icon?: string, icon?: string,
extra?: any, extra?: any,
pinnedUrls?: Array<string>, pinnedUrls?: Array<string>,
pinnedClaimIds?: Array<string>, // pinnedUrls takes precedence pinnedClaimIds?: Array<string>, // takes precedence over pinnedUrls
options?: { options?: {
channelIds?: Array<string>, channelIds?: Array<string>,
limitClaimsPerChannel?: number, limitClaimsPerChannel?: number,

6
ui/effects/use-resolve-pins.js
View file

@ -18,9 +18,7 @@ export default function useResolvePins(props: Props) {
React.useEffect(() => { React.useEffect(() => {
if (resolvedPinUris === undefined && pins && !resolvingPinUris) { if (resolvedPinUris === undefined && pins && !resolvingPinUris) {
if (pins.urls) { if (pins.claimIds) {
doResolveUris(pins.urls, true).finally(() => setResolvedPinUris(pins.urls));
} else if (pins.claimIds) {
// setResolvingPinUris is only needed for claim_search. // setResolvingPinUris is only needed for claim_search.
// doResolveUris uses selectResolvingUris internally to prevent double call. // doResolveUris uses selectResolvingUris internally to prevent double call.
setResolvingPinUris(true); setResolvingPinUris(true);
@ -31,6 +29,8 @@ export default function useResolvePins(props: Props) {
// next render cycle (redux would be updated by then). Pretty dumb. // next render cycle (redux would be updated by then). Pretty dumb.
// $FlowFixMe: already checked for null `pins`, but flow can't see it when there's code above it? Wow. // $FlowFixMe: already checked for null `pins`, but flow can't see it when there's code above it? Wow.
doResolveClaimIds(pins.claimIds).finally(() => setResolvingPinUris(false)); doResolveClaimIds(pins.claimIds).finally(() => setResolvingPinUris(false));
} else if (pins.urls) {
doResolveUris(pins.urls, true).finally(() => setResolvedPinUris(pins.urls));
} else { } else {
setResolvedPinUris(null); setResolvedPinUris(null);
} }

2
ui/util/buildHomepage.js
View file

@ -19,7 +19,7 @@ export type HomepageCat = {
order?: string, order?: string,
tags?: Array<string>, tags?: Array<string>,
pinnedUrls?: Array<string>, pinnedUrls?: Array<string>,
pinnedClaimIds?: Array<string>, // pinnedUrls takes precedence pinnedClaimIds?: Array<string>, // takes precedence over pinnedUrls
mixIn?: Array<string>, mixIn?: Array<string>,
}; };