Merge pull request #360 from AOT-Technologies/Feature/FWF-4012-Migrat…

…ion-modal FWF-4012:[Feature] - Doted line for Migration modal.
AOT-Technologies · Dec 9, 2024 · c695726 · c695726
2 parents f95ba3d + 3aedcbb
commit c695726
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/forms-flow-components/src/components/CustomComponents/ConfirmModal.tsx b/forms-flow-components/src/components/CustomComponents/ConfirmModal.tsx
@@ -18,6 +18,7 @@ interface ConfirmModalProps {
   primaryBtndataTestid?: string;
   primaryBtnariaLabel?: string;
   secondoryBtnariaLabel?: string;
+  buttonLoading?:boolean;
 }
 
 export const ConfirmModal: React.FC<ConfirmModalProps> = React.memo(({
@@ -34,7 +35,8 @@ export const ConfirmModal: React.FC<ConfirmModalProps> = React.memo(({
   secondoryBtndataTestid = 'cancel-button',
   primaryBtndataTestid = 'Confirm-button',
   primaryBtnariaLabel = 'Confirm Button',
-  secondoryBtnariaLabel = 'Cancel Button'
+  secondoryBtnariaLabel = 'Cancel Button',
+  buttonLoading= false,
 }) => {
   return (
     <>
@@ -89,6 +91,7 @@ export const ConfirmModal: React.FC<ConfirmModalProps> = React.memo(({
             onClick={primaryBtnAction}
             dataTestid={primaryBtndataTestid}
             ariaLabel={primaryBtnariaLabel}
+            buttonLoading={buttonLoading}
           />
           <CustomButton
             variant="secondary"

diff --git a/forms-flow-components/src/components/CustomComponents/ImportModal.tsx b/forms-flow-components/src/components/CustomComponents/ImportModal.tsx
@@ -97,7 +97,7 @@ export const ImportModal: React.FC<ImportModalProps> = React.memo(
       },
       {
         value: "minor",
-        label: `import as version ${fileItems?.form?.majorVersion}.${fileItems?.form?.minorVersion} (impacts previous and new submissions)`,
+        label: `import as version ${fileItems?.form?.majorVersion}.${fileItems?.form?.minorVersion + 1 }  (impacts previous and new submissions)`,
       },
     ];
 

diff --git a/forms-flow-theme/scss/_forms.scss b/forms-flow-theme/scss/_forms.scss
@@ -459,3 +459,8 @@ select option:hover {
     display: none !important;
   }
 }
+
+.dashed-line {
+  width: 8.8125rem;
+  border-top: 0.1875rem dashed var(--ff-gray-300);
+}
-Original file line number
+Diff line change
@@ Expand Up @@
           },
           {
             value: "minor",
-            label: `import as version ${fileItems?.form?.majorVersion}.${fileItems?.form?.minorVersion} (impacts previous and new submissions)`,
+            label: `import as version ${fileItems?.form?.majorVersion}.${fileItems?.form?.minorVersion + 1 }  (impacts previous and new submissions)`,
           },
         ];
@@ Expand Down @@