diff --git a/package-lock.json b/package-lock.json index 20e74036..40341894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "imwald", - "version": "23.17.3", + "version": "23.17.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "imwald", - "version": "23.17.3", + "version": "23.17.4", "license": "MIT", "dependencies": { "@asciidoctor/core": "^3.0.4", diff --git a/package.json b/package.json index fa4e8217..80161d7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "imwald", - "version": "23.17.3", + "version": "23.17.4", "description": "Imwald — a user-friendly Nostr client focused on relay feed browsing, publications, and relay discovery", "private": true, "type": "module", diff --git a/src/components/Explore/ExploreFavoriteRelays.tsx b/src/components/Explore/ExploreFavoriteRelays.tsx index cbac4207..54dbfa06 100644 --- a/src/components/Explore/ExploreFavoriteRelays.tsx +++ b/src/components/Explore/ExploreFavoriteRelays.tsx @@ -1,6 +1,7 @@ import RelaySimpleInfo, { RelaySimpleInfoSkeleton } from '@/components/RelaySimpleInfo' import { Button } from '@/components/ui/button' import { DEFAULT_FAVORITE_RELAYS } from '@/constants' +import { ensureTrendingInFavoriteRelayList } from '@/lib/wisp-trending-relay' import { useGlobalRelayBootstrapDefaults } from '@/hooks/use-global-relay-bootstrap-defaults' import { useFetchRelayInfo } from '@/hooks' import { toRelay, toRelaySettings } from '@/lib/link' @@ -70,7 +71,7 @@ export default function ExploreFavoriteRelays() { ) const { urls, usingDefaults } = useMemo(() => { - const visible = favoriteRelays.filter((r) => { + const visible = ensureTrendingInFavoriteRelayList(favoriteRelays).filter((r) => { const k = normalizeUrl(r) || r return k && !blockedSet.has(k) }) diff --git a/src/components/FavoriteRelaysSetting/AddNewRelay.tsx b/src/components/FavoriteRelaysSetting/AddNewRelay.tsx index e809f64b..e540fd7e 100644 --- a/src/components/FavoriteRelaysSetting/AddNewRelay.tsx +++ b/src/components/FavoriteRelaysSetting/AddNewRelay.tsx @@ -53,19 +53,19 @@ export default function AddNewRelay() { return (
-
+
-
- {errorMsg &&
{errorMsg}
} + {errorMsg &&
{errorMsg}
}
) } diff --git a/src/components/FavoriteRelaysSetting/BlockedRelayItem.tsx b/src/components/FavoriteRelaysSetting/BlockedRelayItem.tsx index f623c2aa..4a52ff03 100644 --- a/src/components/FavoriteRelaysSetting/BlockedRelayItem.tsx +++ b/src/components/FavoriteRelaysSetting/BlockedRelayItem.tsx @@ -29,19 +29,19 @@ export default function BlockedRelayItem({ relay }: { relay: string }) { return (
push(toRelay(relay))} > -
- -
{relay}
+
+ +
{relay}
) : ( -
{relaySet.name}
+
{relaySet.name}
) } diff --git a/src/components/FavoriteRelaysSetting/RelayUrl.tsx b/src/components/FavoriteRelaysSetting/RelayUrl.tsx index 1740766a..7a597edb 100644 --- a/src/components/FavoriteRelaysSetting/RelayUrl.tsx +++ b/src/components/FavoriteRelaysSetting/RelayUrl.tsx @@ -81,16 +81,20 @@ export default function RelayUrls({ relaySetId }: { relaySetId: string }) { removeRelayUrl(url)} /> ))}
-
+
-
@@ -103,21 +107,22 @@ function RelayUrl({ url, onRemove }: { url: string; onRemove: () => void }) { const { push } = useSecondaryPage() return ( -
-
+
push(toRelay(url))} > - -
{url}
-
-
- + +
{url}
+
) } diff --git a/src/components/FavoriteRelaysSetting/index.tsx b/src/components/FavoriteRelaysSetting/index.tsx index cb6934cf..bc114d5b 100644 --- a/src/components/FavoriteRelaysSetting/index.tsx +++ b/src/components/FavoriteRelaysSetting/index.tsx @@ -9,7 +9,7 @@ import RelaySetList from './RelaySetList' export default function FavoriteRelaysSetting() { return ( -
+
diff --git a/src/components/FeedRelaysIconRow/index.tsx b/src/components/FeedRelaysIconRow/index.tsx index f262e093..b9118b82 100644 --- a/src/components/FeedRelaysIconRow/index.tsx +++ b/src/components/FeedRelaysIconRow/index.tsx @@ -1,6 +1,7 @@ import RelayIcon from '@/components/RelayIcon' import { Button } from '@/components/ui/button' import { toRelay } from '@/lib/link' +import { isWispTrendingNotesRelayUrl } from '@/lib/wisp-trending-relay' import { simplifyUrl } from '@/lib/url' import { cn } from '@/lib/utils' import { useSmartRelayNavigation } from '@/PageManager' @@ -25,6 +26,10 @@ export function FeedRelaysIconRow({ > {urls.map((url) => { const label = simplifyUrl(url) + const isTrending = isWispTrendingNotesRelayUrl(url) + const title = isTrending + ? t('Trending on Nostr', { defaultValue: 'Trending on Nostr' }) + : label return (