From dae6c30791873fdf01db9377def88a85225af7a4 Mon Sep 17 00:00:00 2001
From: Pjero Nizetic <pjero@janeasystems.com>
Date: Thu, 25 Jan 2024 17:47:17 +0100
Subject: [PATCH] Minor flow bug fixes

---
 src/common/translations/en.js                |  1 +
 src/components/footer/footer.js              |  6 +++++-
 src/pages/convert/index.js                   |  8 +++-----
 src/pages/create-manifest/create-manifest.js | 10 ++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/common/translations/en.js b/src/common/translations/en.js
index 9b2ded0..34bfa88 100644
--- a/src/common/translations/en.js
+++ b/src/common/translations/en.js
@@ -143,6 +143,7 @@ const en = {
     'review.plus.create': 'Review + Create',
     review: 'Review',
     convert: 'Convert',
+    'convert.download': 'Download Package and Convert',
     'request.failed': 'Request failed. Please try again.',
     'rotation.in.degrees': 'Rotation in degrees',
     save: 'Save',
diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js
index f9dbaf8..8f00b45 100644
--- a/src/components/footer/footer.js
+++ b/src/components/footer/footer.js
@@ -93,7 +93,11 @@ export const Footer = () => {
   return (
     <div className={footerContainerStyle}>
       <PrimaryButton className={buttonStyle} onClick={onReview} disabled={isRunningIMDFConversion}>
-        {featureFlags.onboardingEnabled ? (isPlacesPreview ? t('convert') : t('create.download')) : t('download')}
+        {featureFlags.onboardingEnabled
+          ? isPlacesPreview
+            ? t('convert.download')
+            : t('create.download')
+          : t('download')}
       </PrimaryButton>
       <DefaultButton
         className={buttonStyle}
diff --git a/src/pages/convert/index.js b/src/pages/convert/index.js
index 6bd7cbf..e69eba3 100644
--- a/src/pages/convert/index.js
+++ b/src/pages/convert/index.js
@@ -92,11 +92,9 @@ const ConvertTab = () => {
             link={diagnosticPackageLocation}
             json={conversionOperationLog}
           />
-          <DownloadIMDF
-            type="conversion"
-            isFailed={conversionStepStatus === conversionStatuses.failed}
-            link={imdfPackageLocation}
-          />
+          {conversionStepStatus !== conversionStatuses.finishedSuccessfully && (
+            <DownloadIMDF type="conversion" link={imdfPackageLocation} />
+          )}
         </div>
       )}
     </div>
diff --git a/src/pages/create-manifest/create-manifest.js b/src/pages/create-manifest/create-manifest.js
index 755fb79..4cca2ef 100644
--- a/src/pages/create-manifest/create-manifest.js
+++ b/src/pages/create-manifest/create-manifest.js
@@ -2,7 +2,7 @@ import { cx } from '@emotion/css';
 import { MessageBar, MessageBarType, PrimaryButton, TextField } from '@fluentui/react';
 import { PATHS } from 'common';
 import { getEnvs } from 'common/functions';
-import { useResponseStore, useUserStore } from 'common/store';
+import { resetStores, useConversionStore, useResponseStore, useUserStore } from 'common/store';
 import Dropdown from 'components/dropdown';
 import FieldLabel from 'components/field-label';
 import { useCustomNavigate } from 'hooks';
@@ -36,6 +36,7 @@ export const TEST_ID = {
 
 const userStoreSelector = s => [s.setGeography, s.geography, s.setSubscriptionKey, s.subscriptionKey];
 const responseStoreSelector = s => [s.acknowledgeError, s.errorMessage, s.uploadFile];
+const conversionStoreSelector = s => s.reset;
 
 const CreateManifestPage = () => {
   const { t } = useTranslation();
@@ -46,6 +47,7 @@ const CreateManifestPage = () => {
 
   const [setGeo, geo, setSubKey, subKey] = useUserStore(userStoreSelector, shallow);
   const [acknowledgeApiError, apiErrorMessage, uploadFile] = useResponseStore(responseStoreSelector, shallow);
+  const resetConversionStore = useConversionStore(conversionStoreSelector);
 
   const environmentOptions = useMemo(
     () =>
@@ -56,7 +58,11 @@ const CreateManifestPage = () => {
     [t]
   );
 
-  useEffect(() => acknowledgeApiError, []); // eslint-disable-line react-hooks/exhaustive-deps
+  useEffect(() => {
+    resetStores();
+    resetConversionStore();
+    acknowledgeApiError();
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     if (apiErrorMessage) {