From 8638170a98a26994ab929ff35ac97414f28b1d68 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:40:00 +0530
Subject: [PATCH 01/20] fix: cycles and modules sidebar mutation (#831)

---
 .../core/existing-issues-list-modal.tsx       |  17 ++-
 apps/app/components/core/issues-view.tsx      |   2 +-
 apps/app/components/issues/modal.tsx          |  12 +-
 .../issues/view-select/assignee.tsx           |   4 +-
 .../issues/view-select/due-date.tsx           |  83 ++++++------
 .../issues/view-select/estimate.tsx           |  21 +--
 .../issues/view-select/priority.tsx           | 127 +++++++++---------
 .../components/issues/view-select/state.tsx   |   4 +-
 8 files changed, 153 insertions(+), 117 deletions(-)

diff --git a/apps/app/components/core/existing-issues-list-modal.tsx b/apps/app/components/core/existing-issues-list-modal.tsx
index 4d9ec5909..2e255ae19 100644
--- a/apps/app/components/core/existing-issues-list-modal.tsx
+++ b/apps/app/components/core/existing-issues-list-modal.tsx
@@ -19,7 +19,12 @@ import { LayerDiagonalIcon } from "components/icons";
 // types
 import { IIssue } from "types";
 // fetch-keys
-import { CYCLE_ISSUES_WITH_PARAMS, MODULE_ISSUES_WITH_PARAMS } from "constants/fetch-keys";
+import {
+  CYCLE_DETAILS,
+  CYCLE_ISSUES_WITH_PARAMS,
+  MODULE_DETAILS,
+  MODULE_ISSUES_WITH_PARAMS,
+} from "constants/fetch-keys";
 
 type FormInput = {
   issues: string[];
@@ -76,8 +81,14 @@ export const ExistingIssuesListModal: React.FC<Props> = ({
     }
 
     await handleOnSubmit(data);
-    if (cycleId) mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
-    if (moduleId) mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+    if (cycleId) {
+      mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId as string, params));
+      mutate(CYCLE_DETAILS(cycleId as string));
+    }
+    if (moduleId) {
+      mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+      mutate(MODULE_DETAILS(moduleId as string));
+    }
 
     handleClose();
 
diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index b8f2bd39c..c13dacf0a 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -234,7 +234,7 @@ export const IssuesView: React.FC<Props> = ({
             )
               trackEventServices.trackIssueMarkedAsDoneEvent({
                 workspaceSlug,
-                workspaceId: draggedItem.workspace_detail.id,
+                workspaceId: draggedItem.workspace,
                 projectName: draggedItem.project_detail.name,
                 projectIdentifier: draggedItem.project_detail.identifier,
                 projectId,
diff --git a/apps/app/components/issues/modal.tsx b/apps/app/components/issues/modal.tsx
index ee2c9a89c..47fe6e871 100644
--- a/apps/app/components/issues/modal.tsx
+++ b/apps/app/components/issues/modal.tsx
@@ -29,6 +29,8 @@ import {
   PROJECT_ISSUES_LIST_WITH_PARAMS,
   CYCLE_ISSUES_WITH_PARAMS,
   MODULE_ISSUES_WITH_PARAMS,
+  CYCLE_DETAILS,
+  MODULE_DETAILS,
 } from "constants/fetch-keys";
 
 export interface IssuesModalProps {
@@ -101,7 +103,10 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
         issues: [issueId],
       })
       .then(() => {
-        mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId, params));
+        if (cycleId) {
+          mutate(CYCLE_ISSUES_WITH_PARAMS(cycleId, params));
+          mutate(CYCLE_DETAILS(cycleId as string));
+        }
       });
   };
 
@@ -113,7 +118,10 @@ export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = ({
         issues: [issueId],
       })
       .then(() => {
-        mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+        if (moduleId) {
+          mutate(MODULE_ISSUES_WITH_PARAMS(moduleId as string, params));
+          mutate(MODULE_DETAILS(moduleId as string));
+        }
       });
   };
 
