diff --git a/src/components/Common/SortDropdown.tsx b/src/components/Common/SortDropdown.tsx index cf4193deaea..2e5ccd95015 100644 --- a/src/components/Common/SortDropdown.tsx +++ b/src/components/Common/SortDropdown.tsx @@ -27,7 +27,7 @@ export default function SortDropdownMenu(props: Props) { variant="secondary" className="w-full border border-primary-500 bg-white md:w-auto" icon={<CareIcon icon="l-sort" />} - containerClassName="w-full md:w-auto" + containerClassName="w-full md:w-auto z-20" > {props.options.map(({ isAscending, value }, i) => ( <DropdownItem diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx index 6eecf7fcef2..891c2f3378b 100644 --- a/src/components/Resource/ResourceList.tsx +++ b/src/components/Resource/ResourceList.tsx @@ -189,7 +189,7 @@ export default function ListView() { return ( <Page - title="Resource" + title={t("resource")} hideBack componentRight={ <ExportButton @@ -216,13 +216,13 @@ export default function ListView() { </div> <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4"> - <AdvancedFilterButton - onClick={() => advancedFilter.setShow(true)} - /> <ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}> <CareIcon icon="l-list-ul" className="rotate-90" /> {t("board_view")} </ButtonV2> + <AdvancedFilterButton + onClick={() => advancedFilter.setShow(true)} + /> </div> </> } diff --git a/src/components/Shifting/ShiftingList.tsx b/src/components/Shifting/ShiftingList.tsx index d4746ad434b..db7ec691f79 100644 --- a/src/components/Shifting/ShiftingList.tsx +++ b/src/components/Shifting/ShiftingList.tsx @@ -274,9 +274,6 @@ export default function ListView() { </div> <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4"> - <AdvancedFilterButton - onClick={() => advancedFilter.setShow(true)} - /> <ButtonV2 className="py-[11px]" onClick={() => navigate("/shifting/board", { query: qParams })} @@ -284,6 +281,9 @@ export default function ListView() { <CareIcon icon="l-list-ul" className="rotate-90" /> {t("board_view")} </ButtonV2> + <AdvancedFilterButton + onClick={() => advancedFilter.setShow(true)} + /> </div> </> }