Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Add sent request context to Space home

Anand Baburajan629200b124a7
diff --git a/web/apps/space/src/pages/layout-demo.tsx b/web/apps/space/src/pages/layout-demo.tsx
index 0c1da829ea..1163e2c6dd 100644
--- a/web/apps/space/src/pages/layout-demo.tsx
+++ b/web/apps/space/src/pages/layout-demo.tsx
@@ -43,17 +43,13 @@ const LayoutDemoPost: React.FC<LayoutDemoPostProps> = ({
: index == 1
? ("received" as const)
: undefined
- : count >= 2 && index == 0
- ? ("received" as const)
- : undefined;
- const seenPostIndex = showAllVariants ? 2 : count >= 3 ? 1 : undefined;
- const unseenPostIndex = showAllVariants
- ? 3
- : count >= 3
- ? 2
- : count >= 2
- ? 1
+ : count == 2 && index == 1
+ ? ("sent" as const)
+ : count >= 2 && index == 0
+ ? ("received" as const)
: undefined;
+ const seenPostIndex = showAllVariants ? 2 : count >= 3 ? 1 : undefined;
+ const unseenPostIndex = showAllVariants ? 3 : count >= 3 ? 2 : undefined;
const hasPlaceholderMedia = index == seenPostIndex;
const isUnread = index == unseenPostIndex;
const username = friendRequestDirection
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index e7a8843cde..dbfa797e40 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -726,7 +726,11 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
)}
{!isLoading &&
!post &&
- friendRequestDirection != "received" && (
+ friendRequestDirection != "received" &&
+ !(
+ friendRequestDirection == "sent" &&
+ showFriendRequestDetails
+ ) && (
<SpacePostBadge
backgroundColor="rgba(255, 255, 255, 0.82)"
color="#5A5A5A"
@@ -737,6 +741,51 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
: "No posts"}
</SpacePostBadge>
)}
+ {!isLoading &&
+ friendRequestDirection == "sent" &&
+ showFriendRequestDetails && (
+ <Box
+ aria-hidden
+ component="span"
+ title={`@${friend.username}’s posts will appear here`}
+ sx={{
+ bgcolor: "#FFFFFF",
+ borderRadius: "999px",
+ boxSizing: "border-box",
+ color: textSecondary,
+ display: "inline-flex",
+ fontFamily:
+ '"Inter Variable", Inter, sans-serif',
+ fontSize: 11,
+ fontWeight: 600,
+ left: "50%",
+ lineHeight: "17px",
+ maxWidth: "calc(100% - 16px)",
+ px: isTwoTileLayout ? "9px" : "14px",
+ py: isTwoTileLayout ? "8px" : "7px",
+ position: "absolute",
+ textAlign: "center",
+ top: "50%",
+ transform: "translate(-50%, -50%)",
+ whiteSpace: "nowrap",
+ width: "fit-content",
+ }}
+ >
+ <Box
+ component="span"
+ sx={{
+ minWidth: 0,
+ overflow: "hidden",
+ textOverflow: "ellipsis",
+ }}
+ >
+ @{friend.username}
+ </Box>
+ <Box component="span" sx={{ flexShrink: 0 }}>
+ ’s posts will appear here
+ </Box>
+ </Box>
+ )}
{!isLoading && postUnavailable && (
<SpacePostBadge
backgroundColor="rgba(255, 255, 255, 0.82)"