From fc8d671d10868603ea350cd2e1ccadfe44d85496 Mon Sep 17 00:00:00 2001
From: MaryWylde <marykhachatryan13@gmail.com>
Date: Mon, 15 Dec 2025 23:35:31 +0400
Subject: [PATCH 1/4] hotfx: change object keys of New Update modal

---
 .../NewUpdateModal/NewUpdateModal.tsx         |  7 +++++--
 src/pages/_app.tsx                            | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/NewUpdateModal/NewUpdateModal.tsx b/src/components/NewUpdateModal/NewUpdateModal.tsx
index bddef6d..d72d8ba 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.tsx
+++ b/src/components/NewUpdateModal/NewUpdateModal.tsx
@@ -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}
@@ -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'}
@@ -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']}
         />
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 5a4b77a..5c1aa5b 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -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);

From fde8b11244b218c0f096ffe10a6a81430e759321 Mon Sep 17 00:00:00 2001
From: MaryWylde <marykhachatryan13@gmail.com>
Date: Tue, 16 Dec 2025 13:01:40 +0400
Subject: [PATCH 2/4] hotfix: change ... with x

---
 src/components/NewUpdateModal/NewUpdateModal.tsx | 2 +-
 src/pages/_app.tsx                               | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/NewUpdateModal/NewUpdateModal.tsx b/src/components/NewUpdateModal/NewUpdateModal.tsx
index d72d8ba..a19cb45 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.tsx
+++ b/src/components/NewUpdateModal/NewUpdateModal.tsx
@@ -24,7 +24,7 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
     >
       <div>
         <Image
