Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix Space loading flashes and refresh conversations after posting

Anand Baburajan609aad984000
diff --git a/web/apps/space/src/components/MessagesPage.tsx b/web/apps/space/src/components/MessagesPage.tsx
index f8a565be9b..ece27c6ec9 100644
--- a/web/apps/space/src/components/MessagesPage.tsx
+++ b/web/apps/space/src/components/MessagesPage.tsx
@@ -118,6 +118,7 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
}) => {
const router = useSpaceRouter();
const {
+ postPublishPhase,
profile,
profileLoadError,
profileLoadStatus,
@@ -521,6 +522,10 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
void refreshConversations();
}, [profile?.spaceId, refreshConversations]);
+ React.useEffect(() => {
+ if (postPublishPhase == "posted") void refreshConversations();
+ }, [postPublishPhase, refreshConversations]);
+
React.useEffect(() => {
const previousSelectedSpaceId = previousSelectedSpaceIdRef.current;
previousSelectedSpaceIdRef.current = selectedSpaceId;
diff --git a/web/apps/space/src/pages/app/index.tsx b/web/apps/space/src/pages/app/index.tsx
index 3fdea0d55d..b92325b0cc 100644
--- a/web/apps/space/src/pages/app/index.tsx
+++ b/web/apps/space/src/pages/app/index.tsx
@@ -61,6 +61,7 @@ const Page: React.FC = () => {
const [isFriendsLoading, setIsFriendsLoading] = useState(true);
const [isFriendRequestsLoading, setIsFriendRequestsLoading] =
useState(true);
+ const [isHomeCacheLoading, setIsHomeCacheLoading] = useState(true);
const [hasLoadedHomeItems, setHasLoadedHomeItems] = useState(false);
const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =
useState(false);
@@ -105,6 +106,7 @@ const Page: React.FC = () => {
setIsLatestPostsLoading(true);
setIsFriendsLoading(true);
setIsFriendRequestsLoading(true);
+ setIsHomeCacheLoading(true);
setHasLoadedHomeItems(false);
void (async () => {
try {
@@ -147,15 +149,19 @@ const Page: React.FC = () => {
if (savedHomePosts) {
setLatestPosts(savedHomePosts.latestPosts);
setUnreadPosts(savedHomePosts.unreadPosts);
- setIsLatestPostsLoading(false);
}
- if (savedHomeItems) {
+ if (
+ savedHomeItems &&
+ (savedHomeItems.friends.length > 0 ||
+ savedHomeItems.friendRequests.length > 0)
+ ) {
setFriends(savedHomeItems.friends);
setFriendRequests(savedHomeItems.friendRequests);
setIsFriendsLoading(false);
setIsFriendRequestsLoading(false);
setHasLoadedHomeItems(true);
}
+ setIsHomeCacheLoading(false);
}),
]);
if (isCancelled()) return;
@@ -181,6 +187,7 @@ const Page: React.FC = () => {
setIsLatestPostsLoading(false);
setIsFriendsLoading(false);
setIsFriendRequestsLoading(false);
+ setIsHomeCacheLoading(false);
}
}
})();
@@ -247,6 +254,7 @@ const Page: React.FC = () => {
isLatestPostsLoading={isLatestPostsLoading}
isFriendsLoading={isFriendsLoading}
isFriendRequestsLoading={isFriendRequestsLoading}
+ isHomeCacheLoading={isHomeCacheLoading}
profile={profile}
profileLink={
profile
@@ -297,19 +305,24 @@ const Page: React.FC = () => {
const loadedFriends = await loadCurrentSpaceFriends(
profile.spaceId,
);
+ setIsLatestPostsLoading(true);
setFriendRequests((currentRequests) =>
currentRequests.filter(
(request) => request.requestId != requestID,
),
);
setFriends(loadedFriends);
- const refreshedHomePosts = await refreshSpaceHomePosts(
- profile.spaceId,
- loadedFriends,
- );
- if (refreshedHomePosts) {
- setLatestPosts(refreshedHomePosts.latestPosts);
- setUnreadPosts(refreshedHomePosts.unreadPosts);
+ try {
+ const refreshedHomePosts = await refreshSpaceHomePosts(
+ profile.spaceId,
+ loadedFriends,
+ );
+ if (refreshedHomePosts) {
+ setLatestPosts(refreshedHomePosts.latestPosts);
+ setUnreadPosts(refreshedHomePosts.unreadPosts);
+ }
+ } finally {
+ setIsLatestPostsLoading(false);
}
await refreshUnreadStatus(profile.spaceId);
}}
diff --git a/web/apps/space/src/screens/HomeScreen.tsx b/web/apps/space/src/screens/HomeScreen.tsx
index 6f070f152d..1ec4a1a8b0 100644
--- a/web/apps/space/src/screens/HomeScreen.tsx
+++ b/web/apps/space/src/screens/HomeScreen.tsx
@@ -76,6 +76,7 @@ interface HomeScreenProps {
isLatestPostsLoading?: boolean;
isFriendsLoading?: boolean;
isFriendRequestsLoading?: boolean;
+ isHomeCacheLoading?: boolean;
showInstallPrompt?: boolean;
onCreatePost?: (
image: SpaceDraftPostImage,
@@ -382,7 +383,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
isAvatarPending || Boolean(post && !postUnavailable && !imageUrl);
React.useEffect(() => {
- if (isLoading || !hasMediaToLoad || shouldLoadMedia) return;
+ if (!hasMediaToLoad || shouldLoadMedia) return;
const element = rootRef.current;
if (!element) return;
if (
@@ -404,7 +405,7 @@ export const FriendPostTile: React.FC<FriendPostTileProps> = ({
);
observer.observe(element);
return () => observer.disconnect();
- }, [hasMediaToLoad, isLoading, shouldLoadMedia]);
+ }, [hasMediaToLoad, shouldLoadMedia]);
React.useEffect(() => {
if (!shouldLoadMedia) return;
@@ -1009,6 +1010,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
isLatestPostsLoading = false,
isFriendsLoading = false,
isFriendRequestsLoading = false,
+ isHomeCacheLoading = false,
showInstallPrompt = false,
onCreatePost,
onAcceptFriendRequest,
@@ -1503,7 +1505,7 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
friend={friend}
imageUrl={imageUrl}
isAvatarPending={isAvatarPending}
- isLoading={isFriendsLoading || isLatestPostsLoading}
+ isLoading={isFriendsLoading || (isLatestPostsLoading && !item)}
isRead={isRead}
isUnavailable={isUnavailable}
onLoadAvatar={() => loadFriendAvatar(friend)}
@@ -1762,7 +1764,9 @@ export const HomeScreen: React.FC<HomeScreenProps> = ({
width: "100%",
}}
>
- <SpaceLoadingSpinner ariaLabel="Loading friends and requests" />
+ {!isHomeCacheLoading && (
+ <SpaceLoadingSpinner ariaLabel="Loading friends and requests" />
+ )}
</Box>
) : orderedHomeItems.length > 0 ? (
<Box