Merge upstream develop

Author: github-actions[bot]

Cargo.lock

@@ -11,13 +11,4 @@ exclude = ["legacy/"]
 resolver = "2"
 
 [workspace.dependencies]
-uniffi = { version = "=0.31.0", features = ["tokio"] }
-
-# Size-optimized profile for rs-core FFI artifacts (Android, iOS).
-[profile.release-rs-core]
-inherits = "release"
-opt-level = "s"
-lto = "fat"
-codegen-units = 1
-panic = "abort"
-strip = "debuginfo"
+uniffi = { version = "=0.31.0", features = ["tokio"] }

Cargo.toml

@@ -29,7 +29,8 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   },
   android: {
     adaptiveIcon: {
-      foregroundImage: './src/common/assets/images/PolycentricLogoTransparent1024.png',
+      foregroundImage:
+        './src/common/assets/images/PolycentricLogoTransparent1024.png',
       backgroundColor: '#F2F5F9',
     },
     edgeToEdgeEnabled: true,

apps/polycentric/app.config.ts

@@ -178,7 +178,6 @@ export function ComposeSheetInner({
       const event = await client.buildEvent(content);
 
       const signedEvent = await client.signEvent(event);
-      console.log(signedEvent);
       // `commitEvent` persists the event locally and, when content is
       // passed, seeds the core's content store + emits contentCreated
       // with both signedEvent and content so feeds can decode directly.

apps/polycentric/src/features/composer/ComposeSheetInner.tsx

@@ -8,12 +8,19 @@ import { openCompose } from '@/src/common/constants';
 import { isWeb } from '@/src/common/util/platform';
 import { Atoms, useTheme } from '@/src/common/theme';
 import { ActivityIndicator, RefreshControl, View } from 'react-native';
+import { useFocusEffect, useIsFocused } from 'expo-router';
+import { useState } from 'react';
 
 export default function ExploreScreen() {
   const { theme } = useTheme();
   const showComposeFab = !isWeb;
 
-  const feed = useExploreFeed({ enabled: true });
+  const [enabled, setEnabled] = useState<boolean>(false);
+  const feed = useExploreFeed({ enabled });
+
+  useFocusEffect(() => {
+    setEnabled(true);
+  });
 
   if (feed.error) {
     return (
@@ -38,6 +45,7 @@ export default function ExploreScreen() {
     <Screen>
       <Screen.PrimaryColumn>
         <FeedViewer
+          keyExtractor={(item) => item.id}
           data={feed.items}
           ListHeaderComponent={!isWeb ? Screen.Topbar : undefined}
           ListEmptyComponent={

apps/polycentric/src/features/feed/ExploreScreen.tsx

@@ -9,6 +9,8 @@ import { openCompose } from '@/src/common/constants';
 import { isWeb } from '@/src/common/util/platform';
 import { Atoms, useTheme } from '@/src/common/theme';
 import { ActivityIndicator, RefreshControl, View } from 'react-native';
+import { useFocusEffect, useIsFocused } from 'expo-router';
+import { useState } from 'react';
 
 const ListHeader = () => (
   <>
@@ -21,7 +23,12 @@ export default function FeedScreen() {
   const { theme } = useTheme();
   const showComposeFab = !isWeb;
 
-  const feed = useFollowingFeed({ enabled: true });
+  const [enabled, setEnabled] = useState<boolean>(false);
+  const feed = useFollowingFeed({ enabled });
+
+  useFocusEffect(() => {
+    setEnabled(true);
+  });
 
   if (feed.error) {
     return (
@@ -46,6 +53,7 @@ export default function FeedScreen() {
     <Screen>
       <Screen.PrimaryColumn>
         <FeedViewer
+          keyExtractor={(item) => item.id}
           data={feed.items}
           ListHeaderComponent={ListHeader}
           ListEmptyComponent={

apps/polycentric/src/features/feed/FeedScreen.tsx

@@ -1,11 +1,14 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { QueryStatus, v2 } from '@polycentric/react-native';
 import {
   decodeV2PostBundle,
   usePolycentricContext,
   type PostData,
 } from '@/src/common/lib/polycentric-hooks';
 import { EMPTY_POSTS, NOOP, type FeedHookResult } from './types';
 
+type Sub = { unsubscribe: () => void };
+
 export function useExploreFeed(options?: {
   perServerLimit?: number;
   enabled?: boolean;
@@ -16,34 +19,60 @@ export function useExploreFeed(options?: {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
-  const fetchFeed = useCallback(async () => {
-    if (client.servers.length === 0) return;
-    setIsLoading(true);
+  // Hold the live subscription so we can cancel on unmount / refresh.
+  // The rust core fans out to every configured server and emits each
+  // merged response as it arrives.
+  const subscriptionRef = useRef<Sub | null>(null);
+
+  const cleanup = useCallback(() => {
+    subscriptionRef.current?.unsubscribe();
+    subscriptionRef.current = null;
+  }, []);
+
+  const fetchFeed = useCallback(() => {
+    cleanup();
+    setItems(EMPTY_POSTS);
     setError(null);
-    try {
-      const responses = await client.getExploreFeed({
-        identity: client.activeIdentityKey,
-        limit: options?.perServerLimit ?? null,
-      });
-      const posts: PostData[] = [];
-      for (const response of responses) {
-        for (const bundle of response.eventBundles) {
-          const decoded = decodeV2PostBundle(bundle);
-          if (decoded) posts.push(decoded);
+    setIsLoading(true);
+
+    // Rust-side merge_fn already dedupes by EventKey — each next()
+    // carries the full merged feed plus a status. `Loading` stays in
+    // effect until the last per-server response arrives.
+    const observable = client.core.getExploreFeed(
+      client.activeIdentityKey ?? undefined,
+      undefined,
+      undefined,
+      undefined,
+    );
+    subscriptionRef.current = observable.subscribe({
+      next: (result) => {
+        if (result.data) {
+          const response = v2.GetFeedResponse.fromBinary(
+            new Uint8Array(result.data),
+          );
+          const posts: PostData[] = [];
+          for (const bundle of response.eventBundles) {
+            const decoded = decodeV2PostBundle(bundle);
+            if (decoded) posts.push(decoded);
+          }
+          setItems(posts);
         }
-      }
-      setItems(posts);
-    } catch (e) {
-      console.warn('[useExploreFeed] fetch failed', e);
-      setError(e instanceof Error ? e : new Error(String(e)));
-    } finally {
-      setIsLoading(false);
-    }
-  }, [client, options?.perServerLimit]);
+        setIsLoading(result.status === QueryStatus.Loading);
+      },
+      error: (message: string) => {
+        console.warn('useExploreFeed error:', message);
+        setError(new Error(message));
+      },
+      complete: () => {
+        setIsLoading(false);
+      },
+    });
+  }, [client, cleanup]);
 
   useEffect(() => {
     if (enabled) fetchFeed();
-  }, [enabled, fetchFeed]);
+    return cleanup;
+  }, [enabled, fetchFeed, cleanup]);
 
   return {
     items,

apps/polycentric/src/features/feed/hooks/useAuthorFeed.ts

@@ -1,4 +1,5 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { QueryStatus, v2 } from '@polycentric/react-native';
 import {
   decodeV2PostBundle,
   useLocalPostInjection,
@@ -7,6 +8,8 @@ import {
 } from '@/src/common/lib/polycentric-hooks';
 import { EMPTY_POSTS, NOOP, type FeedHookResult } from './types';
 
+type Sub = { unsubscribe: () => void };
+
 export function useFollowingFeed(options?: {
   limit?: number;
   enabled?: boolean;
@@ -17,37 +20,65 @@ export function useFollowingFeed(options?: {
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
-  const fetchFeed = useCallback(async () => {
-    if (client.servers.length === 0) return;
-    if (!client.activeIdentityKey) {
+  // Hold the live subscription so we can cancel on unmount / refresh /
+  // identity change. The rust core fans out to every configured server
+  // and emits each merged response as it arrives.
+  const subscriptionRef = useRef<Sub | null>(null);
+
+  const cleanup = useCallback(() => {
+    subscriptionRef.current?.unsubscribe();
+    subscriptionRef.current = null;
+  }, []);
+
+  const fetchFeed = useCallback(() => {
+    const followerIdentity = client.activeIdentityKey;
+    if (!followerIdentity) {
+      cleanup();
       setItems(EMPTY_POSTS);
       return;
     }
 
-    setIsLoading(true);
+    cleanup();
+    setItems(EMPTY_POSTS);
     setError(null);
-    try {
-      const responses = await client.getFollowingFeed({
-        limit: options?.limit ?? null,
-      });
-      const posts: PostData[] = [];
-      for (const response of responses) {
-        for (const bundle of response.eventBundles) {
-          const decoded = decodeV2PostBundle(bundle);
-          if (decoded) posts.push(decoded);
+    setIsLoading(true);
+
+    const observable = client.core.getFollowingFeed(
+      followerIdentity,
+      undefined,
+      undefined,
+      undefined,
+    );
+    subscriptionRef.current = observable.subscribe({
+      next: (result) => {
+        if (result.data) {
+          const response = v2.GetFeedResponse.fromBinary(
+            new Uint8Array(result.data),
+          );
+
+          const decoded = response.eventBundles
+            .map((bundle) => decodeV2PostBundle(bundle))
+            .filter((post) => !!post);
+
+          setItems(decoded);
         }
-      }
-      setItems(posts);
-    } catch (e) {
-      setError(e instanceof Error ? e : new Error(String(e)));
-    } finally {
-      setIsLoading(false);
-    }
-  }, [client, options?.limit]);
+
+        setIsLoading(result.status === QueryStatus.Loading);
+      },
+      error: (message: string) => {
+        console.warn('useFollowingFeed error:', message);
+        setError(new Error(message));
+      },
+      complete: () => {
+        setIsLoading(false);
+      },
+    });
+  }, [client, cleanup]);
 
   useEffect(() => {
     if (enabled) fetchFeed();
-  }, [enabled, fetchFeed]);
+    return cleanup;
+  }, [enabled, fetchFeed, cleanup]);
 
   useLocalPostInjection({
     match: () => true,