diff --git a/apps/mobile/src/components/ProfileView/ProfileView.tsx b/apps/mobile/src/components/ProfileView/ProfileView.tsx index 24c044ef1e..1882acffa1 100644 --- a/apps/mobile/src/components/ProfileView/ProfileView.tsx +++ b/apps/mobile/src/components/ProfileView/ProfileView.tsx @@ -83,10 +83,8 @@ export function ProfileView({ queryRef, shouldShowBackButton }: ProfileViewProps - - @@ -96,18 +94,15 @@ export function ProfileView({ queryRef, shouldShowBackButton }: ProfileViewProps - - + + + - - - - diff --git a/apps/mobile/src/components/ProfileView/ProfileViewHeader.tsx b/apps/mobile/src/components/ProfileView/ProfileViewHeader.tsx index 5a633ace87..2f44566a9c 100644 --- a/apps/mobile/src/components/ProfileView/ProfileViewHeader.tsx +++ b/apps/mobile/src/components/ProfileView/ProfileViewHeader.tsx @@ -90,11 +90,11 @@ export function ProfileViewHeader({ queryRef, selectedRoute, onRouteChange }: Pr counter: totalGalleries, }, { - name: 'Followers', - counter: totalFollowers, + name: 'Posts', }, { - name: 'Activity', + name: 'Followers', + counter: totalFollowers, }, ]; }, [totalGalleries, totalFollowers]); diff --git a/apps/web/pages/[username]/activity.tsx b/apps/web/pages/[username]/posts.tsx similarity index 91% rename from apps/web/pages/[username]/activity.tsx rename to apps/web/pages/[username]/posts.tsx index 6c059c8ed3..7a30e1c226 100644 --- a/apps/web/pages/[username]/activity.tsx +++ b/apps/web/pages/[username]/posts.tsx @@ -6,7 +6,7 @@ import { ITEMS_PER_PAGE, MAX_PIECES_DISPLAYED_PER_FEED_EVENT } from '~/component import { NOTES_PER_PAGE } from '~/components/Feed/Socialize/CommentsModal/CommentsModal'; import { GalleryNavbar } from '~/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavbar'; import { StandardSidebar } from '~/contexts/globalLayout/GlobalSidebar/StandardSidebar'; -import { activityQuery } from '~/generated/activityQuery.graphql'; +import { postsQuery } from '~/generated/postsQuery.graphql'; import { MetaTagProps } from '~/pages/_app'; import GalleryRoute from '~/scenes/_Router/GalleryRoute'; import UserActivityPage from '~/scenes/UserActivityPage/UserActivityPage'; @@ -16,8 +16,8 @@ import GalleryViewEmitter from '~/shared/components/GalleryViewEmitter'; import { PreloadQueryArgs } from '~/types/PageComponentPreloadQuery'; import { openGraphMetaTags } from '~/utils/openGraphMetaTags'; -const activityQueryNode = graphql` - query activityQuery( +const postsQueryNode = graphql` + query postsQuery( $username: String! $interactionsFirst: Int! $interactionsAfter: String @@ -41,11 +41,11 @@ const NON_EXISTENT_FEED_EVENT_ID = 'some-non-existent-feed-event-id'; type UserActivityProps = MetaTagProps & { username: string; - preloadedQuery: PreloadedQuery; + preloadedQuery: PreloadedQuery; }; export default function UserFeed({ username, preloadedQuery }: UserActivityProps) { - const query = usePreloadedQuery(activityQueryNode, preloadedQuery); + const query = usePreloadedQuery(postsQueryNode, preloadedQuery); return ( { if (query.username && typeof query.username === 'string' && !Array.isArray(query.eventId)) { - return loadQuery( + return loadQuery( relayEnvironment, - activityQueryNode, + postsQueryNode, { topEventId: query.eventId ?? NON_EXISTENT_FEED_EVENT_ID, username: query.username, diff --git a/apps/web/src/components/Notifications/Notification.tsx b/apps/web/src/components/Notifications/Notification.tsx index 6bb2e252bf..4450b3cd3d 100644 --- a/apps/web/src/components/Notifications/Notification.tsx +++ b/apps/web/src/components/Notifications/Notification.tsx @@ -142,7 +142,7 @@ export function Notification({ notificationRef, queryRef, toggleSubView }: Notif showCaret: false, handleClick: function navigateToUserActivityWithFeedEventAtTop() { if (username && eventId) { - push({ pathname: '/[username]/activity', query: { username, eventId } }); + push({ pathname: '/[username]/posts', query: { username, eventId } }); } hideDrawer(); }, diff --git a/apps/web/src/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavLinks.tsx b/apps/web/src/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavLinks.tsx index 1a8e4ccdd8..a56d94e68c 100644 --- a/apps/web/src/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavLinks.tsx +++ b/apps/web/src/contexts/globalLayout/GlobalNavbar/GalleryNavbar/GalleryNavLinks.tsx @@ -44,7 +44,7 @@ export function GalleryNavLinks({ username, queryRef }: Props) { const featuredRoute: Route = { pathname: '/[username]', query: { username } }; const galleriesRoute: Route = { pathname: '/[username]/galleries', query: { username } }; const followersRoute: Route = { pathname: '/[username]/followers', query: { username } }; - const activityRoute: Route = { pathname: '/[username]/activity', query: { username } }; + const postsRoute: Route = { pathname: '/[username]/posts', query: { username } }; return ( @@ -71,10 +71,10 @@ export function GalleryNavLinks({ username, queryRef }: Props) { - Activity + Posts ); }