diff --git a/projects/app/src/components/support/activity/ActivityAdModal.tsx b/projects/app/src/components/support/activity/ActivityAdModal.tsx index 76a219683..8e50a79ae 100644 --- a/projects/app/src/components/support/activity/ActivityAdModal.tsx +++ b/projects/app/src/components/support/activity/ActivityAdModal.tsx @@ -18,7 +18,7 @@ import { useLocalStorageState } from 'ahooks'; import { useRouter } from 'next/router'; import { useUserStore } from '@/web/support/user/useUserStore'; -const CLOSED_AD_KEY = 'activity_ad_closed'; +const CLOSED_AD_KEY = 'hidden-activity-ad'; const CLOSED_AD_DURATION = 24 * 60 * 60 * 1000; // 24 hours const ActivityAdModal = () => { diff --git a/projects/app/src/pageComponents/dashboard/TeamPlanStatusCard.tsx b/projects/app/src/pageComponents/dashboard/TeamPlanStatusCard.tsx index 15d3d3715..593605fe8 100644 --- a/projects/app/src/pageComponents/dashboard/TeamPlanStatusCard.tsx +++ b/projects/app/src/pageComponents/dashboard/TeamPlanStatusCard.tsx @@ -24,9 +24,9 @@ const TeamPlanStatusCard = () => { loadOperationalAd(); } if (operationalAd?.id) { - const currentKey = `hidden-until-${operationalAd.id}`; + const currentKey = `hidden-operational-${operationalAd.id}`; Object.keys(localStorage).forEach((key) => { - if (key.startsWith('hidden-until-') && key !== currentKey) { + if (key.startsWith('hidden-operational-') && key !== currentKey) { localStorage.removeItem(key); } }); @@ -34,7 +34,7 @@ const TeamPlanStatusCard = () => { }, [operationalAd, loadOperationalAd]); const [hiddenUntil, setHiddenUntil] = useLocalStorageState( - `hidden-until-${operationalAd?.id}`, + `hidden-operational-${operationalAd?.id}`, { defaultValue: undefined } diff --git a/projects/app/src/web/support/user/auth.ts b/projects/app/src/web/support/user/auth.ts index 688f656b9..d7e159b7f 100644 --- a/projects/app/src/web/support/user/auth.ts +++ b/projects/app/src/web/support/user/auth.ts @@ -1,43 +1,35 @@ import { loginOut } from '@/web/support/user/api'; -const clearOperationalAdStorage = () => { +const clearAdStorage = () => { try { Object.keys(localStorage).forEach((key) => { - if (key.startsWith('hidden-until-')) { + if (key.startsWith('hidden-')) { + const oldValue = localStorage.getItem(key); localStorage.removeItem(key); + + // Dispatch ahooks sync event to update useLocalStorageState + if (oldValue !== null) { + window.dispatchEvent( + new CustomEvent('AHOOKS_SYNC_STORAGE_EVENT_NAME', { + detail: { + key, + newValue: null, + oldValue, + storageArea: localStorage + } + }) + ); + } } }); } catch (error) { - console.error('Failed to clear operational ad storage:', error); - } -}; -const clearActivityAdStorage = () => { - try { - const key = 'activity_ad_closed'; - const oldValue = localStorage.getItem(key); - localStorage.removeItem(key); - - // Dispatch ahooks sync event to update useLocalStorageState - if (oldValue !== null) { - window.dispatchEvent( - new CustomEvent('AHOOKS_SYNC_STORAGE_EVENT_NAME', { - detail: { - key, - newValue: null, - oldValue, - storageArea: localStorage - } - }) - ); - } - } catch (error) { - console.error('Failed to clear activity ad storage:', error); + console.error('Failed to clear ad storage:', error); } }; export const clearToken = () => { try { - clearOperationalAdStorage(); + clearAdStorage(); return loginOut(); } catch (error) { error;