Merge upstream develop

Author: github-actions[bot]

apps/polycentric/app/(tabs)/explore.tsx

@@ -0,0 +1,5 @@
+import FeedTabScreen from '@/src/features/feed/FeedScreen';
+
+export default function FeedIndexRoute() {
+  return <FeedTabScreen />;
+}

apps/polycentric/app/feed/identity.tsx apps/polycentric/app/identity/switch.tsxapps/polycentric/app/feed/identity.tsx renamed to apps/polycentric/app/identity/switch.tsx

@@ -28,6 +28,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { FUTO_URL, openCompose } from '../../constants';
 import { Button } from '../primitives';
 import { useCurrentIdentity } from '../../lib/polycentric-hooks';
+import { IdentityFooter } from '@/src/features/core/identity/IdentityFooter';
 
 type MainProps = {
   children: ReactElement | ReactElement[];
@@ -177,7 +178,13 @@ export const LeftSidebar = memo(function LeftSidebar({
             ]}
           >
             {/* 1st section (top) */}
-            <View>
+            <View
+              style={[
+                Atoms.w_full,
+                narrowSidebar && Atoms.align_center,
+                Atoms.flex_col,
+              ]}
+            >
               <Link
                 href="/"
                 style={[
@@ -196,6 +203,27 @@ export const LeftSidebar = memo(function LeftSidebar({
               </Link>
 
               <VerticalNav />
+
+              <View
+                style={[
+                  Atoms.py_md,
+                  Atoms.self_stretch,
+                  narrowSidebar && Atoms.align_center,
+                ]}
+              >
+                {identity && (
+                  <Button
+                    title={narrowSidebar ? '' : 'Post'}
+                    variant="primary"
+                    size="md"
+                    fullWidth={!narrowSidebar}
+                    icon={({ size, color }) => (
+                      <Ionicons name="add-circle" size={size} color={color} />
+                    )}
+                    onPress={() => openCompose()}
+                  />
+                )}
+              </View>
             </View>
             {/* 2nd Section (bottom) */}
             <View
@@ -205,18 +233,7 @@ export const LeftSidebar = memo(function LeftSidebar({
                 narrowSidebar && Atoms.align_center,
               ]}
             >
-              {identity && (
-                <Button
-                  title={narrowSidebar ? '' : 'New Post'}
-                  variant="primary"
-                  size="md"
-                  fullWidth={!narrowSidebar}
-                  icon={({ size, color }) => (
-                    <Ionicons name="add-circle" size={size} color={color} />
-                  )}
-                  onPress={() => openCompose()}
-                />
-              )}
+              {identity && <IdentityFooter compact={narrowSidebar} />}
             </View>
           </View>
         </View>

apps/polycentric/src/common/components/layout/Layout.tsx

@@ -23,6 +23,11 @@ export function VerticalNav({ style }: VerticalNavProps) {
         icon={<Ionicons name="home-outline" size={24} />}
         href="/feed"
       />
+      <NavItem
+        label="Explore"
+        icon={<Ionicons name="search-outline" size={24} />}
+        href="/explore"
+      />
       {identity?.identityKey && (
         <NavItem
           label="Profile"

apps/polycentric/src/common/components/layout/nav/VerticalNav.tsx

@@ -17,10 +17,10 @@ export const Routes = {
     feed: {
       index: '/feed',
       compose: '/feed/compose',
-      identity: '/feed/identity',
     },
     search: '/search',
     claims: '/claims',
+    identitySwitch: '/identity/switch',
     profile: (identityId: string) => `/${identityId}` as const,
     editProfile: (identityId: string) => `/${identityId}/edit` as const,
     post: (identityId: string, postId: string) =>

apps/polycentric/src/common/constants/routes.ts

@@ -15,6 +15,7 @@ import {
   type ReactNode,
 } from 'react';
 import { ActivityIndicator, Platform, Text, View } from 'react-native';
+import useFollows from '@/src/features/follow/hooks/useFollows';
 import { pubkeyStr } from './helpers';
 import {
   createPolycentricStore,
@@ -33,13 +34,6 @@ export interface PolycentricContextValue {
   refreshCurrentIdentity: () => Promise<void>;
 }
 
-interface FollowStatusResult {
-  isFollowing: boolean;
-  isLoading: boolean;
-  toggleFollow: () => Promise<void>;
-  refresh: () => void;
-}
-
 const PolycentricContext = createContext<PolycentricContextValue | null>(null);
 
 // Defaults for local development
@@ -134,19 +128,24 @@ export function PolycentricProvider({
         setClient(c);
         setStore(s);
         setCurrentIdentity(await resolveIdentity(c));
-        setIsLoading(false);
 
         // Only sync when we already have an identity to sync for.
         if (c.activeIdentityKey) {
-          void c.sync().catch((syncError) => {
-            console.warn('Initial Polycentric sync failed:', syncError);
-          });
+          await c
+            .sync()
+            .then(() => useFollows.getState().refresh(c))
+            .catch((syncError) => {
+              console.warn('Initial Polycentric sync failed:', syncError);
+            });
         }
 
+        setIsLoading(false);
+
         c.events.onKeyPairChanged(async () => {
           if (cancelled) return;
           setCurrentIdentity(await resolveIdentity(c));
           await s.getState().refreshIdentities();
+          await useFollows.getState().refresh(c);
         });
 
         // Identity onboarding (create / claim) publishes an Identity event,
@@ -263,17 +262,6 @@ export function useCurrentIdentity() {
   };
 }
 
-export function useFollowStatus(
-  _identityKey: string | null | undefined,
-): FollowStatusResult {
-  return {
-    isFollowing: false,
-    isLoading: false,
-    toggleFollow: async () => {},
-    refresh: () => {},
-  };
-}
-
 export function useUsername(_identityKey: string | null | undefined): string {
   const name = undefined;
 

apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx

@@ -21,10 +21,6 @@ export { useStore } from './store';
 export type { PolycentricStore, PolycentricStoreApi } from './store';
 
 // Profile screen hooks
-export {
-  useProfileScreenData,
-  type ProfileScreenData,
-} from './useProfileScreenData';
 export {
   useProfileEdit,
   type ProfileEditState,

apps/polycentric/src/common/lib/polycentric-hooks/index.ts

@@ -0,0 +1,62 @@
+import { Avatar, Text } from '@/src/common/components/primitives';
+import { openCompose } from '@/src/common/constants';
+import {
+  identiconUrl,
+  useCurrentIdentity,
+} from '@/src/common/lib/polycentric-hooks';
+import { useWebHover } from '@/src/common/lib/useWebHover';
+import { Atoms, useTheme, withHexOpacity } from '@/src/common/theme';
+import { Pressable, StyleSheet, View } from 'react-native';
+
+/**
+ * A non-interactive placeholder that looks like a composer input. Tapping
+ * anywhere on it opens the full compose modal.
+ */
+export function ComposerInput() {
+  const { identity: currentIdentity } = useCurrentIdentity();
+  const { theme } = useTheme();
+  const { hovered, onHoverIn, onHoverOut } = useWebHover();
+
+  if (!currentIdentity?.identityKey) return null;
+
+  const avatarUrl = identiconUrl(currentIdentity.identityKey);
+
+  const hoverOverlay =
+    theme.scheme === 'light'
+      ? withHexOpacity(theme.palette.neutral_500, '14')
+      : withHexOpacity(theme.palette.black, '28');
+
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel="New post"
+      onPress={() => openCompose()}
+      onHoverIn={onHoverIn}
+      onHoverOut={onHoverOut}
+      style={[
+        Atoms.flex_row,
+        Atoms.items_center,
+        Atoms.gap_lg,
+        Atoms.px_lg,
+        Atoms.py_md,
+        {
+          borderBottomWidth: 1,
+          borderBottomColor: withHexOpacity(theme.palette.neutral_500, '40'),
+          backgroundColor: theme.palette.background_primary,
+          overflow: 'hidden',
+        },
+      ]}
+    >
+      <Avatar source={{ uri: avatarUrl }} size="md" />
+      <Text variant="body" color="neutral_500" style={Atoms.flex_1}>
+        What&apos;s on your mind?
+      </Text>
+      {hovered ? (
+        <View
+          pointerEvents="none"
+          style={[StyleSheet.absoluteFill, { backgroundColor: hoverOverlay }]}
+        />
+      ) : null}
+    </Pressable>
+  );
+}

apps/polycentric/src/common/lib/polycentric-hooks/useProfileScreenData.ts

@@ -1 +1,2 @@
 export * from './ComposeSheetInner';
+export * from './ComposerInput';