(null);
const [isUserModalOpen, setIsUserModalOpen] = useState(false);
+ useOutsideClick(modalRef, () => setIsUserModalOpen(false));
+
return (
- <>
+
setIsUserModalOpen(prev => !prev)}
- />
- {
+ setIsUserModalOpen(prev => !prev);
+ }}
/>
- >
+
+
);
};
diff --git a/src/components/common/MobileDashboardHeader/index.tsx b/src/components/common/MobileDashboardHeader/index.tsx
index 0436607f..a237643f 100644
--- a/src/components/common/MobileDashboardHeader/index.tsx
+++ b/src/components/common/MobileDashboardHeader/index.tsx
@@ -56,6 +56,7 @@ const Container = styled.div`
font-size: 11px;
font-weight: 700;
+ z-index: 100;
}
`;
diff --git a/src/pages/Report/index.tsx b/src/pages/Report/index.tsx
index dd3c8002..c4bd0437 100644
--- a/src/pages/Report/index.tsx
+++ b/src/pages/Report/index.tsx
@@ -30,13 +30,19 @@ export default Report;
const Container = styled.div`
width: 100%;
+ height: auto;
display: flex;
- gap: 10px;
+ justify-content: space-between;
+ gap: 25px;
- background-color: white;
+ background-color: #f2f3f5;
${theme.response.tablet} {
+ height: auto;
+
flex-direction: column-reverse;
+
+ background-color: white;
}
`;
diff --git a/src/recoil/atoms/selectedYearState.ts b/src/recoil/atoms/selectedYearState.ts
index 7e29632f..b3c567c0 100644
--- a/src/recoil/atoms/selectedYearState.ts
+++ b/src/recoil/atoms/selectedYearState.ts
@@ -1,12 +1,8 @@
import { atom } from 'recoil';
-import { recoilPersist } from 'recoil-persist';
-
-const { persistAtom } = recoilPersist();
const selectedYearState = atom<{ year: number }>({
key: 'selectYearState',
- default: { year: 0 },
- effects_UNSTABLE: [persistAtom]
+ default: { year: new Date().getFullYear() }
});
export default selectedYearState;
diff --git a/src/types/layout.ts b/src/types/layout.ts
index aa24c354..e3889131 100644
--- a/src/types/layout.ts
+++ b/src/types/layout.ts
@@ -46,7 +46,6 @@ export type CustomNavLink = {
// User
export type UserModal = {
isOpen: boolean;
- setIsUserModalOpen: React.Dispatch>;
};
export type UserModalStyleProps = {