Merge upstream develop

Author: github-actions[bot]

.prettierignore

@@ -13,6 +13,10 @@ apps/polycentric/ios
 packages/react-native/android
 packages/react-native/ios
 packages/react-native/lib
+packages/react-native/src/Native*
+packages/react-native/src/uniffi-init.tsx
+apps/polycentric/.expo
+apps/polycentric/expo-env.d.ts
 packages/rs-core
 packages/rs-core-wasm-browser
 packages/rs-core-wasm-node

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

@@ -128,7 +128,7 @@ function Screen({
     <KeyboardAvoidingView
       style={[Atoms.flex_1, Atoms.flex_row, Atoms.w_full, Atoms.min_w_0]}
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      keyboardVerticalOffset={insets.bottom}
+      keyboardVerticalOffset={insets.top}
     >
       {children}
     </KeyboardAvoidingView>

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

@@ -6,5 +6,6 @@ export const DEFAULT_IDENTITY_NAME = 'Anon';
 export const TAB_BAR_HEIGHT = Platform.OS === 'ios' ? 80 : 56;
 
 export const FUTO_URL = 'https://futo.tech';
-export const SOURCE_CODE_URL = 'https://gitlab.futo.org/polycentric';
-export const REPORT_BUG_URL = 'https://www.futo.org';
+export const SOURCE_CODE_URL =
+  'https://gitlab.futo.org/polycentric/polycentric';
+export const REPORT_BUG_URL = 'https://chat.futo.org/login/';

apps/polycentric/src/features/core/identity/IdentityFooter.tsx

@@ -5,14 +5,14 @@ import {
 } from '@/src/common/components/primitives';
 import { Routes } from '@/src/common/constants';
 import { useCurrentIdentity } from '@/src/common/lib/polycentric-hooks';
-import { useProfile } from '@/src/features/profile/hooks/useProfile';
 import { useWebHover } from '@/src/common/lib/useWebHover';
 import {
   Atoms,
   BorderRadius,
   useTheme,
   withHexOpacity,
 } from '@/src/common/theme';
+import { useProfile } from '@/src/features/profile/hooks/useProfile';
 import { Ionicons } from '@expo/vector-icons';
 import { router } from 'expo-router';
 import { Pressable, StyleSheet, View } from 'react-native';
@@ -67,7 +67,8 @@ export function IdentityFooter({ compact = false }: IdentityFooterProps) {
     >
       {avatar}
       <Pressable
-        onPress={() => router.push(Routes.tabs.identitySwitch)}
+        // TODO  Route to identitySwitch when that is implemented
+        onPress={() => router.push(Routes.tabs.settings.identity)}
         onHoverIn={onHoverIn}
         onHoverOut={onHoverOut}
         hitSlop={10}

apps/polycentric/src/features/onboarding/OnboardingWelcomeScreen.tsx

@@ -1,33 +1,32 @@
-import { Button, Screen, Text } from '@/src/common/components';
+import { Button, Screen } from '@/src/common/components';
 import { Routes } from '@/src/common/constants/routes';
 import { Atoms } from '@/src/common/theme';
 import { router } from 'expo-router';
-import { useWindowDimensions, View } from 'react-native';
+import { View } from 'react-native';
 
 import { Image } from 'expo-image';
-import WEB_LOGO from '../../common/assets/images/polycentric-logo-with-text.png';
+import LOGO_WITH_TEXT from '../../common/assets/images/polycentric-logo-with-text.png';
 
 export default function OnboardingWelcomeScreen() {
-  const dimensions = useWindowDimensions();
   return (
     <Screen>
       <Screen.PrimaryColumn>
         <View style={[Atoms.flex_col, Atoms.flex_1, Atoms.mx_lg]}>
           <View
+            // Absolute column to vertically center the logo
+            // (not offset by the buttons)
             style={[
-              Atoms.flex_1,
+              Atoms.absolute,
+              Atoms.inset_0,
               Atoms.justify_center,
               Atoms.items_center,
-              Atoms.gap_2xl,
+              Atoms.p_2xl,
             ]}
           >
             <Image
-              source={WEB_LOGO}
+              source={LOGO_WITH_TEXT}
               contentFit="contain"
-              style={{
-                width: dimensions.width - 100,
-                height: dimensions.width,
-              }}
+              style={{ width: '100%', height: '100%' }}
             />
           </View>
           <View style={[Atoms.gap_md, Atoms.w_full, Atoms.mt_auto]}>

apps/polycentric/src/features/onboarding/SetDisplayNameScreen.tsx

@@ -55,7 +55,7 @@ export default function SetDisplayNameScreen() {
             </View>
           </View>
           <Button
-            style={Atoms.mt_auto}
+            style={[Atoms.mt_auto, Atoms.mb_md]}
             title="Continue"
             variant="primary"
             disabled={!canContinue}

apps/polycentric/src/features/settings/ServersSettingsScreen.tsx

@@ -82,22 +82,8 @@ export function ServersSettings({
 
   return (
     <View>
-      <SheetHeaderBlock
-        title="Servers"
-        onClose={() => void dismissSheet()}
-        trailing={
-          <View style={{ minWidth: 72, alignItems: 'flex-end' }}>
-            <LinkButton
-              title={isEditing ? 'Done' : 'Edit'}
-              underlineOnHover
-              onPress={() => {
-                setIsEditing((v) => !v);
-                setNewServerUrl('');
-              }}
-            />
-          </View>
-        }
-      />
+      {/* TODO: restore the Edit button once servers are part of the Identity document. */}
+      <SheetHeaderBlock title="Servers" onClose={() => void dismissSheet()} />
       <View style={[Atoms.p_lg, Atoms.gap_lg]}>
         {servers.length === 0 ? (
           <Text variant="secondary" color="neutral_500">

package.json

@@ -15,7 +15,8 @@
     "run:web": "pnpm -C apps/polycentric run web",
     "ubrn:android": "pnpm -C packages/react-native ubrn:android",
     "ubrn:ios": "sh -c 'if [ \"$(uname -s)\" = Darwin ]; then pnpm -C packages/react-native ubrn:ios; else echo Skipping ubrn:ios: macOS-only build; fi'",
-    "ubrn": "pnpm ubrn:android && pnpm ubrn:ios"
+    "ubrn": "pnpm ubrn:android && pnpm ubrn:ios",
+    "ubrn:clean": "pnpm -C packages/react-native ubrn:clean && pnpm -C packages/rs-core-uniffi-web clean"
   },
   "devDependencies": {
     "@types/react": "~19.2.10",

packages/react-native/cpp/.clang-format

@@ -0,0 +1,3 @@
+# Normalize ubrn output to be unformatted
+DisableFormat: true
+SortIncludes: Never

packages/react-native/package.json

@@ -38,7 +38,7 @@
   "scripts": {
     "ubrn:ios": "ubrn build ios --and-generate",
     "ubrn:android": "ubrn build android --and-generate",
-    "ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/index.*ts* src/generated/rn",
+    "ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/uniffi-init.tsx src/generated/rn",
     "dev": "bob build --watch",
     "clean": "del-cli android/build lib",
     "build": "bob build",