fix: 🐛

This commit is contained in:
codytseng
2025-11-11 21:53:57 +08:00
parent 485ca82e30
commit 8ed28a79b1
4 changed files with 12 additions and 12 deletions

View File

@@ -51,7 +51,9 @@ const NoteListPage = forwardRef<TPageRef>((_, ref) => {
let content: React.ReactNode = null let content: React.ReactNode = null
if (!isReady) { if (!isReady) {
content = <div className="text-center text-sm text-muted-foreground">{t('loading...')}</div> content = (
<div className="text-center text-sm text-muted-foreground pt-3">{t('loading...')}</div>
)
} else if (!feedInfo) { } else if (!feedInfo) {
content = <WelcomeGuide /> content = <WelcomeGuide />
} else if (feedInfo.feedType === 'following' && !pubkey) { } else if (feedInfo.feedType === 'following' && !pubkey) {

View File

@@ -52,23 +52,20 @@ export function FeedProvider({ children }: { children: React.ReactNode }) {
} }
} }
if (!feedInfo) { if (feedInfo?.feedType === 'relays') {
setIsReady(true)
return
}
if (feedInfo.feedType === 'relays') {
return await switchFeed('relays', { activeRelaySetId: feedInfo.id }) return await switchFeed('relays', { activeRelaySetId: feedInfo.id })
} }
if (feedInfo.feedType === 'relay') { if (feedInfo?.feedType === 'relay') {
return await switchFeed('relay', { relay: feedInfo.id }) return await switchFeed('relay', { relay: feedInfo.id })
} }
// update following feed if pubkey changes // update following feed if pubkey changes
if (feedInfo.feedType === 'following' && pubkey) { if (feedInfo?.feedType === 'following' && pubkey) {
return await switchFeed('following', { pubkey }) return await switchFeed('following', { pubkey })
} }
setIsReady(true)
} }
init() init()

View File

@@ -704,7 +704,7 @@ export function NostrProvider({ children }: { children: React.ReactNode }) {
} }
const updateRelayListEvent = async (relayListEvent: Event) => { const updateRelayListEvent = async (relayListEvent: Event) => {
const newRelayList = await indexedDb.putReplaceableEvent(relayListEvent) const newRelayList = await client.updateRelayListCache(relayListEvent)
setRelayList(getRelayListFromEvent(newRelayList)) setRelayList(getRelayListFromEvent(newRelayList))
} }

View File

@@ -1146,7 +1146,7 @@ class ClientService extends EventTarget {
} }
async updateRelayListCache(event: NEvent) { async updateRelayListCache(event: NEvent) {
await this.updateReplaceableEventFromBigRelaysCache(event) return await this.updateReplaceableEventFromBigRelaysCache(event)
} }
/** =========== Replaceable event from big relays dataloader =========== */ /** =========== Replaceable event from big relays dataloader =========== */
@@ -1236,7 +1236,7 @@ class ClientService extends EventTarget {
private async updateReplaceableEventFromBigRelaysCache(event: NEvent) { private async updateReplaceableEventFromBigRelaysCache(event: NEvent) {
const newEvent = await indexedDb.putReplaceableEvent(event) const newEvent = await indexedDb.putReplaceableEvent(event)
if (newEvent.id !== event.id) { if (newEvent.id !== event.id) {
return return newEvent
} }
this.replaceableEventFromBigRelaysDataloader.clear({ pubkey: event.pubkey, kind: event.kind }) this.replaceableEventFromBigRelaysDataloader.clear({ pubkey: event.pubkey, kind: event.kind })
@@ -1244,6 +1244,7 @@ class ClientService extends EventTarget {
{ pubkey: event.pubkey, kind: event.kind }, { pubkey: event.pubkey, kind: event.kind },
Promise.resolve(event) Promise.resolve(event)
) )
return newEvent
} }
/** =========== Replaceable event dataloader =========== */ /** =========== Replaceable event dataloader =========== */