From f7abbdc9b891ef1dae036cf2de1845509a69e711 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Fri, 25 Aug 2023 18:44:04 +0530
Subject: [PATCH 1/2] fix: my profile activity endpoint

---
 .../[workspaceSlug]/me/profile/activity.tsx   | 25 +++++++++----------
 apps/app/services/user.service.ts             |  4 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
index 148d738c016..eba97e1ec54 100644
--- a/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/profile/activity.tsx
@@ -25,18 +25,10 @@ const ProfileActivity = () => {
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
-  const { data: userActivity } = useSWR(USER_ACTIVITY, () => userService.getUserActivity());
-
-  if (!userActivity) {
-    return (
-      <Loader className="space-y-5">
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-        <Loader.Item height="40px" />
-      </Loader>
-    );
-  }
+  const { data: userActivity } = useSWR(
+    workspaceSlug ? USER_ACTIVITY : null,
+    workspaceSlug ? () => userService.getUserActivity(workspaceSlug.toString()) : null
+  );
 
   return (
     <WorkspaceAuthorizationLayout
@@ -56,7 +48,7 @@ const ProfileActivity = () => {
           </div>
           <SettingsNavbar profilePage />
         </div>
-        {userActivity && userActivity.results.length > 0 && (
+        {userActivity ? (
           <div>
             <ul role="list" className="-mb-4">
               {userActivity.results.map((activityItem: any, activityIdx: number) => {
@@ -226,6 +218,13 @@ const ProfileActivity = () => {
               })}
             </ul>
           </div>
+        ) : (
+          <Loader className="space-y-5">
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+            <Loader.Item height="40px" />
+          </Loader>
         )}
       </div>
     </WorkspaceAuthorizationLayout>
diff --git a/apps/app/services/user.service.ts b/apps/app/services/user.service.ts
index 98eea527881..aacd1094974 100644
--- a/apps/app/services/user.service.ts
+++ b/apps/app/services/user.service.ts
@@ -101,8 +101,8 @@ class UserService extends APIService {
       });
   }
 
-  async getUserActivity(): Promise<IUserActivityResponse> {
-    return this.get("/api/users/activities/")
+  async getUserActivity(workspaceSlug: string): Promise<IUserActivityResponse> {
+    return this.get(`/api/users/workspaces/${workspaceSlug}/activities/`)
       .then((response) => response?.data)
       .catch((error) => {
         throw error?.response?.data;

From 0477714dce0c5e16a0e6d0b853fca030af45d1ca Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <aaryankhandu123@gmail.com>
Date: Mon, 28 Aug 2023 13:28:40 +0530
Subject: [PATCH 2/2] chore: update service name

---
 apps/app/services/user.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/services/user.service.ts b/apps/app/services/user.service.ts
index aacd1094974..0e5def647bd 100644
--- a/apps/app/services/user.service.ts
+++ b/apps/app/services/user.service.ts
@@ -101,7 +101,7 @@ class UserService extends APIService {
       });
   }
 
-  async getUserActivity(workspaceSlug: string): Promise<IUserActivityResponse> {
+  async getUserWorkspaceActivity(workspaceSlug: string): Promise<IUserActivityResponse> {
     return this.get(`/api/users/workspaces/${workspaceSlug}/activities/`)
       .then((response) => response?.data)
       .catch((error) => {