From b55a11ceca824ea7ddca77df1a8b9065461aa723 Mon Sep 17 00:00:00 2001
From: josephalexantony-aot <alex.antony@aot-technologies.com>
Date: Wed, 4 Dec 2024 04:13:48 -0800
Subject: [PATCH 1/3] FWF-4012:[Feature] - Doted line for Migration modal.

---
 .../src/components/SvgIcons/index.tsx           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/forms-flow-components/src/components/SvgIcons/index.tsx b/forms-flow-components/src/components/SvgIcons/index.tsx
index c30dd304..1b80cd71 100644
--- a/forms-flow-components/src/components/SvgIcons/index.tsx
+++ b/forms-flow-components/src/components/SvgIcons/index.tsx
@@ -668,3 +668,20 @@ export const StarPremiumIcon = ({ color = baseColor,...props }) => (
   </svg>
 );
 
+export const StrokeLine = ({ color = grayColor}) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="318"
+    height="3"
+    viewBox="0 0 318 3"
+    fill="none"
+  >
+    <path
+      d="M1 1.5L317 1.50003"
+      stroke={color}
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeDasharray="8 8"
+    />
+  </svg>
+);

From c5c77fcec47245cc15233151c639806cc553f942 Mon Sep 17 00:00:00 2001
From: josephalexantony-aot <alex.antony@aot-technologies.com>
Date: Thu, 5 Dec 2024 01:52:41 -0800
Subject: [PATCH 2/3] FWF-4012:{Feature] - Confirm modal updates.

---
 .../CustomComponents/ConfirmModal.tsx           |  5 ++++-
 .../src/components/SvgIcons/index.tsx           | 17 -----------------
 forms-flow-theme/scss/_forms.scss               |  5 +++++
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/forms-flow-components/src/components/CustomComponents/ConfirmModal.tsx b/forms-flow-components/src/components/CustomComponents/ConfirmModal.tsx
index b7df50c7..42d16c6b 100644
--- 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/SvgIcons/index.tsx b/forms-flow-components/src/components/SvgIcons/index.tsx
index 1b80cd71..c30dd304 100644
--- a/forms-flow-components/src/components/SvgIcons/index.tsx
+++ b/forms-flow-components/src/components/SvgIcons/index.tsx
@@ -668,20 +668,3 @@ export const StarPremiumIcon = ({ color = baseColor,...props }) => (
   </svg>
 );
 
-export const StrokeLine = ({ color = grayColor}) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="318"
-    height="3"
-    viewBox="0 0 318 3"
-    fill="none"
-  >
-    <path
-      d="M1 1.5L317 1.50003"
-      stroke={color}
-      strokeWidth="2"
-      strokeLinecap="round"
-      strokeDasharray="8 8"
-    />
-  </svg>
-);
diff --git a/forms-flow-theme/scss/_forms.scss b/forms-flow-theme/scss/_forms.scss
index d97d127c..e2d2d998 100644
--- 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);
+}
\ No newline at end of file

From 3aedcbb6ee0a162242914f2efbeda4356e2f60aa Mon Sep 17 00:00:00 2001
From: josephalexantony-aot <alex.antony@aot-technologies.com>
Date: Thu, 5 Dec 2024 23:21:39 -0800
Subject: [PATCH 3/3] FWF-4012:[Feature] - Minor version increment in import
 modal dropdown.

---
 .../src/components/CustomComponents/ImportModal.tsx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms-flow-components/src/components/CustomComponents/ImportModal.tsx b/forms-flow-components/src/components/CustomComponents/ImportModal.tsx
index 9cae129f..cacf085e 100644
--- 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)`,
       },
     ];