Fix merging issues

globaldothealth · Apr 23, 2024 · be295b0 · be295b0
1 parent 2513917
commit be295b0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
                     >