From 88b440beecceef9df55a2ba63b922f12395d0ec9 Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Tue, 1 Aug 2023 12:43:24 +0530
Subject: [PATCH 1/2] style: showing 'Created by me' tab to all user

---
 .../notifications/notification-header.tsx     | 82 +++++--------------
 .../notifications/notification-popover.tsx    |  9 ++
 2 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/apps/app/components/notifications/notification-header.tsx b/apps/app/components/notifications/notification-header.tsx
index 38866832106..e1003f636d5 100644
--- a/apps/app/components/notifications/notification-header.tsx
+++ b/apps/app/components/notifications/notification-header.tsx
@@ -1,10 +1,5 @@
 import React from "react";
 
-import { useRouter } from "next/router";
-
-// hooks
-import useWorkspaceMembers from "hooks/use-workspace-members";
-
 // components
 import { Icon, Tooltip } from "components/ui";
 // helpers
@@ -44,11 +39,6 @@ export const NotificationHeader: React.FC<NotificationHeaderProps> = (props) =>
     setSelectedTab,
   } = props;
 
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { isOwner, isMember } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
   const notificationTabs: Array<{
     label: string;
     value: NotificationType;
@@ -150,59 +140,31 @@ export const NotificationHeader: React.FC<NotificationHeaderProps> = (props) =>
           </button>
         ) : (
           <nav className="flex space-x-5 overflow-x-auto" aria-label="Tabs">
-            {notificationTabs.map((tab) =>
-              tab.value === "created" ? (
-                isMember || isOwner ? (
-                  <button
-                    type="button"
-                    key={tab.value}
-                    onClick={() => setSelectedTab(tab.value)}
-                    className={`whitespace-nowrap border-b-2 pb-4 px-1 text-sm font-medium outline-none ${
+            {notificationTabs.map((tab) => (
+              <button
+                type="button"
+                key={tab.value}
+                onClick={() => setSelectedTab(tab.value)}
+                className={`whitespace-nowrap border-b-2 pb-4 px-1 text-sm font-medium outline-none ${
+                  tab.value === selectedTab
+                    ? "border-custom-primary-100 text-custom-primary-100"
+                    : "border-transparent text-custom-text-200"
+                }`}
+              >
+                {tab.label}
+                {tab.unreadCount && tab.unreadCount > 0 ? (
+                  <span
+                    className={`ml-2 rounded-full text-xs px-2 py-0.5 ${
                       tab.value === selectedTab
-                        ? "border-custom-primary-100 text-custom-primary-100"
-                        : "border-transparent text-custom-text-200"
+                        ? "bg-custom-primary-100 text-white"
+                        : "bg-custom-background-80 text-custom-text-200"
                     }`}
                   >
-                    {tab.label}
-                    {tab.unreadCount && tab.unreadCount > 0 ? (
-                      <span
-                        className={`ml-2 rounded-full text-xs px-2 py-0.5 ${
-                          tab.value === selectedTab
-                            ? "bg-custom-primary-100 text-white"
-                            : "bg-custom-background-80 text-custom-text-200"
-                        }`}
-                      >
-                        {getNumberCount(tab.unreadCount)}
-                      </span>
-                    ) : null}
-                  </button>
-                ) : null
-              ) : (
-                <button
-                  type="button"
-                  key={tab.value}
-                  onClick={() => setSelectedTab(tab.value)}
-                  className={`whitespace-nowrap border-b-2 pb-4 px-1 text-sm font-medium ${
-                    tab.value === selectedTab
-                      ? "border-custom-primary-100 text-custom-primary-100"
-                      : "border-transparent text-custom-text-200"
-                  }`}
-                >
-                  {tab.label}
-                  {tab.unreadCount && tab.unreadCount > 0 ? (
-                    <span
-                      className={`ml-2 rounded-full text-xs px-2 py-0.5 ${
-                        tab.value === selectedTab
-                          ? "bg-custom-primary-100 text-white"
-                          : "bg-custom-background-80 text-custom-text-200"
-                      }`}
-                    >
-                      {getNumberCount(tab.unreadCount)}
-                    </span>
-                  ) : null}
-                </button>
-              )
-            )}
+                    {getNumberCount(tab.unreadCount)}
+                  </span>
+                ) : null}
+              </button>
+            ))}
           </nav>
         )}
       </div>
diff --git a/apps/app/components/notifications/notification-popover.tsx b/apps/app/components/notifications/notification-popover.tsx
index 0e57c472c3c..bcfb3f4e473 100644
--- a/apps/app/components/notifications/notification-popover.tsx
+++ b/apps/app/components/notifications/notification-popover.tsx
@@ -1,7 +1,11 @@
 import React, { Fragment } from "react";
 
+// next
+import { useRouter } from "next/router";
+
 // hooks
 import useTheme from "hooks/use-theme";
+import useWorkspaceMembers from "hooks/use-workspace-members";
 
 import { Popover, Transition } from "@headlessui/react";
 
@@ -51,6 +55,11 @@ export const NotificationPopover = () => {
   // theme context
   const { collapsed: sidebarCollapse } = useTheme();
 
+  const router = useRouter();
+  const { workspaceSlug } = router.query;
+
+  const { isOwner, isMember } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
+
   return (
     <>
       <SnoozeNotificationModal

From 164c1eb36364b8f82a8531f8c705ea6d0918a4bd Mon Sep 17 00:00:00 2001
From: Dakshesh Jain <dakshesh.jain14@gmail.com>
Date: Tue, 1 Aug 2023 12:44:29 +0530
Subject: [PATCH 2/2] refactor: removed unnecessary imports

---
 .../components/notifications/notification-popover.tsx    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/apps/app/components/notifications/notification-popover.tsx b/apps/app/components/notifications/notification-popover.tsx
index bcfb3f4e473..0e57c472c3c 100644
--- a/apps/app/components/notifications/notification-popover.tsx
+++ b/apps/app/components/notifications/notification-popover.tsx
@@ -1,11 +1,7 @@
 import React, { Fragment } from "react";
 
-// next
-import { useRouter } from "next/router";
-
 // hooks
 import useTheme from "hooks/use-theme";
-import useWorkspaceMembers from "hooks/use-workspace-members";
 
 import { Popover, Transition } from "@headlessui/react";
 
@@ -55,11 +51,6 @@ export const NotificationPopover = () => {
   // theme context
   const { collapsed: sidebarCollapse } = useTheme();
 
-  const router = useRouter();
-  const { workspaceSlug } = router.query;
-
-  const { isOwner, isMember } = useWorkspaceMembers(workspaceSlug?.toString() ?? "");
-
   return (
     <>
       <SnoozeNotificationModal