diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
index 9aafdd8..c0fbc2b 100644
--- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
+++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
@@ -48,6 +48,17 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
       descFlexConTextTitle = genericResponseModel!.pDESCFLEXCONTEXTNAME ?? "";
       getEitDffStructureList = genericResponseModel?.getEITDFFStructureList ?? [];
       //getEitDffStructureList = getEitDffStructureList!.where((element) => element.dISPLAYFLAG != "N").toList();
+      if (dynamicParams!.collectionNotificationList != null && dynamicParams!.collectionNotificationList!.isNotEmpty) {
+        getEitDffStructureList!.forEach((element) {
+          dynamicParams!.collectionNotificationList!.forEach((element2) {
+            if (element.sEGMENTNAME == element2.segmentName) {
+              element.fieldAnswer = element2.varchar2Value;
+              element.eSERVICESDV ??= ESERVICESDV();
+              element.eSERVICESDV!.pIDCOLUMNNAME = element2.varchar2Value;
+            }
+          });
+        });
+      }
       Utils.hideLoading(context);
       setState(() {});
     } catch (ex) {
@@ -57,51 +68,56 @@ class _DynamicInputScreenState extends State<DynamicInputScreen> {
   }
 
   void validateTransaction() async {
-    /// try {
-    Utils.showLoading(context);
-    List<Map<String, dynamic>> values = getEitDffStructureList!.map((e) {
-      String tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
-      if (e.fORMATTYPE == "X") {
-        // for date format type, date format is changed
-        tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
-        if (tempVar.isNotEmpty) {
-          if (!tempVar.contains("/")) {
-            DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
-            tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
+    try {
+      Utils.showLoading(context);
+      List<Map<String, dynamic>> values = getEitDffStructureList!.map((e) {
+        String tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
+        if (e.fORMATTYPE == "X") {
+          // for date format type, date format is changed
+          tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
+          if (tempVar.isNotEmpty) {
+            if (!tempVar.contains("/")) {
+              DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
+              tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
+            }
           }
         }
+        // else if (e.fORMATTYPE == "N") {
+        //   // for date format type, date format is changed
+        //   tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
+        //   print("------------------------sEGMENTNAME:${e.sEGMENTNAME}");
+        //   print("------------------------tempVar:$tempVar");
+        //   if (tempVar.isNotEmpty) {
+        //     if (!tempVar.contains("/")) {
+        //       DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
+        //       tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
+        //     }
+        //   }
+        // }
+        return ValidateEitTransactionModel(dATEVALUE: null, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: tempVar.toString()).toJson();
+      }).toList();
+
+      values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_ACTION", nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: "NEW_ROW").toJson());
+      values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_EXTRA_INFO_ID", nUMBERVALUE: -1, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
+      values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_OBJECT_VERSION_NUMBER", nUMBERVALUE: 0, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
+
+      genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      if (dynamicParams!.collectionNotificationList != null && dynamicParams!.collectionNotificationList!.isNotEmpty) {
+        Utils.hideLoading(context);
+        Navigator.pop(context, values);
+        return;
       }
-      // else if (e.fORMATTYPE == "N") {
-      //   // for date format type, date format is changed
-      //   tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? "";
-      //   print("------------------------sEGMENTNAME:${e.sEGMENTNAME}");
-      //   print("------------------------tempVar:$tempVar");
-      //   if (tempVar.isNotEmpty) {
-      //     if (!tempVar.contains("/")) {
-      //       DateTime date = DateFormat('yyyy-MM-dd').parse(tempVar);
-      //       tempVar = DateFormat('yyyy/MM/dd HH:mm:ss').format(date);
-      //     }
-      //   }
-      // }
-      return ValidateEitTransactionModel(dATEVALUE: null, nAME: e.aPPLICATIONCOLUMNNAME, nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: tempVar.toString()).toJson();
-    }).toList();
-
-    values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_ACTION", nUMBERVALUE: null, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: "NEW_ROW").toJson());
-    values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_EXTRA_INFO_ID", nUMBERVALUE: -1, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
-    values.add(ValidateEitTransactionModel(dATEVALUE: null, nAME: "PEI_OBJECT_VERSION_NUMBER", nUMBERVALUE: 0, tRANSACTIONNUMBER: 1, vARCHAR2VALUE: null).toJson());
-
-    genericResponseModel = await MyAttendanceApiClient().validateEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
-    SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
-    Utils.hideLoading(context);
-    await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
-        arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit'));
-    Utils.showLoading(context);
-    await LeaveBalanceApiClient().cancelHrTransaction(submitEITTransactionList.pTRANSACTIONID!);
-    Utils.hideLoading(context);
-    // } catch (ex) {
-    //   Utils.hideLoading(context);
-    //   Utils.handleException(ex, context, null);
-    // }
+      SubmitEITTransactionList submitEITTransactionList = await MyAttendanceApiClient().submitEitTransaction(dESCFLEXCONTEXTCODE, dynamicParams!.dynamicId, values);
+      Utils.hideLoading(context);
+      await Navigator.pushNamed(context, AppRoutes.requestSubmitScreen,
+          arguments: RequestSubmitScreenParams(LocaleKeys.submit.tr(), submitEITTransactionList.pTRANSACTIONID!, submitEITTransactionList.pITEMKEY!, 'eit'));
+      Utils.showLoading(context);
+      await LeaveBalanceApiClient().cancelHrTransaction(submitEITTransactionList.pTRANSACTIONID!);
+      Utils.hideLoading(context);
+    } catch (ex) {
+      Utils.hideLoading(context);
+      Utils.handleException(ex, context, null);
+    }
   }
 
   String dESCFLEXCONTEXTCODE = "";
diff --git a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
index ecc2426..226eae9 100644
--- a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
+++ b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart
@@ -88,7 +88,7 @@ class _DynamicInputScreenState extends State<DynamicInputScreenAddress> {
         getAddressDffStructureList!
             .insert(1, GetAddressDffStructureList(fORMATTYPE: 'C', sEGMENTPROMPT: LocaleKeys.profile_country.tr(), eSERVICESVS: eSerivceList, getEmployeeAddressList: GetEmployeeAddressList()));
       }
-      print(getAddressDffStructureList);
+
       // genericResponseModel = await ProfileApiClient().getColStructure(dynamicParams!.dynamicId, 'GET_BASIC_DET_COLS_STRUCTURE', dynamicParams!.requestID);
       // getBasicDetColsStructureList = genericResponseModel?.getBasicDetColsStructureList ?? [];
       // getBasicDetColsStructureList?.forEach((element) {
diff --git a/lib/ui/work_list/sheets/update_continue_sheet.dart b/lib/ui/work_list/sheets/update_continue_sheet.dart
index 169e12e..1e4e5f3 100644
--- a/lib/ui/work_list/sheets/update_continue_sheet.dart
+++ b/lib/ui/work_list/sheets/update_continue_sheet.dart
@@ -29,7 +29,7 @@ class UpdateContinueSheet extends StatefulWidget {
 class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
   double itemHeight = 0;
   double itemWidth = 0;
-
+  List<Map<String, dynamic>> validatedValues = [];
   @override
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
@@ -99,17 +99,22 @@ class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
     try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> values = [];
-      for (GetEitCollectionNotificationBodyList element in widget.getEitCollectionNotificationBodyList!) {
-        for (CollectionNotificationEit collectionElement in element.collectionNotification!) {
-          values.add({
-            "TRANSACTION_NUMBER": collectionElement.transactionNumber,
-            "NAME": collectionElement.applicationColumnName,
-            "VARCHAR2_VALUE": collectionElement.varchar2Value,
-            "NUMBER_VALUE": collectionElement.numberValue,
-            "DATE_VALUE": collectionElement.dateValue,
-          });
+      if (validatedValues!.isNotEmpty) {
+        values = validatedValues;
+      } else {
+        for (GetEitCollectionNotificationBodyList element in widget.getEitCollectionNotificationBodyList!) {
+          for (CollectionNotificationEit collectionElement in element.collectionNotification!) {
+            values.add({
+              "TRANSACTION_NUMBER": collectionElement.transactionNumber,
+              "NAME": collectionElement.applicationColumnName,
+              "VARCHAR2_VALUE": collectionElement.varchar2Value,
+              "NUMBER_VALUE": collectionElement.numberValue,
+              "DATE_VALUE": collectionElement.dateValue,
+            });
+          }
         }
       }
+
       ResubmitEITRequestResponse resubmitEITRequestResponse = await MyAttendanceApiClient().reSubmitEitTransaction(widget.workListData!.iTEMKEY!, widget.workListData!.nOTIFICATIONID, values);
       Utils.hideLoading(context);
       await Navigator.pushNamed(
@@ -124,8 +129,9 @@ class _UpdateContinueSheetState extends State<UpdateContinueSheet> {
   }
 
   void performEditAction() {
-    //Open EIT Edit Screen
-
-    Navigator.pushNamed(context, AppRoutes.addDynamicInput, arguments: widget.dynamicParams);
+    // ignore: avoid_annotating_with_dynamic
+    Navigator.pushNamed(context, AppRoutes.addDynamicInput, arguments: widget.dynamicParams).then((dynamic value) {
+      validatedValues = value;
+    });
   }
 }