diff --git a/web/core/components/inbox/inbox-filter/root.tsx b/web/core/components/inbox/inbox-filter/root.tsx index 7aefedd316..0476103310 100644 --- a/web/core/components/inbox/inbox-filter/root.tsx +++ b/web/core/components/inbox/inbox-filter/root.tsx @@ -5,34 +5,30 @@ import { cn } from "@plane/editor"; import { getButtonStyling } from "@plane/ui"; import { InboxIssueFilterSelection, InboxIssueOrderByDropdown } from "@/components/inbox/inbox-filter"; import { FiltersDropdown } from "@/components/issues"; +import useSize from "@/hooks/use-window-size"; + +const smallButton = ; -const smallButton = ; const largeButton = ( -
- - Filters +
+ + Filters + +
+); +export const FiltersRoot: FC = () => { + const windowSize = useSize(); - -
-); -export const FiltersRoot: FC = () => ( -
-
- -
{largeButton}
-
{smallButton}
- - } - title="" - placement="bottom-end" - > - -
+ return ( +
+
+ 1280 ? largeButton : smallButton} title="" placement="bottom-end"> + + +
+
+ +
-
- -
-
-); + ); +}; diff --git a/web/core/components/inbox/inbox-filter/sorting/order-by.tsx b/web/core/components/inbox/inbox-filter/sorting/order-by.tsx index 07fe1b0225..f1282c3c1a 100644 --- a/web/core/components/inbox/inbox-filter/sorting/order-by.tsx +++ b/web/core/components/inbox/inbox-filter/sorting/order-by.tsx @@ -10,34 +10,35 @@ import { INBOX_ISSUE_ORDER_BY_OPTIONS, INBOX_ISSUE_SORT_BY_OPTIONS } from "@/con import { cn } from "@/helpers/common.helper"; // hooks import { useProjectInbox } from "@/hooks/store"; +import useSize from "@/hooks/use-window-size"; export const InboxIssueOrderByDropdown: FC = observer(() => { // hooks + const windowSize = useSize(); const { inboxSorting, handleInboxIssueSorting } = useProjectInbox(); const orderByDetails = INBOX_ISSUE_ORDER_BY_OPTIONS.find((option) => inboxSorting?.order_by?.includes(option.key)) || undefined; const smallButton = - inboxSorting?.sort_by === "asc" ? : ; + inboxSorting?.sort_by === "asc" ? ( + + ) : ( + + ); const largeButton = ( -
+
{inboxSorting?.sort_by === "asc" ? ( - + ) : ( - + )} {orderByDetails?.label || "Order By"} - +
); return ( -
{largeButton}
-
{smallButton}
- - } + customButton={windowSize[0] > 1280 ? largeButton : smallButton} placement="bottom-end" maxHeight="lg" closeOnSelect @@ -49,7 +50,7 @@ export const InboxIssueOrderByDropdown: FC = observer(() => { onClick={() => handleInboxIssueSorting("order_by", option.key)} > {option.label} - {inboxSorting?.order_by?.includes(option.key) && } + {inboxSorting?.order_by?.includes(option.key) && } ))}
@@ -60,7 +61,7 @@ export const InboxIssueOrderByDropdown: FC = observer(() => { onClick={() => handleInboxIssueSorting("sort_by", option.key)} > {option.label} - {inboxSorting?.sort_by?.includes(option.key) && } + {inboxSorting?.sort_by?.includes(option.key) && } ))}
diff --git a/web/core/constants/inbox.tsx b/web/core/constants/inbox.tsx index 4a88b56cf7..fb0f4ec636 100644 --- a/web/core/constants/inbox.tsx +++ b/web/core/constants/inbox.tsx @@ -67,11 +67,11 @@ export const INBOX_ISSUE_SOURCE = "in-app"; export const INBOX_ISSUE_ORDER_BY_OPTIONS: { key: TInboxIssueSortingOrderByKeys; label: string }[] = [ { key: "issue__created_at", - label: "Date created", + label: "Created at", }, { key: "issue__updated_at", - label: "Date updated", + label: "Updated at", }, { key: "issue__sequence_id",