Merge upstream develop

Author: github-actions[bot]

apps/polycentric/app/[identityId]/edit.tsx

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

apps/polycentric/app/_layout.tsx

@@ -43,6 +43,14 @@ function RootStack() {
           contentStyle: { backgroundColor: 'transparent' },
         }}
       />
+      <Stack.Screen
+        name="[identityId]/edit"
+        options={{
+          presentation: 'transparentModal',
+          animation: 'none',
+          contentStyle: { backgroundColor: 'transparent' },
+        }}
+      />
     </Stack>
   );
 

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

@@ -198,13 +198,19 @@ export const LeftSidebar = memo(function LeftSidebar({
               <VerticalNav />
             </View>
             {/* 2nd Section (bottom) */}
-            <View style={[Atoms.py_md, Atoms.self_stretch]}>
+            <View
+              style={[
+                Atoms.py_md,
+                Atoms.self_stretch,
+                narrowSidebar && Atoms.align_center,
+              ]}
+            >
               {identity && (
                 <Button
-                  title="New Post"
+                  title={narrowSidebar ? '' : 'New Post'}
                   variant="primary"
                   size="md"
-                  fullWidth
+                  fullWidth={!narrowSidebar}
                   icon={({ size, color }) => (
                     <Ionicons name="add-circle" size={size} color={color} />
                   )}

apps/polycentric/src/common/components/primitives/Button.tsx

@@ -3,6 +3,7 @@ import { useWebHover } from '@/src/common/lib/useWebHover';
 import {
   Atoms,
   BorderRadius,
+  Spacing,
   useTheme,
   withHexOpacity,
   type BorderRadiusToken,
@@ -52,8 +53,18 @@ const SIZE_CONFIG: Record<
     borderRadius: BorderRadiusToken;
   }
 > = {
-  sm: { paddingV: 4, paddingH: 6, iconSize: 16, borderRadius: 'full' },
-  md: { paddingV: 12, paddingH: 18, iconSize: 20, borderRadius: 'full' },
+  sm: {
+    paddingV: 4,
+    paddingH: Spacing['lg'],
+    iconSize: 16,
+    borderRadius: 'full',
+  },
+  md: {
+    paddingV: 12,
+    paddingH: Spacing['xl'],
+    iconSize: 20,
+    borderRadius: 'full',
+  },
   lg: { paddingV: 18, paddingH: 24, iconSize: 24, borderRadius: 'full' },
 };
 
@@ -74,6 +85,10 @@ export function Button({
 
   const sizeConfig = SIZE_CONFIG[size];
   const borderRadius = BorderRadius[sizeConfig.borderRadius];
+  const iconOnly = !!icon && !title;
+  const paddingHorizontal = iconOnly
+    ? sizeConfig.paddingV
+    : sizeConfig.paddingH;
   const isDisabled = !!disabled;
   const iconColor = isDisabled
     ? withHexOpacity(theme.palette.neutral_500, '80')
@@ -100,7 +115,7 @@ export function Button({
           !fullWidth && styles.fitContent,
           {
             paddingVertical: sizeConfig.paddingV,
-            paddingHorizontal: sizeConfig.paddingH,
+            paddingHorizontal,
             borderRadius,
           },
           surfaceStyle,
@@ -109,24 +124,27 @@ export function Button({
         ]}
         {...props}
       >
-        <View style={[styles.content, icon && title && { marginLeft: -3 }]}>
+        <View style={[styles.content]}>
           {icon &&
             icon({
               size: sizeConfig.iconSize,
               color: iconColor,
             })}
-          <Text
-            fontWeight={FONT_WEIGHT}
-            color={isDisabled ? 'neutral_1000' : textColorMap[variant]}
-            style={
-              isDisabled
-                ? { color: withHexOpacity(theme.palette.neutral_500, '80') }
-                : undefined
-            }
-            numberOfLines={1}
-          >
-            {title}
-          </Text>
+          {!iconOnly && (
+            <Text
+              fontSize={size}
+              fontWeight={FONT_WEIGHT}
+              color={isDisabled ? 'neutral_1000' : textColorMap[variant]}
+              style={
+                isDisabled
+                  ? { color: withHexOpacity(theme.palette.neutral_500, '80') }
+                  : undefined
+              }
+              numberOfLines={1}
+            >
+              {title}
+            </Text>
+          )}
         </View>
       </Pressable>
     </Animated.View>

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

@@ -22,6 +22,7 @@ export const Routes = {
     search: '/search',
     claims: '/claims',
     profile: (identityId: string) => `/${identityId}` as const,
+    editProfile: (identityId: string) => `/${identityId}/edit` as const,
     post: (identityId: string, postId: string) =>
       `/${identityId}/post/${postId}` as const,
     settings: {

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

@@ -25,7 +25,10 @@ export {
   useProfileScreenData,
   type ProfileScreenData,
 } from './useProfileScreenData';
-export { useProfileEdit, type ProfileEditState } from './useProfileEdit';
+export {
+  useProfileEdit,
+  type ProfileEditState,
+} from '../../../features/profile/hooks/useProfileEdit';
 
 // Helpers
 export {

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

@@ -38,8 +38,9 @@ export function useProfileScreenData(
 
   const identityKey = identityIdParam ?? null;
 
-  const username = useUsername(identityKey);
-  const profile = useProfile(identityKey, { getIsAborted });
+  const fallbackUsername = useUsername(identityKey);
+  const profile = useProfile(identityKey);
+  const username = profile.name ?? fallbackUsername;
   const authorFeed = useAuthorFeed(identityIdParam, undefined, {
     getIsAborted,
   });

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

@@ -111,8 +111,6 @@ export function ComposeSheetInner({
 
       const event = await client.buildEvent(content);
 
-      console.log(event);
-
       const signedEvent = await client.signEvent(event);
 
       await client.commitEvent(signedEvent);

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

@@ -3,8 +3,8 @@ import { Routes } from '@/src/common/constants';
 import {
   identiconUrl,
   useCurrentIdentity,
-  useUsername,
 } from '@/src/common/lib/polycentric-hooks';
+import { useProfile } from '@/src/features/profile/hooks/useProfile';
 import { useWebHover } from '@/src/common/lib/useWebHover';
 import {
   Atoms,
@@ -21,7 +21,8 @@ export function IdentityHeader() {
   const { theme } = useTheme();
   const { hovered, onHoverIn, onHoverOut } = useWebHover();
 
-  const username = useUsername(currentIdentity?.identityKey);
+  const profile = useProfile(currentIdentity?.identityKey);
+  const username = profile.name ?? '';
 
   // This component shouldn't mount if a current identity is not set.
   if (!currentIdentity?.identityKey) {

apps/polycentric/src/features/post/Post.tsx

@@ -5,9 +5,9 @@ import {
   postIdToSequence,
   timeAgo,
   truncateName,
-  useUsername,
   type PostData,
 } from '@/src/common/lib/polycentric-hooks';
+import { useProfile } from '@/src/features/profile/hooks/useProfile';
 import { useWebHover } from '@/src/common/lib/useWebHover';
 import {
   Atoms,
@@ -42,7 +42,8 @@ export const Post = memo(function Post({
 
   const authorIdentity = post.identity ?? null;
 
-  const authorName = useUsername(authorIdentity);
+  const authorProfile = useProfile(authorIdentity);
+  const authorName = authorProfile.name ?? '';
 
   const rawContent = post.content ?? '';
   const [contentExpanded, setContentExpanded] = useState(false);