-          src={`${process.env.NEXT_PUBLIC_STRAPI}${data?.image?.data.attributes.url}`}
+          src={`${process.env.NEXT_PUBLIC_STRAPI}${data?.image?.data?.attributes?.url}`}
           width={481}
           height={121}
           className={styles.img}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 5c1aa5b..70b1511 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -293,14 +293,13 @@ function App({ Component, pageProps: { session, ...pageProps } }: TApp) {
     if (hasSeen) return;
 
     if (!newUpdateModalData?.['Frontend modal visibility']) return;
-    const appearsAfter = newUpdateModalData['Appears after ... seconds'];
-
+    const appearsAfter = newUpdateModalData?.['Appears after x seconds'];
     const timeout = setTimeout(() => {
       setIsNewUpdateModalVisible(true);
     }, appearsAfter * 1000);
 
     return () => clearTimeout(timeout);
-  }, [newUpdateModalData, newUpdateModalData?.['Appears after ... seconds']]);
+  }, [newUpdateModalData, newUpdateModalData?.['Appears after x seconds']]);
 
   const handleCloseModal = () => {
     setIsNewUpdateModalVisible(false);

From 424074fb3953783c23f50b81904759dc66df6d4d Mon Sep 17 00:00:00 2001
From: MaryWylde <marykhachatryan13@gmail.com>
Date: Tue, 16 Dec 2025 17:57:46 +0400
Subject: [PATCH 3/4] hotfix: change alignment of the modal conente and
 appearance logic

---
 .../NewUpdateModal/NewUpdateModal.module.scss | 26 ++++++++++------
 .../NewUpdateModal/NewUpdateModal.tsx         | 12 ++++----
 src/pages/_app.tsx                            | 30 ++++++++++++++-----
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/components/NewUpdateModal/NewUpdateModal.module.scss b/src/components/NewUpdateModal/NewUpdateModal.module.scss
index 9c0335c..7ec109a 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.module.scss
+++ b/src/components/NewUpdateModal/NewUpdateModal.module.scss
@@ -1,29 +1,37 @@
 .modalBody {
   padding: 0 0 22px 0 !important;
+
   .img {
     position: relative;
     width: 100%;
   }
 }
+
 .content {
-  text-align: center;
+  text-align: left;
   padding: 8px 30px 0 30px;
 }
+
 .instaIcon {
   position: absolute;
   right: 34%;
   top: 21%;
   cursor: pointer;
 }
-.closeBtn {
-  border-radius: 0;
-  background-color: #000;
-  color: #fff;
-  margin-top: 32px;
-  border: 1px solid #000 !important;
 
-  &:hover {
+.btnWrapper {
+  text-align: center;
+
+  .closeBtn {
+    border-radius: 0;
+    background-color: #000;
+    color: #fff;
+    margin-top: 32px;
     border: 1px solid #000 !important;
-    color: #fff !important;
+
+    &:hover {
+      border: 1px solid #000 !important;
+      color: #fff !important;
+    }
   }
 }
diff --git a/src/components/NewUpdateModal/NewUpdateModal.tsx b/src/components/NewUpdateModal/NewUpdateModal.tsx
index a19cb45..471857d 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.tsx
+++ b/src/components/NewUpdateModal/NewUpdateModal.tsx
@@ -42,11 +42,13 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
       </div>
       <div className={styles.content}>
         <ReactMarkdown>{data?.description}</ReactMarkdown>
-        <Button
-          label={closeText}
-          onClick={onClose}
-          className={styles['closeBtn']}
-        />
+        <div className={styles.btnWrapper}>
+          <Button
+            label={closeText}
+            onClick={onClose}
+            className={styles['closeBtn']}
+          />
+        </div>
       </div>
     </Modal>
   );
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 70b1511..5a8408e 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -288,23 +288,39 @@ function App({ Component, pageProps: { session, ...pageProps } }: TApp) {
     getData();
   }, [router.isReady, router.locale]);
 
+  const setUpdateModalSeen = () => {
+    document.cookie = `updateModalSeen=true; path=/; max-age=31536000`;
+  };
+
   useEffect(() => {
+    if (!newUpdateModalData) return;
+
+    const visibility = newUpdateModalData['Frontend modal visibility'];
+    if (visibility == null) return;
+
+    if (visibility === false) {
+      setIsNewUpdateModalVisible(false);
+      document.cookie = `updateModalSeen=; path=/; max-age=0`;
+      return;
+    }
+
     const hasSeen = document.cookie.includes('updateModalSeen=true');
     if (hasSeen) return;
 
-    if (!newUpdateModalData?.['Frontend modal visibility']) return;
-    const appearsAfter = newUpdateModalData?.['Appears after x seconds'];
-    const timeout = setTimeout(() => {
+    const appearsAfter = Number(
+      newUpdateModalData['Appears after x seconds'] ?? 0,
+    );
+
+    const timeout = window.setTimeout(() => {
       setIsNewUpdateModalVisible(true);
     }, appearsAfter * 1000);
 
-    return () => clearTimeout(timeout);
-  }, [newUpdateModalData, newUpdateModalData?.['Appears after x seconds']]);
+    return () => window.clearTimeout(timeout);
+  }, [newUpdateModalData]);
 
   const handleCloseModal = () => {
     setIsNewUpdateModalVisible(false);
-
-    document.cookie = 'updateModalSeen=true; path=/; max-age=31536000';
+    setUpdateModalSeen();
   };
 
   useEffect(() => {

From a17bf750ab7b433098f1a439d61ae16f071c5777 Mon Sep 17 00:00:00 2001
From: MaryWylde <marykhachatryan13@gmail.com>
Date: Tue, 16 Dec 2025 18:55:19 +0400
Subject: [PATCH 4/4] hotfix: add _blank to Update Modal anchor tags

---
 src/components/NewUpdateModal/NewUpdateModal.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/NewUpdateModal/NewUpdateModal.tsx b/src/components/NewUpdateModal/NewUpdateModal.tsx
index 471857d..a241f97 100644
--- a/src/components/NewUpdateModal/NewUpdateModal.tsx
+++ b/src/components/NewUpdateModal/NewUpdateModal.tsx
@@ -41,7 +41,15 @@ const NewUpdateModal: FC<NewUpdateModalProps> = ({ data, onClose }) => {
         </Link>
       </div>
       <div className={styles.content}>
-        <ReactMarkdown>{data?.description}</ReactMarkdown>
+        <ReactMarkdown
+          components={{
+            a: ({ node, ...props }) => (
+              <a {...props} target="_blank" rel="noopener noreferrer" />
+            ),
+          }}
+        >
+          {data.description}
+        </ReactMarkdown>
         <div className={styles.btnWrapper}>
           <Button
             label={closeText}