Skip to content

hotfx: change object keys of New Update modal #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaryWylde merged 1 commit into from
Dec 15, 2025
Merged

hotfx: change object keys of New Update modal #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/NewUpdateModal/NewUpdateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import type { NewUpdateModalProps } from './NewUpdateModal.types';
import styles from './NewUpdateModal.module.scss';

const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
const closeText = data?.['Close button text'];
const socialLink = data?.['Social media link'];

return (
<Modal
onClick={onClose}
Expand All @@ -27,7 +30,7 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
className={styles.img}
alt={'New Update'}
/>
<Link href={data?.socialMediaLink} target={'_blank'}>
<Link href={socialLink} target={'_blank'}>
<Image
src={'/assets/insta-icon.svg'}
alt={'Insta Icon'}
Expand All @@ -40,7 +43,7 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
<div className={styles.content}>
<ReactMarkdown>{data?.description}</ReactMarkdown>
<Button
label={data?.buttonText}
label={closeText}
onClick={onClose}
className={styles['closeBtn']}
/>
Expand Down
19 changes: 11 additions & 8 deletions src/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,32 +272,35 @@ function App({ Component, pageProps: { session, ...pageProps } }: TApp) {
}, []);

useEffect(() => {
if (!router.isReady) return;

const getData = async () => {
try {
const locale = router.locale === '' ? 'en' : 'ru';
const locale = router.locale === 'ru' ? 'ru' : 'en';
const data = await getNewUpdate(locale);
if (data) {
setNewUpdateModalData(data);
}

if (data) setNewUpdateModalData(data);
} catch (error) {
console.error('Error fetching new update data:', error);
}
};

getData();
}, []);
}, [router.isReady, router.locale]);

useEffect(() => {
const hasSeen = document.cookie.includes('updateModalSeen=true');
if (hasSeen) return;

if (!newUpdateModalData?.showModal) return;
if (!newUpdateModalData?.['Frontend modal visibility']) return;
const appearsAfter = newUpdateModalData['Appears after ... seconds'];

const timeout = setTimeout(() => {
setIsNewUpdateModalVisible(true);
}, newUpdateModalData?.showAfter * 1000);
}, appearsAfter * 1000);

return () => clearTimeout(timeout);
}, [newUpdateModalData?.showModal, newUpdateModalData?.showAfter]);
}, [newUpdateModalData, newUpdateModalData?.['Appears after ... seconds']]);

const handleCloseModal = () => {
setIsNewUpdateModalVisible(false);
Expand Down