From be295b03dde95e36f75c1e02d41244ab6bff0749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Zakrzewski?=
 <stanislaw.zakrzewski@htdevelopers.com>
Date: Tue, 23 Apr 2024 15:58:40 +0200
Subject: [PATCH] Fix merging issues

---
 .../curator-service/ui/src/components/App/App.test.tsx      | 6 +++---
 .../curator-service/ui/src/components/App/index.tsx         | 2 +-
 .../ui/src/components/DownloadButton/index.tsx              | 2 +-
 .../ui/src/components/landing-page/LandingPage.test.tsx     | 2 +-
 .../ui/src/components/landing-page/LandingPage.tsx          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/verification/curator-service/ui/src/components/App/App.test.tsx b/verification/curator-service/ui/src/components/App/App.test.tsx
index 00fe5f4be..4ed4f3e25 100644
--- a/verification/curator-service/ui/src/components/App/App.test.tsx
+++ b/verification/curator-service/ui/src/components/App/App.test.tsx
@@ -24,9 +24,9 @@ beforeEach(() => {
     vi.clearAllMocks();
 });
 
-beforeAll(() => {
-    process.env.VITE_APP_DATA_DICTIONARY_LINK = mockedDataDictionaryLink;
-});
+// beforeAll(() => {
+//     process.env.VITE_APP_DATA_DICTIONARY_LINK = mockedDataDictionaryLink;
+// });
 
 describe('<App />', () => {
     it('renders without crashing when logged in', async () => {
diff --git a/verification/curator-service/ui/src/components/App/index.tsx b/verification/curator-service/ui/src/components/App/index.tsx
index 489ab4224..3763c1718 100644
--- a/verification/curator-service/ui/src/components/App/index.tsx
+++ b/verification/curator-service/ui/src/components/App/index.tsx
@@ -218,7 +218,7 @@ function ProfileMenu(props: { user: User; version: string }): JSX.Element {
                 <a
                     rel="noopener noreferrer"
                     target="_blank"
-                    href={process.env.REACT_APP_DATA_DICTIONARY_LINK}
+                    href={import.meta.env.VITE_APP_DATA_DICTIONARY_LINK}
                     onClick={handleClose}
                     className={classes.link}
                 >
diff --git a/verification/curator-service/ui/src/components/DownloadButton/index.tsx b/verification/curator-service/ui/src/components/DownloadButton/index.tsx
index 2e05b2874..8549e8903 100644
--- a/verification/curator-service/ui/src/components/DownloadButton/index.tsx
+++ b/verification/curator-service/ui/src/components/DownloadButton/index.tsx
@@ -249,7 +249,7 @@ export function DownloadButton(): JSX.Element {
 
                     <Typography variant="body2">
                         <a
-                            href={process.env.REACT_APP_DATA_DICTIONARY_LINK}
+                            href={import.meta.env.VITE_APP_DATA_DICTIONARY_LINK}
                             target="_blank"
                             rel="noreferrer"
                         >
diff --git a/verification/curator-service/ui/src/components/landing-page/LandingPage.test.tsx b/verification/curator-service/ui/src/components/landing-page/LandingPage.test.tsx
index ab7ad2b21..0183cc427 100644
--- a/verification/curator-service/ui/src/components/landing-page/LandingPage.test.tsx
+++ b/verification/curator-service/ui/src/components/landing-page/LandingPage.test.tsx
@@ -12,7 +12,7 @@ const mockedDataDictionaryLink = 'https://global.health/data-dictionary';
 
 beforeAll(() => {
     server.listen();
-    process.env.REACT_APP_DATA_DICTIONARY_LINK = mockedDataDictionaryLink;
+    import.meta.env.VITE_APP_DATA_DICTIONARY_LINK = mockedDataDictionaryLink;
 });
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
diff --git a/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx b/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx
index d7082ca84..36ff20863 100644
--- a/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx
+++ b/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx
@@ -155,7 +155,7 @@ const MoreInformationLinks = ({
                 </div>
                 <div className={classes.link}>
                     <a
-                        href={process.env.REACT_APP_DATA_DICTIONARY_LINK}
+                        href={import.meta.env.VITE_APP_DATA_DICTIONARY_LINK}
                         rel="noopener noreferrer"
                         target="_blank"
                     >