Merge upstream develop

Author: github-actions[bot]

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

@@ -35,8 +35,8 @@ export default function TabsLayout() {
         <NativeTabs.Trigger.Icon sf="bell" md="notifications" />
       </NativeTabs.Trigger>
 
-      <NativeTabs.Trigger name="trust">
-        <NativeTabs.Trigger.Label>Trust</NativeTabs.Trigger.Label>
+      <NativeTabs.Trigger name="verify">
+        <NativeTabs.Trigger.Label>Verify</NativeTabs.Trigger.Label>
         <NativeTabs.Trigger.Icon sf="checkmark.seal" md="verified" />
       </NativeTabs.Trigger>
 

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

@@ -0,0 +1 @@
+export { default } from '@/src/features/verify/VerifyScreen';

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

@@ -20,7 +20,7 @@
     "@expo/metro-runtime": "~55.0.11",
     "@expo/vector-icons": "^15.0.3",
     "@gorhom/bottom-sheet": "^5.2.8",
-    "@lodev09/react-native-true-sheet": "^3.0.4",
+    "@lodev09/react-native-true-sheet": "^3.10.1",
     "@noble/hashes": "catalog:",
     "@polycentric/react-native": "workspace:*",
     "@react-native-async-storage/async-storage": "^2.2.0",

apps/polycentric/package.json

@@ -61,6 +61,7 @@ export const IconsMap = {
   time: defineIcon(Ionicons, 'time-outline'),
   trash: defineIcon(Ionicons, 'trash-outline'),
   trashBin: defineIcon(Ionicons, 'trash-bin'),
+  verify: defineIcon(MaterialCommunityIcons, 'check-decagram-outline'),
 };
 
 export type IconName = keyof typeof IconsMap;

apps/polycentric/src/common/components/Icon.tsx

@@ -46,6 +46,8 @@ type CommonProps = {
   header?: ReactElement;
   /** Pinned footer element — bottom of the sheet (native) / card (web). */
   footer?: ReactElement;
+  /** Fired once the sheet has finished presenting. */
+  onPresented?: () => void;
 };
 
 export type SheetProps =
@@ -209,6 +211,7 @@ function NativeSheet({
       initialDetentIndex={0}
       dismissible={dismissible}
       scrollable={scrollable}
+      onDidPresent={() => props.onPresented?.()}
       onDidDismiss={() => {
         if (suppressOnCloseRef.current) {
           suppressOnCloseRef.current = false;
@@ -269,6 +272,7 @@ function WebModal({
   navigation,
   header,
   footer,
+  onPresented,
 }: WebInternalProps) {
   const { theme } = useTheme();
   const { width } = useWindowDimensions();
@@ -277,6 +281,12 @@ function WebModal({
   const isInline = open !== undefined;
   const { animatedStyle, fadeOut, isExiting } = useFadeTransition();
 
+  // Mirror native's `onPresented` once the modal has mounted.
+  useEffect(() => {
+    onPresented?.();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const close = useCallback(() => {
     if (isInline) fadeOut(() => onClose?.());
     else if (router.canGoBack()) router.back();

apps/polycentric/src/common/components/sheet/Sheet.tsx

@@ -5,7 +5,7 @@ import { Atoms, useTheme } from '@/src/common/theme';
 import { isWeb } from '@/src/common/util/platform';
 import { types } from '@polycentric/react-native';
 import { router } from 'expo-router';
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 import { ActivityIndicator } from 'react-native';
 import { ComposeSheetFooterBar } from './ComposeSheetFooterBar';
 import { ComposerFields } from './ComposerFields';
@@ -41,10 +41,14 @@ export function ComposeSheet({
     onClose,
   });
 
+  // Focus the field only after the sheet has presented (iOS fix)
+  const [autoFocus, setAutoFocus] = useState(false);
+
   return (
     <Sheet
       detents={[1]}
       scrollable
+      onPresented={() => setAutoFocus(true)}
       footer={
         <ComposeSheetFooterBar
           variant={isWeb ? 'web' : 'native'}
@@ -101,6 +105,7 @@ export function ComposeSheet({
           attachments={composer.attachments}
           submitting={composer.submitting}
           onRemoveAttachment={composer.handleRemoveAttachment}
+          autoFocus={autoFocus}
         />
       </Sheet.Content>
     </Sheet>

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

@@ -26,6 +26,8 @@ type ComposerFieldsProps = {
   attachments: Attachment[];
   submitting: boolean;
   onRemoveAttachment: (id: string) => void;
+  /** Auto-focus the text field.**/
+  autoFocus?: boolean;
 };
 
 /**
@@ -45,6 +47,7 @@ export function ComposerFields({
   attachments,
   submitting,
   onRemoveAttachment,
+  autoFocus = true,
 }: ComposerFieldsProps) {
   const { theme } = useTheme();
 
@@ -83,9 +86,12 @@ export function ComposerFields({
         ) : null}
         <View style={Atoms.flex_1}>
           <TextArea
+            // `autoFocus` only fires on mount, so re-key when it flips
+            // (false → true after the sheet presents) to actually focus.
+            key={autoFocus ? 'autofocus' : 'no-autofocus'}
             variant="plain"
             placeholder={placeholder}
-            autoFocus
+            autoFocus={autoFocus}
             value={text}
             onChangeText={setText}
             // disabled={submitting}

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

@@ -89,8 +89,12 @@ export function useComposer({
   const attachDisabled = submitting || attachments.length >= MAX_ATTACHMENTS;
 
   const handleClose = useCallback(() => {
-    if (!submitting) onClose();
-  }, [submitting, onClose]);
+    if (submitting) return;
+    onClose();
+    // Reset here too: the native compose tab stays mounted after closing,
+    // so the unmount reset below wouldn't fire for it.
+    resetComposer();
+  }, [submitting, onClose, resetComposer]);
 
   const handleAttachImage = useCallback(async () => {
     if (attachDisabled) return;
@@ -109,13 +113,34 @@ export function useComposer({
         height: asset.height,
       }));
     addAttachments(additions);
-  }, [attachDisabled, attachments.length, addAttachments]);
+    setError(null);
+  }, [attachDisabled, attachments.length, addAttachments, setError]);
 
   const handleRemoveAttachment = useCallback(
-    (id: string) => removeAttachment(id),
-    [removeAttachment],
+    (id: string) => {
+      removeAttachment(id);
+      setError(null);
+    },
+    [removeAttachment, setError],
+  );
+
+  // Editing the draft (text or images) clears any prior post error.
+  const handleTextChange = useCallback(
+    (next: string) => {
+      setText(next);
+      setError(null);
+    },
+    [setText, setError],
   );
 
+  // Reset the entire composer (text, attachments, submitting, error) when
+  // it closes (unmounts), so nothing carries over to the next open.
+  useEffect(() => {
+    return () => {
+      resetComposer();
+    };
+  }, [resetComposer]);
+
   // Auto-open the image picker once when the caller requested it
   // (e.g. tapping the attach icon in the inline composer).
   const attachOnMountFiredRef = useRef(false);
@@ -236,7 +261,7 @@ export function useComposer({
   return {
     // state
     text,
-    setText,
+    setText: handleTextChange,
     attachments,
     submitting,
     error,