diff --git a/apps/app/components/issues/view-select/assignee.tsx b/apps/app/components/issues/view-select/assignee.tsx
index 819b7b696..adfd078a6 100644
--- a/apps/app/components/issues/view-select/assignee.tsx
+++ b/apps/app/components/issues/view-select/assignee.tsx
@@ -75,8 +75,8 @@ export const ViewAssigneeSelect: React.FC<Props> = ({
 
         trackEventServices.trackIssuePartialPropertyUpdateEvent(
           {
-            workspaceSlug: issue.workspace_detail.slug,
-            workspaceId: issue.workspace_detail.id,
+            workspaceSlug,
+            workspaceId: issue.workspace,
             projectId: issue.project_detail.id,
             projectIdentifier: issue.project_detail.identifier,
             projectName: issue.project_detail.name,
diff --git a/apps/app/components/issues/view-select/due-date.tsx b/apps/app/components/issues/view-select/due-date.tsx
index dd6d3302e..61aad5766 100644
--- a/apps/app/components/issues/view-select/due-date.tsx
+++ b/apps/app/components/issues/view-select/due-date.tsx
@@ -1,3 +1,5 @@
+import { useRouter } from "next/router";
+
 // ui
 import { CustomDatePicker, Tooltip } from "components/ui";
 // helpers
@@ -13,41 +15,46 @@ type Props = {
   isNotAllowed: boolean;
 };
 
-export const ViewDueDateSelect: React.FC<Props> = ({ issue, partialUpdateIssue, isNotAllowed }) => (
-  <Tooltip tooltipHeading="Due Date" tooltipContent={issue.target_date ?? "N/A"}>
-    <div
-      className={`group relative ${
-        issue.target_date === null
-          ? ""
-          : issue.target_date < new Date().toISOString()
-          ? "text-red-600"
-          : findHowManyDaysLeft(issue.target_date) <= 3 && "text-orange-400"
-      }`}
-    >
-      <CustomDatePicker
-        placeholder="N/A"
-        value={issue?.target_date}
-        onChange={(val) => {
-          partialUpdateIssue({
-            target_date: val,
-            priority: issue.priority,
-            state: issue.state,
-          });
-          trackEventServices.trackIssuePartialPropertyUpdateEvent(
-            {
-              workspaceSlug: issue.workspace_detail.slug,
-              workspaceId: issue.workspace_detail.id,
-              projectId: issue.project_detail.id,
-              projectIdentifier: issue.project_detail.identifier,
-              projectName: issue.project_detail.name,
-              issueId: issue.id,
-            },
-            "ISSUE_PROPERTY_UPDATE_DUE_DATE"
-          );
-        }}
-        className={issue?.target_date ? "w-[6.5rem]" : "w-[3rem] text-center"}
-        disabled={isNotAllowed}
-      />
-    </div>
-  </Tooltip>
-);
+export const ViewDueDateSelect: React.FC<Props> = ({ issue, partialUpdateIssue, isNotAllowed }) => {
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  return (
+    <Tooltip tooltipHeading="Due Date" tooltipContent={issue.target_date ?? "N/A"}>
+      <div
+        className={`group relative ${
+          issue.target_date === null
+            ? ""
+            : issue.target_date < new Date().toISOString()
+            ? "text-red-600"
+            : findHowManyDaysLeft(issue.target_date) <= 3 && "text-orange-400"
+        }`}
+      >
+        <CustomDatePicker
+          placeholder="N/A"
+          value={issue?.target_date}
+          onChange={(val) => {
+            partialUpdateIssue({
+              target_date: val,
+              priority: issue.priority,
+              state: issue.state,
+            });
+            trackEventServices.trackIssuePartialPropertyUpdateEvent(
+              {
+                workspaceSlug,
+                workspaceId: issue.workspace,
+                projectId: issue.project_detail.id,
+                projectIdentifier: issue.project_detail.identifier,
+                projectName: issue.project_detail.name,
+                issueId: issue.id,
+              },
+              "ISSUE_PROPERTY_UPDATE_DUE_DATE"
+            );
+          }}
+          className={issue?.target_date ? "w-[6.5rem]" : "w-[3rem] text-center"}
+          disabled={isNotAllowed}
+        />
+      </div>
+    </Tooltip>
+  );
+};
diff --git a/apps/app/components/issues/view-select/estimate.tsx b/apps/app/components/issues/view-select/estimate.tsx
index 5062950f3..e3dbb2028 100644
--- a/apps/app/components/issues/view-select/estimate.tsx
+++ b/apps/app/components/issues/view-select/estimate.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 
+import { useRouter } from "next/router";
+
+// services
+import trackEventServices from "services/track-event.service";
+// hooks
+import useEstimateOption from "hooks/use-estimate-option";
 // ui
 import { CustomSelect, Tooltip } from "components/ui";
 // icons
-import { getPriorityIcon } from "components/icons/priority-icon";
+import { PlayIcon } from "@heroicons/react/24/outline";
 // types
 import { IIssue } from "types";
-// constants
-import { PRIORITIES } from "constants/project";
-// services
-import trackEventServices from "services/track-event.service";
-import useEstimateOption from "hooks/use-estimate-option";
-import { PlayIcon } from "@heroicons/react/24/outline";
 
 type Props = {
   issue: IIssue;
@@ -28,6 +28,9 @@ export const ViewEstimateSelect: React.FC<Props> = ({
   selfPositioned = false,
   isNotAllowed,
 }) => {
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
   const { isEstimateActive, estimatePoints } = useEstimateOption(issue.estimate_point);
 
   const estimateValue = estimatePoints?.find((e) => e.key === issue.estimate_point)?.value;
@@ -41,8 +44,8 @@ export const ViewEstimateSelect: React.FC<Props> = ({
         partialUpdateIssue({ estimate_point: val });
         trackEventServices.trackIssuePartialPropertyUpdateEvent(
           {
-            workspaceSlug: issue.workspace_detail.slug,
-            workspaceId: issue.workspace_detail.id,
+            workspaceSlug,
+            workspaceId: issue.workspace,
             projectId: issue.project_detail.id,
             projectIdentifier: issue.project_detail.identifier,
             projectName: issue.project_detail.name,
diff --git a/apps/app/components/issues/view-select/priority.tsx b/apps/app/components/issues/view-select/priority.tsx
index 105978a04..11cd4e698 100644
--- a/apps/app/components/issues/view-select/priority.tsx
+++ b/apps/app/components/issues/view-select/priority.tsx
@@ -1,5 +1,7 @@
 import React from "react";
 
+import { useRouter } from "next/router";
+
 // ui
 import { CustomSelect, Tooltip } from "components/ui";
 // icons
@@ -25,63 +27,68 @@ export const ViewPrioritySelect: React.FC<Props> = ({
   position = "left",
   selfPositioned = false,
   isNotAllowed,
-}) => (
-  <CustomSelect
-    value={issue.priority}
-    onChange={(data: string) => {
-      partialUpdateIssue({ priority: data });
-      trackEventServices.trackIssuePartialPropertyUpdateEvent(
-        {
-          workspaceSlug: issue.workspace_detail.slug,
-          workspaceId: issue.workspace_detail.id,
-          projectId: issue.project_detail.id,
-          projectIdentifier: issue.project_detail.identifier,
-          projectName: issue.project_detail.name,
-          issueId: issue.id,
-        },
-        "ISSUE_PROPERTY_UPDATE_PRIORITY"
-      );
-    }}
-    maxHeight="md"
-    customButton={
-      <button
-        type="button"
-        className={`grid h-6 w-6 place-items-center rounded ${
-          isNotAllowed ? "cursor-not-allowed" : "cursor-pointer"
-        } items-center shadow-sm focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 ${
-          issue.priority === "urgent"
-            ? "bg-red-100 text-red-600 hover:bg-red-100"
-            : issue.priority === "high"
-            ? "bg-orange-100 text-orange-500 hover:bg-orange-100"
-            : issue.priority === "medium"
-            ? "bg-yellow-100 text-yellow-500 hover:bg-yellow-100"
-            : issue.priority === "low"
-            ? "bg-green-100 text-green-500 hover:bg-green-100"
-            : "bg-gray-100"
-        } border-none`}
-      >
-        <Tooltip tooltipHeading="Priority" tooltipContent={issue.priority ?? "None"}>
-          <span>
-            {getPriorityIcon(
-              issue.priority && issue.priority !== "" ? issue.priority ?? "" : "None",
-              "text-sm"
-            )}
-          </span>
-        </Tooltip>
-      </button>
-    }
-    noChevron
-    disabled={isNotAllowed}
-    position={position}
-    selfPositioned={selfPositioned}
-  >
-    {PRIORITIES?.map((priority) => (
-      <CustomSelect.Option key={priority} value={priority} className="capitalize">
-        <>
-          {getPriorityIcon(priority, "text-sm")}
-          {priority ?? "None"}
-        </>
-      </CustomSelect.Option>
-    ))}
-  </CustomSelect>
-);
+}) => {
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  return (
+    <CustomSelect
+      value={issue.priority}
+      onChange={(data: string) => {
+        partialUpdateIssue({ priority: data });
+        trackEventServices.trackIssuePartialPropertyUpdateEvent(
+          {
+            workspaceSlug,
+            workspaceId: issue.workspace,
+            projectId: issue.project_detail.id,
+            projectIdentifier: issue.project_detail.identifier,
+            projectName: issue.project_detail.name,
+            issueId: issue.id,
+          },
+          "ISSUE_PROPERTY_UPDATE_PRIORITY"
+        );
+      }}
+      maxHeight="md"
+      customButton={
+        <button
+          type="button"
+          className={`grid h-6 w-6 place-items-center rounded ${
+            isNotAllowed ? "cursor-not-allowed" : "cursor-pointer"
+          } items-center shadow-sm focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 ${
+            issue.priority === "urgent"
+              ? "bg-red-100 text-red-600 hover:bg-red-100"
+              : issue.priority === "high"
+              ? "bg-orange-100 text-orange-500 hover:bg-orange-100"
+              : issue.priority === "medium"
+              ? "bg-yellow-100 text-yellow-500 hover:bg-yellow-100"
+              : issue.priority === "low"
+              ? "bg-green-100 text-green-500 hover:bg-green-100"
+              : "bg-gray-100"
+          } border-none`}
+        >
+          <Tooltip tooltipHeading="Priority" tooltipContent={issue.priority ?? "None"}>
+            <span>
+              {getPriorityIcon(
+                issue.priority && issue.priority !== "" ? issue.priority ?? "" : "None",
+                "text-sm"
+              )}
+            </span>
+          </Tooltip>
+        </button>
+      }
+      noChevron
+      disabled={isNotAllowed}
+      position={position}
+      selfPositioned={selfPositioned}
+    >
+      {PRIORITIES?.map((priority) => (
+        <CustomSelect.Option key={priority} value={priority} className="capitalize">
+          <>
+            {getPriorityIcon(priority, "text-sm")}
+            {priority ?? "None"}
+          </>
+        </CustomSelect.Option>
+      ))}
+    </CustomSelect>
+  );
+};
diff --git a/apps/app/components/issues/view-select/state.tsx b/apps/app/components/issues/view-select/state.tsx
index bd90ec080..34ce8c82c 100644
--- a/apps/app/components/issues/view-select/state.tsx
+++ b/apps/app/components/issues/view-select/state.tsx
@@ -67,8 +67,8 @@ export const ViewStateSelect: React.FC<Props> = ({
         });
         trackEventServices.trackIssuePartialPropertyUpdateEvent(
           {
-            workspaceSlug: issue.workspace_detail.slug,
-            workspaceId: issue.workspace_detail.id,
+            workspaceSlug,
+            workspaceId: issue.workspace,
             projectId: issue.project_detail.id,
             projectIdentifier: issue.project_detail.identifier,
             projectName: issue.project_detail.name,

From 363c5c8ec4ede8bd04fc3bb42255d455c9c091e0 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:27:20 +0530
Subject: [PATCH 02/20] fix: join project mutation (#835)

* fix: join project mutation

* chore: remove imports
---
 .../auth-screens/project/join-project.tsx        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/app/components/auth-screens/project/join-project.tsx b/apps/app/components/auth-screens/project/join-project.tsx
index 1c2018db0..402fff42b 100644
--- a/apps/app/components/auth-screens/project/join-project.tsx
+++ b/apps/app/components/auth-screens/project/join-project.tsx
@@ -5,15 +5,16 @@ import { useRouter } from "next/router";
 
 import { mutate } from "swr";
 
+// services
+import projectService from "services/project.service";
 // ui
 import { PrimaryButton } from "components/ui";
-// icon
+// icons
 import { AssignmentClipboardIcon } from "components/icons";
-// img
+// images
 import JoinProjectImg from "public/auth/project-not-authorized.svg";
-import projectService from "services/project.service";
 // fetch-keys
-import { PROJECT_MEMBERS } from "constants/fetch-keys";
+import { USER_PROJECT_VIEW } from "constants/fetch-keys";
 
 export const JoinProject: React.FC = () => {
   const [isJoiningProject, setIsJoiningProject] = useState(false);
@@ -22,13 +23,16 @@ export const JoinProject: React.FC = () => {
   const { workspaceSlug, projectId } = router.query;
 
   const handleJoin = () => {
+    if (!workspaceSlug || !projectId) return;
+
     setIsJoiningProject(true);
     projectService
       .joinProject(workspaceSlug as string, {
         project_ids: [projectId as string],
       })
-      .then(() => {
-        mutate(PROJECT_MEMBERS(projectId as string));
+      .then(async () => {
+        await mutate(USER_PROJECT_VIEW(workspaceSlug.toString()));
+        setIsJoiningProject(false);
       })
       .catch((err) => {
         console.error(err);

From 5a36a7931f9d36d01c254f43be1d548305bb3ac3 Mon Sep 17 00:00:00 2001
From: Kunal Vishwakarma <116634168+kunalv17@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:15:06 +0530
Subject: [PATCH 03/20] fix: removed extra spaces form estimate points brackets
 (#837)

---
 .../components/estimates/single-estimate.tsx   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/app/components/estimates/single-estimate.tsx b/apps/app/components/estimates/single-estimate.tsx
index 005acb25d..ea41ae6b7 100644
--- a/apps/app/components/estimates/single-estimate.tsx
+++ b/apps/app/components/estimates/single-estimate.tsx
@@ -152,14 +152,16 @@ export const SingleEstimate: React.FC<Props> = ({
           </CustomMenu>
         </div>
         {estimatePoints && estimatePoints.length > 0 ? (
-          <div className="flex gap-2 text-sm text-gray-400">
-            Estimate points(
-            {estimatePoints.map((point, index) => (
-              <h6 key={point.id}>
-                {point.value}
-                {index !== estimatePoints.length - 1 && ","}{" "}
-              </h6>
-            ))}
+          <div className="flex text-sm text-gray-400">
+            Estimate points (
+            <span className="flex gap-1">
+              {estimatePoints.map((point, index) => (
+                <h6 key={point.id}>
+                  {point.value}
+                  {index !== estimatePoints.length - 1 && ","}{" "}
+                </h6>
+              ))}
+            </span>
             )
           </div>
         ) : (

From 61761fedc5ffdf435f66b3fc5ce8ba331f5175bc Mon Sep 17 00:00:00 2001
From: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:15:38 +0530
Subject: [PATCH 04/20] chore: remove view filter validation while creating or
 updating view (#836)

---
 apiserver/plane/api/serializers/view.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/apiserver/plane/api/serializers/view.py b/apiserver/plane/api/serializers/view.py
index 021bcfb72..076228ae0 100644
--- a/apiserver/plane/api/serializers/view.py
+++ b/apiserver/plane/api/serializers/view.py
@@ -25,22 +25,18 @@ class IssueViewSerializer(BaseSerializer):
 
     def create(self, validated_data):
         query_params = validated_data.get("query_data", {})
-
-        if not bool(query_params):
-            raise serializers.ValidationError(
-                {"query_data": ["Query data field cannot be empty"]}
-            )
-
-        validated_data["query"] = issue_filters(query_params, "POST")
+        if bool(query_params):
+            validated_data["query"] = issue_filters(query_params, "POST")
+        else:
+            validated_data["query"] = dict()
         return IssueView.objects.create(**validated_data)
 
     def update(self, instance, validated_data):
         query_params = validated_data.get("query_data", {})
-        if not bool(query_params):
-            raise serializers.ValidationError(
-                {"query_data": ["Query data field cannot be empty"]}
-            )
-
+        if bool(query_params):
+            validated_data["query"] = issue_filters(query_params, "POST")
+        else:
+            validated_data["query"] = dict()
         validated_data["query"] = issue_filters(query_params, "PATCH")
         return super().update(instance, validated_data)
 

From e23075b7b91debd57ccc0a1f14b5bea747a78548 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:30:48 +0530
Subject: [PATCH 05/20] chore: no estimates option, estimates activity (#838)

---
 apps/app/components/core/feeds.tsx            | 12 +++--
 apps/app/components/core/issues-view.tsx      | 51 +++++++++----------
 apps/app/components/issues/activity.tsx       | 17 ++++++-
 apps/app/components/issues/form.tsx           |  2 +-
 .../app/components/issues/select/estimate.tsx | 18 +++++--
 .../issues/sidebar-select/estimate.tsx        | 22 +++++---
 apps/app/components/issues/sidebar.tsx        |  2 +-
 .../issues/view-select/estimate.tsx           | 21 ++++++--
 apps/app/hooks/use-estimate-option.tsx        |  2 +-
 .../projects/[projectId]/issues/[issueId].tsx |  1 +
 apps/app/types/issues.d.ts                    |  2 +-
 11 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/apps/app/components/core/feeds.tsx b/apps/app/components/core/feeds.tsx
index 1a8e6ca24..c16fcd10f 100644
--- a/apps/app/components/core/feeds.tsx
+++ b/apps/app/components/core/feeds.tsx
@@ -73,6 +73,10 @@ const activityDetails: {
     message: "updated the description.",
     icon: <ChatBubbleBottomCenterTextIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
   },
+  estimate_point: {
+    message: "set the estimate point to",
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
+  },
   target_date: {
     message: "set the due date to",
     icon: <CalendarDaysIcon className="h-3 w-3 text-gray-500" aria-hidden="true" />,
@@ -136,8 +140,6 @@ export const Feeds: React.FC<any> = ({ activities }) => (
           action = `${activity.verb} the`;
         } else if (activity.field === "link") {
           action = `${activity.verb} the`;
-        } else if (activity.field === "estimate") {
-          action = "updated the";
         }
         // for values that are after the action clause
         let value: any = activity.new_value ? activity.new_value : activity.old_value;
@@ -188,8 +190,10 @@ export const Feeds: React.FC<any> = ({ activities }) => (
           value = "attachment";
         } else if (activity.field === "link") {
           value = "link";
-        } else if (activity.field === "estimate") {
-          value = "estimate";
+        } else if (activity.field === "estimate_point") {
+          value = activity.new_value
+            ? activity.new_value + ` Point${parseInt(activity.new_value ?? "", 10) > 1 ? "s" : ""}`
+            : "None";
         }
 
         if (activity.field === "comment") {
diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index c13dacf0a..fbe519ec7 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -388,36 +388,33 @@ export const IssuesView: React.FC<Props> = ({
         handleClose={() => setTransferIssuesModal(false)}
         isOpen={transferIssuesModal}
       />
-      <div>
-        <div className="flex items-center justify-between gap-2">
-          <FilterList filters={filters} setFilters={setFilters} />
-          {Object.keys(filters).length > 0 &&
-            nullFilters.length !== Object.keys(filters).length && (
-              <PrimaryButton
-                onClick={() => {
-                  if (viewId) {
-                    setFilters({}, true);
-                    setToastAlert({
-                      title: "View updated",
-                      message: "Your view has been updated",
-                      type: "success",
-                    });
-                  } else
-                    setCreateViewModal({
-                      query: filters,
-                    });
-                }}
-                className="flex items-center gap-2 text-sm"
-              >
-                {!viewId && <PlusIcon className="h-4 w-4" />}
-                {viewId ? "Update" : "Save"} view
-              </PrimaryButton>
-            )}
-        </div>
+      <div className="flex items-center justify-between gap-2 -mt-2">
+        <FilterList filters={filters} setFilters={setFilters} />
+        {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
+          <PrimaryButton
+            onClick={() => {
+              if (viewId) {
+                setFilters({}, true);
+                setToastAlert({
+                  title: "View updated",
+                  message: "Your view has been updated",
+                  type: "success",
+                });
+              } else
+                setCreateViewModal({
+                  query: filters,
+                });
+            }}
+            className="flex items-center gap-2 text-sm"
+          >
+            {!viewId && <PlusIcon className="h-4 w-4" />}
+            {viewId ? "Update" : "Save"} view
+          </PrimaryButton>
+        )}
       </div>
 
       {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-        <div className="mb-5 border-t" />
+        <div className="my-4 border-t" />
       )}
 
       <DragDropContext onDragEnd={handleOnDragEnd}>
diff --git a/apps/app/components/issues/activity.tsx b/apps/app/components/issues/activity.tsx
index f06ec625a..dd50f3bca 100644
--- a/apps/app/components/issues/activity.tsx
+++ b/apps/app/components/issues/activity.tsx
@@ -29,6 +29,7 @@ import { addSpaceIfCamelCase } from "helpers/string.helper";
 // types
 import { IIssueComment, IIssueLabels } from "types";
 import { PROJECT_ISSUES_ACTIVITY, PROJECT_ISSUE_LABELS } from "constants/fetch-keys";
+import useEstimateOption from "hooks/use-estimate-option";
 
 const activityDetails: {
   [key: string]: {
@@ -56,6 +57,10 @@ const activityDetails: {
     message: "set the cycle to",
     icon: <CyclesIcon height="12" width="12" color="#6b7280" />,
   },
+  estimate_point: {
+    message: "set the estimate point to",
+    icon: <PlayIcon className="h-3 w-3 text-gray-500 -rotate-90" aria-hidden="true" />,
+  },
   labels: {
     icon: <TagIcon height="12" width="12" color="#6b7280" />,
   },
@@ -107,6 +112,8 @@ export const IssueActivitySection: React.FC<Props> = () => {
   const router = useRouter();
   const { workspaceSlug, projectId, issueId } = router.query;
 
+  const { isEstimateActive, estimatePoints } = useEstimateOption();
+
   const { data: issueActivities, mutate: mutateIssueActivities } = useSWR(
     workspaceSlug && projectId && issueId ? PROJECT_ISSUES_ACTIVITY(issueId as string) : null,
     workspaceSlug && projectId && issueId
@@ -278,8 +285,14 @@ export const IssueActivitySection: React.FC<Props> = () => {
             value = "attachment";
           } else if (activityItem.field === "link") {
             value = "link";
-          } else if (activityItem.field === "estimate") {
-            value = "estimate";
+          } else if (activityItem.field === "estimate_point") {
+            value = activityItem.new_value
+              ? isEstimateActive
+                ? estimatePoints.find((e) => e.key === parseInt(activityItem.new_value ?? "", 10))
+                    ?.value
+                : activityItem.new_value +
+                  ` Point${parseInt(activityItem.new_value ?? "", 10) > 1 ? "s" : ""}`
+              : "None";
           }
 
           if ("field" in activityItem && activityItem.field !== "updated_by") {
diff --git a/apps/app/components/issues/form.tsx b/apps/app/components/issues/form.tsx
index 9051ed2a5..7c19b5b79 100644
--- a/apps/app/components/issues/form.tsx
+++ b/apps/app/components/issues/form.tsx
@@ -48,7 +48,7 @@ const defaultValues: Partial<IIssue> = {
   name: "",
   description: "",
   description_html: "<p></p>",
-  estimate_point: 0,
+  estimate_point: null,
   state: "",
   cycle: null,
   priority: null,
diff --git a/apps/app/components/issues/select/estimate.tsx b/apps/app/components/issues/select/estimate.tsx
index 661409b4f..813bd14f0 100644
--- a/apps/app/components/issues/select/estimate.tsx
+++ b/apps/app/components/issues/select/estimate.tsx
@@ -8,8 +8,8 @@ import { PlayIcon } from "@heroicons/react/24/outline";
 import useEstimateOption from "hooks/use-estimate-option";
 
 type Props = {
-  value: number;
-  onChange: (value: number) => void;
+  value: number | null;
+  onChange: (value: number | null) => void;
 };
 
 export const IssueEstimateSelect: React.FC<Props> = ({ value, onChange }) => {
@@ -24,18 +24,26 @@ export const IssueEstimateSelect: React.FC<Props> = ({ value, onChange }) => {
         <div className="flex items-center gap-2 text-xs">
           <PlayIcon className="h-4 w-4 text-gray-500 -rotate-90" />
           <span className={`${value ? "text-gray-600" : "text-gray-500"}`}>
-            {estimatePoints?.find((e) => e.key === value)?.value ?? "Estimate points"}
+            {estimatePoints?.find((e) => e.key === value)?.value ?? "Estimate"}
           </span>
         </div>
       }
       onChange={onChange}
       position="right"
-      width="w-full min-w-[6rem]"
+      width="w-full min-w-[8rem]"
       noChevron
     >
+      <CustomSelect.Option value={null}>
+        <>
+          <span>
+            <PlayIcon className="h-4 w-4 -rotate-90" />
+          </span>
+          None
+        </>
+      </CustomSelect.Option>
       {estimatePoints &&
         estimatePoints.map((point) => (
-          <CustomSelect.Option className="w-full " key={point.key} value={point.key}>
+          <CustomSelect.Option key={point.key} value={point.key}>
             <>
               <span>
                 <PlayIcon className="h-4 w-4 -rotate-90" />
diff --git a/apps/app/components/issues/sidebar-select/estimate.tsx b/apps/app/components/issues/sidebar-select/estimate.tsx
index 2491c0978..adf7bec97 100644
--- a/apps/app/components/issues/sidebar-select/estimate.tsx
+++ b/apps/app/components/issues/sidebar-select/estimate.tsx
@@ -1,17 +1,17 @@
 import React from "react";
 
+// hooks
+import useEstimateOption from "hooks/use-estimate-option";
 // ui
 import { CustomSelect } from "components/ui";
 // icons
-import { BanknotesIcon, PlayIcon } from "@heroicons/react/24/outline";
+import { PlayIcon } from "@heroicons/react/24/outline";
 // types
 import { UserAuth } from "types";
-import useEstimateOption from "hooks/use-estimate-option";
-// constants
 
 type Props = {
-  value: number;
-  onChange: (val: number) => void;
+  value: number | null;
+  onChange: (val: number | null) => void;
   userAuth: UserAuth;
 };
 
@@ -35,7 +35,7 @@ export const SidebarEstimateSelect: React.FC<Props> = ({ value, onChange, userAu
             <div className="flex items-center gap-2 text-xs">
               <PlayIcon className="h-4 w-4 text-gray-700 -rotate-90" />
               <span className={`${value ? "text-gray-600" : "text-gray-500"}`}>
-                {estimatePoints?.find((e) => e.key === value)?.value ?? "Estimate points"}
+                {estimatePoints?.find((e) => e.key === value)?.value ?? "Estimate"}
               </span>
             </div>
           }
@@ -44,9 +44,17 @@ export const SidebarEstimateSelect: React.FC<Props> = ({ value, onChange, userAu
           width="w-full"
           disabled={isNotAllowed}
         >
+          <CustomSelect.Option value={null}>
+            <>
+              <span>
+                <PlayIcon className="h-4 w-4 -rotate-90" />
+              </span>
+              None
+            </>
+          </CustomSelect.Option>
           {estimatePoints &&
             estimatePoints.map((point) => (
-              <CustomSelect.Option className="w-full " key={point.key} value={point.key}>
+              <CustomSelect.Option key={point.key} value={point.key}>
                 <>
                   <span>
                     <PlayIcon className="h-4 w-4 -rotate-90" />
diff --git a/apps/app/components/issues/sidebar.tsx b/apps/app/components/issues/sidebar.tsx
index a9c6149a6..09eef138e 100644
--- a/apps/app/components/issues/sidebar.tsx
+++ b/apps/app/components/issues/sidebar.tsx
@@ -294,7 +294,7 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
               render={({ field: { value } }) => (
                 <SidebarEstimateSelect
                   value={value}
-                  onChange={(val: number) => submitChanges({ estimate_point: val })}
+                  onChange={(val: number | null) => submitChanges({ estimate_point: val })}
                   userAuth={memberRole}
                 />
               )}
diff --git a/apps/app/components/issues/view-select/estimate.tsx b/apps/app/components/issues/view-select/estimate.tsx
index e3dbb2028..a44c01ce0 100644
--- a/apps/app/components/issues/view-select/estimate.tsx
+++ b/apps/app/components/issues/view-select/estimate.tsx
@@ -58,7 +58,7 @@ export const ViewEstimateSelect: React.FC<Props> = ({
         <Tooltip tooltipHeading="Estimate" tooltipContent={estimateValue}>
           <div className="flex items-center gap-1 text-gray-500">
             <PlayIcon className="h-3.5 w-3.5 -rotate-90" />
-            {estimateValue}
+            {estimateValue ?? "Estimate"}
           </div>
         </Tooltip>
       }
@@ -67,11 +67,24 @@ export const ViewEstimateSelect: React.FC<Props> = ({
       disabled={isNotAllowed}
       position={position}
       selfPositioned={selfPositioned}
-      width="w-full min-w-[6rem]"
+      width="w-full min-w-[8rem]"
     >
+      <CustomSelect.Option value={null}>
+        <>
+          <span>
+            <PlayIcon className="h-4 w-4 -rotate-90" />
+          </span>
+          None
+        </>
+      </CustomSelect.Option>
       {estimatePoints?.map((estimate) => (
-        <CustomSelect.Option key={estimate.id} value={estimate.key} className="capitalize">
-          <>{estimate.value}</>
+        <CustomSelect.Option key={estimate.id} value={estimate.key}>
+          <>
+            <span>
+              <PlayIcon className="h-4 w-4 -rotate-90" />
+            </span>
+            {estimate.value}
+          </>
         </CustomSelect.Option>
       ))}
     </CustomSelect>
diff --git a/apps/app/hooks/use-estimate-option.tsx b/apps/app/hooks/use-estimate-option.tsx
index 664b1af87..ef35503e7 100644
--- a/apps/app/hooks/use-estimate-option.tsx
+++ b/apps/app/hooks/use-estimate-option.tsx
@@ -13,7 +13,7 @@ import { orderArrayBy } from "helpers/array.helper";
 // fetch-keys
 import { ESTIMATE_POINTS_LIST } from "constants/fetch-keys";
 
-const useEstimateOption = (estimateKey?: number) => {
+const useEstimateOption = (estimateKey?: number | null) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
index 3f120741e..b2ebf721d 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
@@ -34,6 +34,7 @@ const defaultValues = {
   name: "",
   description: "",
   description_html: "",
+  estimate_point: null,
   state: "",
   assignees_list: [],
   priority: "low",
diff --git a/apps/app/types/issues.d.ts b/apps/app/types/issues.d.ts
index 7094b5ce8..a7fc92163 100644
--- a/apps/app/types/issues.d.ts
+++ b/apps/app/types/issues.d.ts
@@ -87,7 +87,7 @@ export interface IIssue {
   description: any;
   description_html: any;
   description_stripped: any;
-  estimate_point: number;
+  estimate_point: number | null;
   id: string;
   issue_cycle: IIssueCycle | null;
   issue_link: {

From 3e436179fec5bf6124533b7399f5599e642ef8d4 Mon Sep 17 00:00:00 2001
From: Kunal Vishwakarma <116634168+kunalv17@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:54:22 +0530
Subject: [PATCH 06/20] chore: added default state for issues (#840)

---
 apps/app/components/issues/select/state.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/app/components/issues/select/state.tsx b/apps/app/components/issues/select/state.tsx
index eeb08bfa3..f1fd1d22b 100644
--- a/apps/app/components/issues/select/state.tsx
+++ b/apps/app/components/issues/select/state.tsx
@@ -48,6 +48,7 @@ export const IssueStateSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
   }));
 
   const selectedOption = states?.find((s) => s.id === value);
+  const currentDefaultState = states.find((s) => s.default);
 
   return (
     <CustomSearchSelect
@@ -58,11 +59,12 @@ export const IssueStateSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
         <div className="flex items-center gap-2 text-gray-500">
           {selectedOption ? (
             getStateGroupIcon(selectedOption.group, "16", "16", selectedOption.color)
+          ) : currentDefaultState ? (
+            getStateGroupIcon(currentDefaultState.group, "16", "16", currentDefaultState.color)
           ) : (
             <Squares2X2Icon className="h-4 w-4" />
           )}
-
-          {selectedOption?.name ?? "State"}
+          {selectedOption?.name ? selectedOption.name : currentDefaultState?.name ?? "State"}
         </div>
       }
       footerOption={

From ac98381f23d5151735e3fa7117adbd7ce0e690a8 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 12:00:30 +0530
Subject: [PATCH 07/20] chore: remove estimate option from my issues (#839)

---
 .../pages/[workspaceSlug]/me/my-issues.tsx    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
index fb0b7266a..ce75ca9dd 100644
--- a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
@@ -72,20 +72,24 @@ const MyIssuesPage: NextPage = () => {
                         <div className="relative flex flex-col gap-1">
                           <h4 className="text-base text-gray-600">Properties</h4>
                           <div className="flex flex-wrap items-center gap-2">
-                            {Object.keys(properties).map((key) => (
-                              <button
-                                key={key}
-                                type="button"
-                                className={`rounded border border-theme px-2 py-1 text-xs capitalize ${
-                                  properties[key as keyof Properties]
-                                    ? "border-theme bg-theme text-white"
-                                    : ""
-                                }`}
-                                onClick={() => setProperties(key as keyof Properties)}
-                              >
-                                {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
-                              </button>
-                            ))}
+                            {Object.keys(properties).map((key) => {
+                              if (key === "estimate") return null;
+
+                              return (
+                                <button
+                                  key={key}
+                                  type="button"
+                                  className={`rounded border border-theme px-2 py-1 text-xs capitalize ${
+                                    properties[key as keyof Properties]
+                                      ? "border-theme bg-theme text-white"
+                                      : ""
+                                  }`}
+                                  onClick={() => setProperties(key as keyof Properties)}
+                                >
+                                  {key === "key" ? "ID" : replaceUnderscoreIfSnakeCase(key)}
+                                </button>
+                              );
+                            })}
                           </div>
                         </div>
                       </div>

From 365c758a25e8215c7aad8120073cc7ffae0dfd26 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 17 Apr 2023 12:24:30 +0530
Subject: [PATCH 08/20] fix: create update view modal fix (#842)

---
 apps/app/components/core/issues-view.tsx |  2 +-
 apps/app/components/views/form.tsx       | 13 ++++++++++---
 apps/app/components/views/modal.tsx      |  4 +++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index fbe519ec7..1c0cc203e 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -364,7 +364,7 @@ export const IssuesView: React.FC<Props> = ({
       <CreateUpdateViewModal
         isOpen={createViewModal !== null}
         handleClose={() => setCreateViewModal(null)}
-        data={createViewModal}
+        preLoadedData={createViewModal}
       />
       <CreateUpdateIssueModal
         isOpen={createIssueModal && preloadedData?.actionType === "createIssue"}
diff --git a/apps/app/components/views/form.tsx b/apps/app/components/views/form.tsx
index 891410241..827c68d56 100644
--- a/apps/app/components/views/form.tsx
+++ b/apps/app/components/views/form.tsx
@@ -1,6 +1,5 @@
 import { useEffect } from "react";
 
-
 import { useForm } from "react-hook-form";
 // ui
 import { Input, PrimaryButton, SecondaryButton, TextArea } from "components/ui";
@@ -16,6 +15,7 @@ type Props = {
   handleClose: () => void;
   status: boolean;
   data?: IView | null;
+  preLoadedData?: Partial<IView> | null;
 };
 
 const defaultValues: Partial<IView> = {
@@ -23,7 +23,13 @@ const defaultValues: Partial<IView> = {
   description: "",
 };
 
-export const ViewForm: React.FC<Props> = ({ handleFormSubmit, handleClose, status, data }) => {
+export const ViewForm: React.FC<Props> = ({
+  handleFormSubmit,
+  handleClose,
+  status,
+  data,
+  preLoadedData,
+}) => {
   const {
     register,
     formState: { errors, isSubmitting },
@@ -47,9 +53,10 @@ export const ViewForm: React.FC<Props> = ({ handleFormSubmit, handleClose, statu
   useEffect(() => {
     reset({
       ...defaultValues,
+      ...preLoadedData,
       ...data,
     });
-  }, [data, reset]);
+  }, [data, preLoadedData, reset]);
 
   useEffect(() => {
     if (status && data) {
diff --git a/apps/app/components/views/modal.tsx b/apps/app/components/views/modal.tsx
index 565072b3b..053fbea58 100644
--- a/apps/app/components/views/modal.tsx
+++ b/apps/app/components/views/modal.tsx
@@ -21,9 +21,10 @@ type Props = {
   isOpen: boolean;
   handleClose: () => void;
   data?: IView | null;
+  preLoadedData?: Partial<IView> | null ;
 };
 
-export const CreateUpdateViewModal: React.FC<Props> = ({ isOpen, handleClose, data }) => {
+export const CreateUpdateViewModal: React.FC<Props> = ({ isOpen, handleClose, data, preLoadedData }) => {
   const router = useRouter();
   const { workspaceSlug, projectId } = router.query;
 
@@ -133,6 +134,7 @@ export const CreateUpdateViewModal: React.FC<Props> = ({ isOpen, handleClose, da
                   handleClose={handleClose}
                   status={data ? true : false}
                   data={data}
+                  preLoadedData={preLoadedData}
                 />
               </Dialog.Panel>
             </Transition.Child>

From 3f401b0fc540aa072341f37aab8912d0e44b5a13 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 17 Apr 2023 13:30:39 +0530
Subject: [PATCH 09/20] feat: page tab context (#845)

* feat: page list tab context added

* fix: build fix
---
 apps/app/hooks/use-local-storage.tsx          |  1 +
 .../projects/[projectId]/pages/index.tsx      | 43 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps/app/hooks/use-local-storage.tsx b/apps/app/hooks/use-local-storage.tsx
index f6439ec1b..0eb7e20f3 100644
--- a/apps/app/hooks/use-local-storage.tsx
+++ b/apps/app/hooks/use-local-storage.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback } from "react";
 
 const getValueFromLocalStorage = (key: string, defaultValue: any) => {
+  if (typeof window === undefined || typeof window === "undefined") return defaultValue;
   try {
     const item = window.localStorage.getItem(key);
     return item ? JSON.parse(item) : defaultValue;
diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
index 4068e3be7..73f9b0aa1 100644
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/pages/index.tsx
@@ -14,6 +14,7 @@ import projectService from "services/project.service";
 import pagesService from "services/pages.service";
 // hooks
 import useToast from "hooks/use-toast";
+import useLocalStorage from "hooks/use-local-storage";
 // icons
 import { PlusIcon } from "components/icons";
 // layouts
@@ -74,6 +75,8 @@ const ProjectPages: NextPage = () => {
 
   const { setToastAlert } = useToast();
 
+  const { storedValue: pageTab, setValue: setPageTab } = useLocalStorage("pageTab", "Recent");
+
   const {
     handleSubmit,
     register,
@@ -145,6 +148,25 @@ const ProjectPages: NextPage = () => {
       });
   };
 
+
+  const currentTabValue = (tab: string | null) => {
+    switch (tab) {
+      case "Recent":
+        return 0;
+      case "All":
+        return 1;
+      case "Favorites":
+        return 2;
+      case "Created by me":
+        return 3;
+      case "Created by others":
+        return 4;
+
+      default:
+        return 0;
+    }
+  };
+
   return (
     <>
       <CreateUpdatePageModal
@@ -193,7 +215,26 @@ const ProjectPages: NextPage = () => {
             )}
           </form>
           <div>
-            <Tab.Group>
+            <Tab.Group
+              defaultIndex={currentTabValue(pageTab)}
+              onChange={(i) => {
+                switch (i) {
+                  case 0:
+                    return setPageTab("Recent");
+                  case 1:
+                    return setPageTab("All");
+                  case 2:
+                    return setPageTab("Favorites");
+                  case 3:
+                    return setPageTab("Created by me");
+                  case 4:
+                    return setPageTab("Created by others");
+
+                  default:
+                    return setPageTab("Recent");
+                }
+              }}
+            >
               <Tab.List as="div" className="flex items-center justify-between mb-6">
                 <div className="flex gap-4">
                   {["Recent", "All", "Favorites", "Created by me", "Created by others"].map(

From 85b6c78e7510ff82dbee39292042c3b069210e96 Mon Sep 17 00:00:00 2001
From: pablohashescobar <nikhilschacko@gmail.com>
Date: Mon, 17 Apr 2023 14:03:19 +0530
Subject: [PATCH 10/20] chore: my issues endpoint to return attachment and link
 count

---
 apiserver/plane/api/views/issue.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py
index 963115c96..1f604d271 100644
--- a/apiserver/plane/api/views/issue.py
+++ b/apiserver/plane/api/views/issue.py
@@ -246,6 +246,20 @@ class UserWorkSpaceIssues(BaseAPIView):
                 .prefetch_related("assignees")
                 .prefetch_related("labels")
                 .order_by("-created_at")
+                .annotate(
+                    link_count=IssueLink.objects.filter(issue=OuterRef("id"))
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
             )
             serializer = IssueLiteSerializer(issues, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)

From 8a6036a20adbb46bc743428374b10232a0a92d65 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:13:32 +0530
Subject: [PATCH 11/20] fix: drop to delete box zindex (#843)

---
 apps/app/components/core/issues-view.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index 1c0cc203e..3585ac871 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -423,7 +423,7 @@ export const IssuesView: React.FC<Props> = ({
             <div
               className={`${
                 trashBox ? "pointer-events-auto opacity-100" : "pointer-events-none opacity-0"
-              } fixed top-9 right-9 z-20 flex h-28 w-96 flex-col items-center justify-center gap-2 rounded border-2 border-red-500 bg-red-100 p-3 text-xs font-medium italic text-red-500 ${
+              } fixed top-9 right-9 z-30 flex h-28 w-96 flex-col items-center justify-center gap-2 rounded border-2 border-red-500 bg-red-100 p-3 text-xs font-medium italic text-red-500 ${
                 snapshot.isDraggingOver ? "bg-red-500 text-white" : ""
               } duration-200`}
               ref={provided.innerRef}
@@ -431,7 +431,6 @@ export const IssuesView: React.FC<Props> = ({
             >
               <TrashIcon className="h-4 w-4" />
               Drop issue here to delete
-              {provided.placeholder}
             </div>
           )}
         </StrictModeDroppable>

From 98cef0e1e8b79ca7be844e0aa18f915a3c02c478 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:45:51 +0530
Subject: [PATCH 12/20] fix: my issue page display property (#848)

---
 .../components/issues/my-issues-list-item.tsx | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/app/components/issues/my-issues-list-item.tsx b/apps/app/components/issues/my-issues-list-item.tsx
index 676371d85..9e3e85c22 100644
--- a/apps/app/components/issues/my-issues-list-item.tsx
+++ b/apps/app/components/issues/my-issues-list-item.tsx
@@ -5,6 +5,8 @@ import { useRouter } from "next/router";
 
 import { mutate } from "swr";
 
+// hooks
+import useToast from "hooks/use-toast";
 // services
 import issuesService from "services/issues.service";
 // components
@@ -13,16 +15,17 @@ import {
   ViewPrioritySelect,
   ViewStateSelect,
 } from "components/issues/view-select";
+// icon
+import { LinkIcon, PaperClipIcon } from "@heroicons/react/24/outline";
 // ui
 import { AssigneesList } from "components/ui/avatar";
 import { CustomMenu, Tooltip } from "components/ui";
 // types
 import { IIssue, Properties } from "types";
+// helper
+import { copyTextToClipboard, truncateText } from "helpers/string.helper";
 // fetch-keys
 import { USER_ISSUE } from "constants/fetch-keys";
-import { copyTextToClipboard, truncateText } from "helpers/string.helper";
-import useToast from "hooks/use-toast";
-import { LinkIcon } from "@heroicons/react/24/outline";
 
 type Props = {
   issue: IIssue;
@@ -167,6 +170,26 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
               </div>
             </Tooltip>
           )}
+          {properties.link && (
+            <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+              <Tooltip tooltipHeading="Link" tooltipContent={`${issue.link_count}`}>
+                <div className="flex items-center gap-1 text-gray-500">
+                  <LinkIcon className="h-3.5 w-3.5 text-gray-500" />
+                  {issue.link_count}
+                </div>
+              </Tooltip>
+            </div>
+          )}
+          {properties.attachment_count && (
+            <div className="flex items-center rounded-md shadow-sm px-2.5 py-1 cursor-default text-xs border border-gray-200">
+              <Tooltip tooltipHeading="Attachment" tooltipContent={`${issue.attachment_count}`}>
+                <div className="flex items-center gap-1 text-gray-500">
+                  <PaperClipIcon className="h-3.5 w-3.5 text-gray-500 -rotate-45" />
+                  {issue.attachment_count}
+                </div>
+              </Tooltip>
+            </div>
+          )}
           <CustomMenu width="auto" ellipsis>
             <CustomMenu.MenuItem onClick={handleCopyText}>
               <span className="flex items-center justify-start gap-2">

From 0beb6540695edd975b4e57f3b46a191944da92b0 Mon Sep 17 00:00:00 2001
From: Kunal Vishwakarma <116634168+kunalv17@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:01:22 +0530
Subject: [PATCH 13/20] chore: worked on making issue list padding consistent
 (#850)

---
 apps/app/components/core/issues-view.tsx      | 62 +++++++++++--------
 .../components/core/list-view/all-lists.tsx   |  2 +-
 .../core/list-view/single-issue.tsx           |  4 +-
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index 3585ac871..520b5be17 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -388,35 +388,43 @@ export const IssuesView: React.FC<Props> = ({
         handleClose={() => setTransferIssuesModal(false)}
         isOpen={transferIssuesModal}
       />
-      <div className="flex items-center justify-between gap-2 -mt-2">
-        <FilterList filters={filters} setFilters={setFilters} />
-        {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-          <PrimaryButton
-            onClick={() => {
-              if (viewId) {
-                setFilters({}, true);
-                setToastAlert({
-                  title: "View updated",
-                  message: "Your view has been updated",
-                  type: "success",
-                });
-              } else
-                setCreateViewModal({
-                  query: filters,
-                });
-            }}
-            className="flex items-center gap-2 text-sm"
+      {issueView !== "calendar" && (
+        <div>
+          <div
+            className={`flex items-center justify-between gap-2 ${
+              issueView === "list" ? "px-8 mt-6" : "-mt-2"
+            }`}
           >
-            {!viewId && <PlusIcon className="h-4 w-4" />}
-            {viewId ? "Update" : "Save"} view
-          </PrimaryButton>
-        )}
-      </div>
-
-      {Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length && (
-        <div className="my-4 border-t" />
+            <FilterList filters={filters} setFilters={setFilters} />
+            {Object.keys(filters).length > 0 &&
+              nullFilters.length !== Object.keys(filters).length && (
+                <PrimaryButton
+                  onClick={() => {
+                    if (viewId) {
+                      setFilters({}, true);
+                      setToastAlert({
+                        title: "View updated",
+                        message: "Your view has been updated",
+                        type: "success",
+                      });
+                    } else
+                      setCreateViewModal({
+                        query: filters,
+                      });
+                  }}
+                  className="flex items-center gap-2 text-sm"
+                >
+                  {!viewId && <PlusIcon className="h-4 w-4" />}
+                  {viewId ? "Update" : "Save"} view
+                </PrimaryButton>
+              )}
+          </div>
+          {Object.keys(filters).length > 0 &&
+            nullFilters.length !== Object.keys(filters).length && (
+              <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+            )}
+        </div>
       )}
-
       <DragDropContext onDragEnd={handleOnDragEnd}>
         <StrictModeDroppable droppableId="trashBox">
           {(provided, snapshot) => (
diff --git a/apps/app/components/core/list-view/all-lists.tsx b/apps/app/components/core/list-view/all-lists.tsx
index bdd0c4f2c..27cd92fa5 100644
--- a/apps/app/components/core/list-view/all-lists.tsx
+++ b/apps/app/components/core/list-view/all-lists.tsx
@@ -36,7 +36,7 @@ export const AllLists: React.FC<Props> = ({
   return (
     <>
       {groupedByIssues && (
-        <div className="flex flex-col space-y-5 gap-4 bg-white">
+        <div className="flex flex-col space-y-5 bg-white">
           {Object.keys(groupedByIssues).map((singleGroup) => {
             const currentState =
               selectedGroup === "state" ? states?.find((s) => s.id === singleGroup) : null;
diff --git a/apps/app/components/core/list-view/single-issue.tsx b/apps/app/components/core/list-view/single-issue.tsx
index 0ed235028..df2d1cb3a 100644
--- a/apps/app/components/core/list-view/single-issue.tsx
+++ b/apps/app/components/core/list-view/single-issue.tsx
@@ -216,9 +216,9 @@ export const SingleListIssue: React.FC<Props> = ({
           </ContextMenu.Item>
         </a>
       </ContextMenu>
-      <div className="border-b mx-4 border-gray-300 last:border-b-0">
+      <div className="border-b mx-6 border-gray-300 last:border-b-0">
         <div
-          className="flex items-center justify-between gap-2 px-4 py-3"
+          className="flex items-center justify-between gap-2  py-3"
           onContextMenu={(e) => {
             e.preventDefault();
             setContextMenu(true);

From 819508d5fcb65d995b8db0ebec72f209f51c6b1b Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:03:44 +0530
Subject: [PATCH 14/20] fix: remirror placeholder (#849)

---
 apps/app/components/issues/form.tsx                      | 6 +++---
 apps/app/components/pages/create-update-block-inline.tsx | 3 ++-
 apps/app/components/rich-text-editor/index.tsx           | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/app/components/issues/form.tsx b/apps/app/components/issues/form.tsx
index 7c19b5b79..257a6a4e1 100644
--- a/apps/app/components/issues/form.tsx
+++ b/apps/app/components/issues/form.tsx
@@ -46,7 +46,7 @@ const RemirrorRichTextEditor = dynamic(() => import("components/rich-text-editor
 const defaultValues: Partial<IIssue> = {
   project: "",
   name: "",
-  description: "",
+  description: { type: "doc", content: [] },
   description_html: "<p></p>",
   estimate_point: null,
   state: "",
@@ -137,7 +137,7 @@ export const IssueForm: FC<IssueFormProps> = ({
     setValue("description_html", `${watch("description_html")}<p>${response}</p>`);
   };
 
-  const handelAutoGenerateDescription = async () => {
+  const handleAutoGenerateDescription = async () => {
     if (!workspaceSlug || !projectId) return;
 
     setIAmFeelingLucky(true);
@@ -301,7 +301,7 @@ export const IssueForm: FC<IssueFormProps> = ({
                       className={`flex items-center gap-1 rounded px-1.5 py-1 text-xs hover:bg-gray-100 ${
                         iAmFeelingLucky ? "cursor-wait" : ""
                       }`}
-                      onClick={handelAutoGenerateDescription}
+                      onClick={handleAutoGenerateDescription}
                       disabled={iAmFeelingLucky}
                     >
                       {iAmFeelingLucky ? (
diff --git a/apps/app/components/pages/create-update-block-inline.tsx b/apps/app/components/pages/create-update-block-inline.tsx
index c90e2e9db..615010700 100644
--- a/apps/app/components/pages/create-update-block-inline.tsx
+++ b/apps/app/components/pages/create-update-block-inline.tsx
@@ -32,7 +32,8 @@ type Props = {
 
 const defaultValues = {
   name: "",
-  description: "<p></p>",
+  description: { type: "doc", content: [] },
+  description_html: "<p></p>",
 };
 
 const RemirrorRichTextEditor = dynamic(() => import("components/rich-text-editor"), {
diff --git a/apps/app/components/rich-text-editor/index.tsx b/apps/app/components/rich-text-editor/index.tsx
index 4c44650b9..32b4931f1 100644
--- a/apps/app/components/rich-text-editor/index.tsx
+++ b/apps/app/components/rich-text-editor/index.tsx
@@ -199,9 +199,11 @@ const RemirrorRichTextEditor: FC<IRemirrorRichTextEditor> = (props) => {
           onBlur(jsonValue, htmlValue);
         }}
       >
-        {(!value || value === "" || value?.content?.[0]?.content === undefined) && placeholder && (
-          <p className="absolute pointer-events-none top-4 left-4 text-gray-300">{placeholder}</p>
-        )}
+        {(!value || value === "" || value?.content?.[0]?.content === undefined) &&
+          !(typeof value === "string" && value.includes("<")) &&
+          placeholder && (
+            <p className="absolute pointer-events-none top-4 left-4 text-gray-300">{placeholder}</p>
+          )}
         <EditorComponent />
 
         {imageLoader && (

From f5351e4419094ee73471bbfbb17adac2ab88b2f3 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:03:56 +0530
Subject: [PATCH 15/20] fix: remove filters function (#846)

---
 apps/app/components/core/filter-list.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/app/components/core/filter-list.tsx b/apps/app/components/core/filter-list.tsx
index 776a8f8a0..08d1e8062 100644
--- a/apps/app/components/core/filter-list.tsx
+++ b/apps/app/components/core/filter-list.tsx
@@ -309,7 +309,19 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
                   )}
                 </div>
               ) : (
-                <span className="capitalize">{filters[key as keyof typeof filters]}</span>
+                <div className="flex items-center gap-x-1 capitalize">
+                  {filters[key as keyof typeof filters]}
+                  <button
+                    type="button"
+                    onClick={() =>
+                      setFilters({
+                        [key]: null,
+                      })
+                    }
+                  >
+                    <XMarkIcon className="h-3 w-3" />
+                  </button>
+                </div>
               )}
             </div>
           );
@@ -319,6 +331,7 @@ export const FilterList: React.FC<any> = ({ filters, setFilters }) => {
           type="button"
           onClick={() =>
             setFilters({
+              type: null,
               state: null,
               priority: null,
               assignees: null,

From dc537081094f98dd6a557eabcf3bab2db89fae6a Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 16:41:16 +0530
Subject: [PATCH 16/20] chore: show workspace members (#852)

---
 .../integration/github/import-users.tsx       |  5 -----
 .../integration/github/single-user-select.tsx | 19 +++++--------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/apps/app/components/integration/github/import-users.tsx b/apps/app/components/integration/github/import-users.tsx
index db6b255a0..c1c790396 100644
--- a/apps/app/components/integration/github/import-users.tsx
+++ b/apps/app/components/integration/github/import-users.tsx
@@ -1,7 +1,5 @@
 import { FC } from "react";
 
-import { useRouter } from "next/router";
-
 // react-hook-form
 import { UseFormWatch } from "react-hook-form";
 // ui
@@ -22,8 +20,6 @@ type Props = {
 };
 
 export const GithubImportUsers: FC<Props> = ({ handleStepChange, users, setUsers, watch }) => {
-  const router = useRouter();
-
   const isInvalid = users.filter((u) => u.import !== false && u.email === "").length > 0;
 
   return (
@@ -44,7 +40,6 @@ export const GithubImportUsers: FC<Props> = ({ handleStepChange, users, setUsers
               index={index}
               users={users}
               setUsers={setUsers}
-              project={watch("project")}
             />
           ))}
         </div>
diff --git a/apps/app/components/integration/github/single-user-select.tsx b/apps/app/components/integration/github/single-user-select.tsx
index e478d119b..ffb67d728 100644
--- a/apps/app/components/integration/github/single-user-select.tsx
+++ b/apps/app/components/integration/github/single-user-select.tsx
@@ -4,21 +4,20 @@ import { useRouter } from "next/router";
 import useSWR from "swr";
 
 // services
-import projectService from "services/project.service";
+import workspaceService from "services/workspace.service";
 // ui
 import { Avatar, CustomSearchSelect, CustomSelect, Input } from "components/ui";
 // types
 import { IGithubRepoCollaborator } from "types";
 import { IUserDetails } from "./root";
 // fetch-keys
-import { PROJECT_MEMBERS } from "constants/fetch-keys";
+import { WORKSPACE_MEMBERS } from "constants/fetch-keys";
 
 type Props = {
   collaborator: IGithubRepoCollaborator;
   index: number;
   users: IUserDetails[];
   setUsers: React.Dispatch<React.SetStateAction<IUserDetails[]>>;
-  project: string | null;
 };
 
 const importOptions = [
@@ -36,21 +35,13 @@ const importOptions = [
   },
 ];
 
-export const SingleUserSelect: React.FC<Props> = ({
-  collaborator,
-  index,
-  users,
-  setUsers,
-  project,
-}) => {
+export const SingleUserSelect: React.FC<Props> = ({ collaborator, index, users, setUsers }) => {
   const router = useRouter();
   const { workspaceSlug } = router.query;
 
   const { data: members } = useSWR(
-    workspaceSlug && project ? PROJECT_MEMBERS(project) : null,
-    workspaceSlug && project
-      ? () => projectService.projectMembers(workspaceSlug as string, project)
-      : null
+    workspaceSlug ? WORKSPACE_MEMBERS(workspaceSlug.toString()) : null,
+    workspaceSlug ? () => workspaceService.workspaceMembers(workspaceSlug.toString()) : null
   );
 
   const options =

From 6de54089cd305535686981c6486f9cfc1f6a6684 Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:10:36 +0530
Subject: [PATCH 17/20] fix: show proper issues list if no filters are present
 (#853)

---
 apps/app/contexts/issue-view.context.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/app/contexts/issue-view.context.tsx b/apps/app/contexts/issue-view.context.tsx
index 29b1a5ea9..8205d9277 100644
--- a/apps/app/contexts/issue-view.context.tsx
+++ b/apps/app/contexts/issue-view.context.tsx
@@ -439,12 +439,11 @@ export const IssueViewContextProvider: React.FC<{ children: React.ReactNode }> =
       payload: {
         ...myViewProps?.view_props,
         filters: {
-          ...myViewProps?.view_props?.filters,
-          ...viewDetails?.query_data,
+          ...(viewId ? viewDetails?.query_data : myViewProps?.view_props?.filters),
         } as any,
       },
     });
-  }, [myViewProps, viewDetails]);
+  }, [myViewProps, viewDetails, viewId]);
 
   return (
     <issueViewContext.Provider

From 600fedd5ba956a534c1e293bd0dbdcb53dd0068e Mon Sep 17 00:00:00 2001
From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:21:15 +0530
Subject: [PATCH 18/20] fix: undefined block content (#854)

---
 apps/app/components/pages/create-update-block-inline.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/components/pages/create-update-block-inline.tsx b/apps/app/components/pages/create-update-block-inline.tsx
index 615010700..d3e3dd92e 100644
--- a/apps/app/components/pages/create-update-block-inline.tsx
+++ b/apps/app/components/pages/create-update-block-inline.tsx
@@ -168,7 +168,7 @@ export const CreateUpdateBlockInline: React.FC<Props> = ({
           });
         else {
           setValue("description", {});
-          setValue("description_html", `${watch("description_html")}<p>${res.response}</p>`);
+          setValue("description_html", `${watch("description_html") ?? ""}<p>${res.response}</p>`);
         }
       })
       .catch((err) => {

From 45eaa23ed0b09a859cce6b22fed1e2cc41580bd7 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:36:02 +0530
Subject: [PATCH 19/20] style: dashboard content (#855)

---
 apps/app/pages/[workspaceSlug]/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/pages/[workspaceSlug]/index.tsx b/apps/app/pages/[workspaceSlug]/index.tsx
index b31207fa5..24a6d6a20 100644
--- a/apps/app/pages/[workspaceSlug]/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/index.tsx
@@ -46,7 +46,7 @@ const WorkspacePage: NextPage = () => {
             // style={{ background: "linear-gradient(90deg, #8e2de2 0%, #4a00e0 100%)" }}
           >
             <p className="font-semibold">
-              Plane is a open source application, to support us you can star us on GitHub!
+              Plane is open source, support us by staring us on GitHub.
             </p>
             <div className="flex items-center gap-2">
               {/* <a href="#" target="_blank" rel="noopener noreferrer">

From d26d01ace4858fd5d17f07845d61c75babed20f5 Mon Sep 17 00:00:00 2001
From: Kunal Vishwakarma <116634168+kunalv17@users.noreply.github.com>
Date: Mon, 17 Apr 2023 17:42:02 +0530
Subject: [PATCH 20/20] chore: filters spacing (#856)

---
 apps/app/components/core/issues-view.tsx      | 59 ++++++++++---------
 .../components/issues/my-issues-list-item.tsx |  4 +-
 .../pages/[workspaceSlug]/me/my-issues.tsx    |  5 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/apps/app/components/core/issues-view.tsx b/apps/app/components/core/issues-view.tsx
index 520b5be17..a964181cd 100644
--- a/apps/app/components/core/issues-view.tsx
+++ b/apps/app/components/core/issues-view.tsx
@@ -359,6 +359,9 @@ export const IssuesView: React.FC<Props> = ({
     (key) => filters[key as keyof IIssueFilterOptions] === null
   );
 
+  const areFiltersApplied =
+    Object.keys(filters).length > 0 && nullFilters.length !== Object.keys(filters).length;
+
   return (
     <>
       <CreateUpdateViewModal
@@ -389,41 +392,39 @@ export const IssuesView: React.FC<Props> = ({
         isOpen={transferIssuesModal}
       />
       {issueView !== "calendar" && (
-        <div>
+        <>
           <div
             className={`flex items-center justify-between gap-2 ${
-              issueView === "list" ? "px-8 mt-6" : "-mt-2"
+              issueView === "list" && areFiltersApplied ? "px-8 mt-6" : "-mt-2"
             }`}
           >
             <FilterList filters={filters} setFilters={setFilters} />
-            {Object.keys(filters).length > 0 &&
-              nullFilters.length !== Object.keys(filters).length && (
-                <PrimaryButton
-                  onClick={() => {
-                    if (viewId) {
-                      setFilters({}, true);
-                      setToastAlert({
-                        title: "View updated",
-                        message: "Your view has been updated",
-                        type: "success",
-                      });
-                    } else
-                      setCreateViewModal({
-                        query: filters,
-                      });
-                  }}
-                  className="flex items-center gap-2 text-sm"
-                >
-                  {!viewId && <PlusIcon className="h-4 w-4" />}
-                  {viewId ? "Update" : "Save"} view
-                </PrimaryButton>
-              )}
-          </div>
-          {Object.keys(filters).length > 0 &&
-            nullFilters.length !== Object.keys(filters).length && (
-              <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+            {areFiltersApplied && (
+              <PrimaryButton
+                onClick={() => {
+                  if (viewId) {
+                    setFilters({}, true);
+                    setToastAlert({
+                      title: "View updated",
+                      message: "Your view has been updated",
+                      type: "success",
+                    });
+                  } else
+                    setCreateViewModal({
+                      query: filters,
+                    });
+                }}
+                className="flex items-center gap-2 text-sm"
+              >
+                {!viewId && <PlusIcon className="h-4 w-4" />}
+                {viewId ? "Update" : "Save"} view
+              </PrimaryButton>
             )}
-        </div>
+          </div>
+          {areFiltersApplied && (
+            <div className={` ${issueView === "list" ? "mt-4" : "my-4"} border-t`} />
+          )}
+        </>
       )}
       <DragDropContext onDragEnd={handleOnDragEnd}>
         <StrictModeDroppable droppableId="trashBox">
diff --git a/apps/app/components/issues/my-issues-list-item.tsx b/apps/app/components/issues/my-issues-list-item.tsx
index 9e3e85c22..bf8f1d39c 100644
--- a/apps/app/components/issues/my-issues-list-item.tsx
+++ b/apps/app/components/issues/my-issues-list-item.tsx
@@ -82,8 +82,8 @@ export const MyIssuesListItem: React.FC<Props> = ({ issue, properties, projectId
   const isNotAllowed = false;
 
   return (
-    <div className="border-b border-gray-300 last:border-b-0">
-      <div key={issue.id} className="flex items-center justify-between gap-2 px-4 py-3">
+    <div className="border-b border-gray-300 last:border-b-0 mx-6">
+      <div key={issue.id} className="flex items-center justify-between gap-2 py-3">
         <Link href={`/${workspaceSlug}/projects/${issue?.project_detail?.id}/issues/${issue.id}`}>
           <a className="group relative flex items-center gap-2">
             {properties?.key && (
diff --git a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
index ce75ca9dd..9e2e9732e 100644
--- a/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/my-issues.tsx
@@ -43,6 +43,7 @@ const MyIssuesPage: NextPage = () => {
           <BreadcrumbItem title="My Issues" />
         </Breadcrumbs>
       }
+      noPadding
       right={
         <div className="flex items-center gap-2">
           {myIssues && myIssues.length > 0 && (
@@ -119,10 +120,10 @@ const MyIssuesPage: NextPage = () => {
               <div className="flex flex-col space-y-5">
                 <Disclosure as="div" defaultOpen>
                   {({ open }) => (
-                    <div className="rounded-[10px] border border-gray-300 bg-white">
+                    <div className="bg-white">
                       <div
                         className={`flex items-center justify-start bg-gray-100 px-5 py-3 ${
-                          open ? "rounded-t-[10px]" : "rounded-[10px]"
+                          open ? "" : "rounded-[10px]"
                         }`}
                       >
                         <Disclosure.Button>