diff --git a/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx b/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx index 80a09f8f7..2c6cc98f0 100644 --- a/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx +++ b/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportChargedFrame.tsx @@ -17,6 +17,8 @@ const ExecutiveActivityReportChargedFrame: React.FC = () => { executiveId: Number(executiveId), }); + window.history.replaceState({ isClubView: false }, ""); + const clubsActivities = data?.activities.reduce( (acc, activity) => { if (!activity.club?.id || !activity.chargedExecutive?.id) { diff --git a/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx b/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx index d04926942..923cdba71 100644 --- a/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx +++ b/packages/web/src/features/executive/activity-report/frames/ExecutiveActivityReportFrame.tsx @@ -15,7 +15,9 @@ import ExecutiveActivityClubTable from "../components/ExecutiveActivityClubTable import useGetExecutiveActivities from "../services/useGetExecutiveActivities"; const ExecutiveActivityReportFrame = () => { - const [isClubView, setIsClubView] = useState(true); + const [isClubView, setIsClubView] = useState( + window.history.state.isClubView ?? true, + ); const [searchText, setSearchText] = useState(""); const { data, isLoading, isError } = useGetExecutiveActivities(); @@ -24,6 +26,10 @@ const ExecutiveActivityReportFrame = () => { ChargedChangeClubProps[] >([]); + useEffect(() => { + window.history.replaceState({ isClubView }, ""); + }, [isClubView]); + useEffect(() => { if (data) { setSelectedClubInfos(