@os1-platform/dispatch-mobile 1.3.11 → 2.0.1

package/lib/commonjs/components/executiontasks/scan/ScanET.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _reactNative = require("react-native");
 var _react = _interopRequireWildcard(require("react"));
+var _ScanSchema = require("./ScanSchema");
 var _CommonStyles = require("../../../styles/executionTasks/CommonStyles");
 var _ProgressDialog = _interopRequireDefault(require("../../widgets/ProgressDialog"));
 var _strings = require("../../../res/strings");
@@ -14,17 +15,22 @@ var _utils = require("./utils");
 var _SnackBarCustom = _interopRequireWildcard(require("../../widgets/SnackBarCustom"));
 var _reactNativePaper = require("react-native-paper");
 var _native = require("@react-navigation/native");
-var _ScanList = _interopRequireDefault(require("./sub_components/ScanList"));
 var _utils2 = require("../../../utils/utils");
 var _interfaces = require("./interfaces");
 var _ExecTaskUtils = require("../../../utils/ExecTaskUtils");
 var _ETConfig = require("../../../models/execTasks/ETConfig");
-var _EventCodeContainer = require("../../../manager/dispatchCodes/EventCodeContainer");
 var _constants = require("./constants");
 var _ERDropDown = _interopRequireDefault(require("./sub_components/ERDropDown"));
 var _DropDownUtils = require("./sub_components/DropDownUtils");
 var _constants2 = require("../../../constants/constants");
 var _MaterialIcons = _interopRequireDefault(require("react-native-vector-icons/MaterialIcons"));
+var _platformCoreosExecutionEngineSdk = require("@os1-platform/platform-coreos-execution-engine-sdk");
+var _SummaryPage = _interopRequireDefault(require("./sub_components/SummaryPage"));
+var _RouteParams = require("../../../ui/uiConfig/RouteParams");
+var _constants3 = require("../../../manager/syncmanager/constants");
+var _vectorIcons = require("@expo/vector-icons");
+var _GoBackModal = _interopRequireDefault(require("../../../components/widgets/GoBackModal"));
+var _utils3 = require("../../../components/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -42,7 +48,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 
 const ScanET = props => {
-  var _props$wfMeta, _props$additionalMult, _props$meta, _props$meta2, _props$meta6;
+  var _props$wfMeta, _props$additionalMult, _props$meta;
+  const prefixedMergedObjectiveId = props.route.params[_RouteParams.RouteParams.ROOT_META_DATA].prefixedMergedObjectiveId;
+  const [isScreenLoaded, setIsScreenLoaded] = (0, _react.useState)({
+    ercSelectorLoaded: false,
+    shipmentCountLoaded: false,
+    previousDataLoaded: false
+  });
   const isErcSelector = props.ercSelector ? true : false;
   const isMultiObjectiveEnable = (_props$wfMeta = props.wfMeta) === null || _props$wfMeta === void 0 ? void 0 : _props$wfMeta.enableMultiObjectiveFlow;
   const allowMultiObjectivePartial = isMultiObjectiveEnable === true && ((_props$additionalMult = props.additionalMultiConfig) === null || _props$additionalMult === void 0 ? void 0 : _props$additionalMult.validationType) === 'SUBSET_OF_LIST' || false;
@@ -64,42 +76,95 @@ const ScanET = props => {
    */
 
   const [scansMap, setScansMap] = (0, _react.useState)(new Map());
-  const [showModal, setShowModal] = (0, _react.useState)(false);
-  const [isCompleted, setIsCompleted] = (0, _react.useState)(() => (0, _utils.isETCompleted)(props.validation, scansMap, props.scanMode, isMultiObjectiveEnable, undefined, SINGLE_MODE_COUNT, allowMultiObjectivePartial)); // to decide if ET is completed
-  const [scannedInput, setScannedInput] = (0, _react.useState)('');
+  const [scannedInput, setScannedInput] = (0, _react.useState)(''); // state to capture scan
   const refInput = (0, _react.useRef)(null);
-  const [selectedReason, setSelectedReason] = (0, _react.useState)();
-  const [selectedEventCode, setSelectedEventCode] = (0, _react.useState)();
-  const [reasonItems, setReasonItems] = (0, _react.useState)();
-  const [eventCodeItems, setEventCodeItems] = (0, _react.useState)();
-  let blindDataMap = new Map((_props$meta2 = props.meta) === null || _props$meta2 === void 0 ? void 0 : _props$meta2.blindData);
+  const [selectedReason, setSelectedReason] = (0, _react.useState)(); // reason code from ercSelector
+  const [selectedEventCode, setSelectedEventCode] = (0, _react.useState)(); // reason code from ercSelector
+  const [reasonItems, setReasonItems] = (0, _react.useState)(); // list of reason codes
+  const [eventCodeItems, setEventCodeItems] = (0, _react.useState)(); // list of event codes
+
   const [showBackModal, setShowBackModal] = (0, _react.useState)(false);
   const [showUnscannedShipmentModal, setShowUnscannedShipmentModal] = (0, _react.useState)(false);
-  const [defaultERCLabel, setDefaultERCLabel] = (0, _react.useState)({
-    eventCode: '',
-    reasonCode: ''
+  const [shipmentCount, setShipmentCount] = (0, _react.useState)({
+    scannedCount: 0,
+    totalCount: 0
   });
-  const fetchLabel = async () => {
-    const {
-      eventCode,
-      reasonCode
-    } = await (0, _DropDownUtils.getDefaultERCLabel)(props.defaultERC);
-    setDefaultERCLabel({
-      eventCode,
-      reasonCode
-    });
+  const [mergedScanETOutput, setMergedScanETOutput] = (0, _react.useState)({});
+  const fetchShipmentCount = async () => {
+    try {
+      const _shipmentCount = await _platformCoreosExecutionEngineSdk.DispatchExecutor.getScannedShipmentsCount(props.mergedObjectiveId);
+      if (_shipmentCount) {
+        setShipmentCount({
+          scannedCount: _shipmentCount.scannedCount || 0,
+          totalCount: _shipmentCount.totalCount || 0
+        });
+        // setIsScreenLoaded((isScreenLoaded) => ({
+        //   ...isScreenLoaded,
+        //   shipmentCountLoaded: true,
+        // }));
+      }
+    } catch (error) {}
+  };
+  const fetchPreviousScannedData = async () => {
+    try {
+      const scanOutput = (await (0, _utils.getScanMappedOutput)()) || {};
+      setMergedScanETOutput(scanOutput[prefixedMergedObjectiveId] || {});
+    } catch (error) {}
+  };
+  const fetchERC = async () => {
+    if (props.ercSelector) {
+      try {
+        let response = await (0, _DropDownUtils.getErcDropDownItems)('EVENT', props.ercSelector || []);
+        setEventCodeItems(response);
+        setSelectedEventCode(response[0]);
+      } catch (error) {}
+    }
+  };
+  const fetchAllData = async () => {
+    try {
+      await Promise.all([fetchERC(), fetchPreviousScannedData(), fetchShipmentCount()]);
+    } catch (error) {} finally {
+      setIsScreenLoaded({
+        ercSelectorLoaded: true,
+        previousDataLoaded: true,
+        shipmentCountLoaded: true
+      });
+    }
   };
   (0, _react.useEffect)(() => {
-    fetchLabel();
-  }, [props.defaultERC]);
+    fetchAllData();
+  }, []);
+  (0, _react.useEffect)(() => props.showProgress(true), []);
+  (0, _react.useEffect)(() => {
+    if (isScreenLoaded.ercSelectorLoaded && isScreenLoaded.previousDataLoaded && isScreenLoaded.shipmentCountLoaded) {
+      props.showProgress(false);
+    }
+  }, [isScreenLoaded]);
+
+  // const [defaultERCLabel, setDefaultERCLabel] = useState({
+  //     eventCode: '',
+  //     reasonCode: '',
+  //   });
+  // const fetchLabel = async () => {
+  //   const { eventCode, reasonCode } = await getDefaultERCLabel(
+  //     props.defaultERC
+  //   );
+  //   setDefaultERCLabel({ eventCode, reasonCode });
+  // };
+  // useEffect(() => {
+  //   fetchLabel();
+  // }, [props.defaultERC]);
+
   (0, _react.useLayoutEffect)(() => {
     props.navigation.setOptions({
       title: props.title,
       headerLeft: () => {
-        var _props$taskMeta;
-        return (_props$taskMeta = props.taskMeta) !== null && _props$taskMeta !== void 0 && _props$taskMeta.enableGoBack ? /*#__PURE__*/_react.default.createElement(_MaterialIcons.default, {
-          onPress: async () => {
-            setShowBackModal(true);
+        return /*#__PURE__*/_react.default.createElement(_MaterialIcons.default, {
+          onPress: () => {
+            var _props$taskMeta;
+            if ((_props$taskMeta = props.taskMeta) !== null && _props$taskMeta !== void 0 && _props$taskMeta.enableGoBack && (0, _utils3.hasGoBackConnector)(props.applicableReasons)) setShowBackModal(true);else {
+              if (showScanList) setShowScanList(false);else setShowUnscannedShipmentModal(true);
+            }
           },
           name: "arrow-back",
           color: 'black',
@@ -108,17 +173,10 @@ const ScanET = props => {
             paddingRight: 15,
             paddingTop: 5
           }
-        }) : null;
+        });
       }
     });
-  }, [props.navigation, props.title]);
-  (0, _react.useEffect)(() => {
-    props.ercSelector && (async () => {
-      let response = await (0, _DropDownUtils.getErcDropDownItems)('EVENT', props.ercSelector || []);
-      setEventCodeItems(response);
-      setSelectedEventCode(response[0]);
-    })();
-  }, [props.ercSelector]);
+  }, [props.navigation, props.title, showScanList]);
   (0, _react.useEffect)(() => {
     (selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code) && (async () => {
       let response = await (0, _DropDownUtils.getErcDropDownItems)('REASON', props.ercSelector || [], selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code);
@@ -131,30 +189,97 @@ const ScanET = props => {
       }
     })();
   }, [selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code]);
-  (0, _react.useEffect)(() => {
-    var _props$meta3, _props$meta3$mergedDa;
-    if ((_props$meta3 = props.meta) !== null && _props$meta3 !== void 0 && (_props$meta3$mergedDa = _props$meta3.mergedData) !== null && _props$meta3$mergedDa !== void 0 && _props$meta3$mergedDa.size) {
-      var _props$meta4, _props$meta5;
-      setScansMap((_props$meta4 = props.meta) === null || _props$meta4 === void 0 ? void 0 : _props$meta4.mergedData);
-      const isCompleted = (0, _utils.isETCompleted)(props.validation, (_props$meta5 = props.meta) === null || _props$meta5 === void 0 ? void 0 : _props$meta5.mergedData, props.scanMode, isMultiObjectiveEnable, undefined, SINGLE_MODE_COUNT, allowMultiObjectivePartial);
-      setIsCompleted(isCompleted);
-    }
-  }, [(_props$meta6 = props.meta) === null || _props$meta6 === void 0 ? void 0 : _props$meta6.mergedData]);
   (0, _react.useEffect)(() => {
     scannedInput && (async () => {
       await addScans();
       setScannedInput('');
     })();
   }, [scannedInput]);
+  const handleSubmitET = async (status, count, erc) => {
+    if (status === _interfaces.PROCEED_STATUS.DELIVER_LATER) {
+      if (shipmentCount.scannedCount === 0) {
+        props.navigation.goBack();
+      } else {
+        const etOutput = await (0, _utils.getScanETOutput)(mergedScanETOutput, props.mergedObjectiveId, eventCodeItems || [], props.defaultERC, _ScanSchema.DeliverState.DELIVERE_LATER, true, count);
+        props.onSubmitET(etOutput);
+      }
+    } else {
+      if (shipmentCount.scannedCount < shipmentCount.totalCount) {
+        if (erc) {
+          const prefixedMergedObjectiveId = props.route.params[_RouteParams.RouteParams.ROOT_META_DATA].prefixedMergedObjectiveId;
+          const etOutput = await (0, _utils.getScanETOutput)(mergedScanETOutput, props.mergedObjectiveId, eventCodeItems || [], {
+            eventCode: erc.ec,
+            reasonCode: erc.rc
+          }, _ScanSchema.DeliverState.DELIVER_NOW, true, count);
+          let hasNextPage = true;
+          let offset = 0;
+          const limit = _constants3.BULK_DATA_LIMIT;
+          let scans = {
+            data: [],
+            totalCount: 0
+          };
+          const scannedData = [];
+          do {
+            scans = await _platformCoreosExecutionEngineSdk.DispatchExecutor.filterWFIData(props.taskName, [prefixedMergedObjectiveId], limit, offset);
+            scans.data.forEach(scan => {
+              scannedData.push({
+                groupId: scan.displayInfo.groupId,
+                jobId: scan.jobId,
+                shipmentFlow: scan.displayInfo.shipmentFlow,
+                scanValue: scan.scannableId
+              });
+            });
+            offset += limit;
+            hasNextPage = scans.totalCount - offset + 1 > 0;
+          } while (hasNextPage);
+          (0, _utils.triggerScanEvent)('ON_SCAN', props.route, scannedData, etOutput['default'].output);
+
+          // UPDATE PENDING IN SHARED PREFERENCE MERGED_SCAN_OUTPUT
+          // updatePendingSharedPreference(eventType, prefixedMergedObjectiveId);
+
+          props.onSubmitET(etOutput);
+        }
+      } else {
+        if (shipmentCount.totalCount === 0) props.navigation.goBack();else {
+          const etOutput = await (0, _utils.getScanETOutput)(mergedScanETOutput, props.mergedObjectiveId, eventCodeItems || [], props.defaultERC, _ScanSchema.DeliverState.DELIVER_NOW, false, count);
+          props.onSubmitET(etOutput);
+        }
+      }
+    }
+  };
   const _handleBarCodeScanned = async scan => {
     if (!(0, _utils2.isEmptyOrBlank)(scan)) {
       setShowScanner(false);
       setScannedInput(scan);
     }
   };
+  const updateShipmentCount = async function (scannedCountChanged, totalCountChanged) {
+    let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'SCAN';
+    if (type === 'SCAN') {
+      // UPDATE THE Count
+      setShipmentCount(_shipmentCount => {
+        return {
+          scannedCount: _shipmentCount.scannedCount + scannedCountChanged,
+          totalCount: _shipmentCount.totalCount + totalCountChanged
+        };
+      });
+    } else {
+      const currentIds = [...new Set([...props.mergedObjectiveId, ...(0, _utils.getSplitIds)(mergedScanETOutput), prefixedMergedObjectiveId])];
+      const _shipmentCount = await _platformCoreosExecutionEngineSdk.DispatchExecutor.getScannedShipmentsCount(currentIds);
+      if (_shipmentCount) {
+        setShipmentCount({
+          scannedCount: _shipmentCount.scannedCount || 0,
+          totalCount: _shipmentCount.totalCount || 0
+        });
+        // setIsScreenLoaded((isScreenLoaded) => ({
+        //   ...isScreenLoaded,
+        //   shipmentCountLoaded: true,
+        // }));
+      }
+    }
+  };
+
   const addScans = async () => {
-    var _refInput$current, _scansMap$get, _scansMap$get2;
-    (_refInput$current = refInput.current) === null || _refInput$current === void 0 ? void 0 : _refInput$current.focus();
     const scan = scannedInput;
     if ((0, _utils2.isEmptyOrBlank)(scan)) {
       // showToast('Empty AWB Code');
@@ -174,65 +299,76 @@ const ScanET = props => {
       });
       return;
     }
-    const isERReplacement = (0, _utils.isReplacement)(scan, scansMap, selectedEventCode, selectedReason);
-    if (((_scansMap$get = scansMap.get(scan)) === null || _scansMap$get === void 0 ? void 0 : _scansMap$get.scanStatus) === _interfaces.SCAN_STATUS.SCANNED || ((_scansMap$get2 = scansMap.get(scan)) === null || _scansMap$get2 === void 0 ? void 0 : _scansMap$get2.scanStatus) === _interfaces.SCAN_STATUS.FAILED) {
-      // showToast('Already added');
-      if (!isERReplacement) {
-        setSnackBar({
-          show: true,
-          message: _constants.SHIPMENT_ALREADY_ADDED.replace('<shipment_id>', scan),
-          type: _SnackBarCustom.SnackBarType.FAILURE
-        });
-        return;
-      }
-    }
-    let scannedShipmentsCount = (0, _utils.getScannedItemCount)(scansMap);
-    const scanCompleted = (0, _utils.isETCompleted)(props.validation, scansMap, props.scanMode, isMultiObjectiveEnable, scannedShipmentsCount, SINGLE_MODE_COUNT, allowMultiObjectivePartial);
-    if (((allowMultiObjectivePartial || props.scanMode === 'SINGLE') && scannedShipmentsCount === SINGLE_MODE_COUNT || props.validation.selectedIndex === 0 && scanCompleted && !allowMultiObjectivePartial || !allowMultiObjectivePartial && props.scanCountLimit && props.scanCountLimit === scannedShipmentsCount) && !isERReplacement) {
-      // showToast('Max count of scans reached');
-      setSnackBar({
-        show: true,
-        message: _constants.MAX_SHIPMENT_REACHED,
-        type: _SnackBarCustom.SnackBarType.FAILURE
-      });
-      return;
-    }
     setShowProgress(true);
     let isValidated = await (0, _utils.checkForValidation)(scan, props.validation);
     if (isValidated) {
-      var _scansMap$get3, _scansMap$get4;
-      setSnackBar({
-        show: true,
-        message: _constants.ADD_SHIPMENT.replace('<shipment_id>', scan),
-        type: _SnackBarCustom.SnackBarType.SUCCESS
-      });
-      setScanText('');
-      const _prevState = {
-        value: ((_scansMap$get3 = scansMap.get(scan)) === null || _scansMap$get3 === void 0 ? void 0 : _scansMap$get3.value) || scan,
-        jobId: ((_scansMap$get4 = scansMap.get(scan)) === null || _scansMap$get4 === void 0 ? void 0 : _scansMap$get4.jobId) || '',
-        timestamp: Date.now(),
-        validated: true,
-        scanStatus: _interfaces.SCAN_STATUS.SCANNED,
-        eventCode: selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code,
-        reasonCode: (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) || '',
-        success: selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.success
-      };
-      setScansMap(prevState => {
-        prevState.set(scan, _prevState);
-        return prevState;
-      });
-      const scanCompleted = (0, _utils.isETCompleted)(props.validation, scansMap, props.scanMode, isMultiObjectiveEnable, scannedShipmentsCount + 1, SINGLE_MODE_COUNT, allowMultiObjectivePartial);
-      if (!isCompleted && ((allowMultiObjectivePartial || props.scanMode === 'SINGLE') && scannedShipmentsCount + 1 === SINGLE_MODE_COUNT || scanCompleted || props.scanCountLimit !== undefined && props.scanCountLimit === scannedShipmentsCount + 1)) {
-        setIsCompleted(true);
+      // NEW CODE
+      try {
+        const eventType = (0, _utils.getEventType)(eventCodeItems || [], (selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code) || '');
+        const result = await _platformCoreosExecutionEngineSdk.DispatchExecutor.updateWIMapping(prefixedMergedObjectiveId, scan, {
+          ec: (selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code) || '',
+          rc: (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) || ''
+        }, props.scanToMerge || false);
+        if ('data' in result) {
+          const data = result.data;
+          const {
+            message: {
+              title,
+              subTitle
+            }
+          } = data;
+          if (subTitle) {
+            setSnackBar({
+              show: true,
+              message: `#${scan}\n${title}\n${subTitle}`,
+              type: _SnackBarCustom.SnackBarType.WARNING
+            });
+          } else {
+            setSnackBar({
+              show: true,
+              message: `#${scan}\nShipment updated successfully!`,
+              type: _SnackBarCustom.SnackBarType.SUCCESS
+            });
+          }
+          setScanText('');
+          const _scanOutput = await (0, _utils.getUpdatedScanETOutput)(mergedScanETOutput, result, eventType, (selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code) || '', (selectedReason === null || selectedReason === void 0 ? void 0 : selectedReason.code) || '', props.route, {
+            jobId: data.jobId,
+            displayInfo: data.displayInfo,
+            isScan: true,
+            scanId: scan
+          });
+
+          // UPDATE SHARED PREFERENCE
+          (0, _utils.updateSharedPreference)(eventType, data.mwId, prefixedMergedObjectiveId);
+
+          // UPDATE SCAN OUTPUT
+          setMergedScanETOutput(_scanOutput);
+
+          // UPDATE THE Count
+          setShipmentCount(_shipmentCount => {
+            return {
+              scannedCount: _shipmentCount.scannedCount + data.scanned,
+              totalCount: _shipmentCount.totalCount + data.total
+            };
+          });
+        }
+      } catch (error) {
+        if (props.exitOnError) {
+          setShowProgress(false);
+          const etOutput = await (0, _utils.getScanETOutput)(mergedScanETOutput, props.mergedObjectiveId, eventCodeItems || [], props.defaultERC, _ScanSchema.DeliverState.CANCELLED, false, 0);
+          props.onSubmitET(etOutput);
+        } else {
+          setSnackBar({
+            show: true,
+            ...(0, _utils.getErrorMessage)(scan, error)
+          });
+        }
       }
     } else {
       if (props.exitOnError) {
-        props.onSubmitET({
-          baseResponse: {
-            ...(await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, false, props.defaultERC.eventCode, props.defaultERC.reasonCode || ''))
-          },
-          ...(await (0, _utils.getScanETOutput)(scansMap, props.validation.selectedIndex, blindDataMap, props.scanMode, props.scanCountLimit, props.defaultERC, isMultiObjectiveEnable, props.applicableReasons, isErcSelector, true))
-        });
+        setShowProgress(false);
+        const etOutput = await (0, _utils.getScanETOutput)(mergedScanETOutput, props.mergedObjectiveId, eventCodeItems || [], props.defaultERC, _ScanSchema.DeliverState.CANCELLED, false, 0);
+        props.onSubmitET(etOutput);
       } else {
         setSnackBar({
           show: true,
@@ -244,229 +380,20 @@ const ScanET = props => {
     setShowProgress(false);
   };
   const renderActionButtons = () => {
-    /* if (isCompleted && props.validation.selectedIndex === 0) {
-      return (
-        <>
-          <View style={{ marginBottom: 8 }}>
-            <Button
-              labelStyle={CommonStyles.nextButtonLabel}
-              style={CommonStyles.nextButton}
-              uppercase={true}
-              onPress={async () => {
-                setSnackBar({
-                  show: false,
-                  message: '',
-                  type: SnackBarType.SUCCESS,
-                });
-                props.onSubmitET({
-                  baseResponse: {
-                    ...(await getBaseETResponse(
-                      EntityCode.SCAN,
-                      true,
-                      getEventCodeByET(
-                        ExecutionTaskID.SCAN,
-                        true,
-                        isErcSelector
-                          ? undefined
-                          : props.applicableReasons?.success
-                      ),
-                      isErcSelector ? REASON_NOT_USED : ''
-                    )),
-                  },
-                  ...(await getScanETOutput(
-                    scansMap,
-                    props.validation.selectedIndex,
-                    blindDataMap,
-                    props.scanMode,
-                    props.scanCountLimit,
-                    props.defaultERC,
-                    isMultiObjectiveEnable,
-                    props.applicableReasons,
-                    isErcSelector
-                  )),
-                });
-              }}
-            >
-              {`Proceed`}
-            </Button>
-          </View>
-          <View style={{ marginTop: 8 }}>
-            <Button
-              labelStyle={CommonStyles.exitButtonLabel}
-              style={CommonStyles.exitButton}
-              uppercase={false}
-              onPress={() => {
-                setSnackBar({
-                  show: false,
-                  message: '',
-                  type: SnackBarType.SUCCESS,
-                });
-                setShowModal(true);
-              }}
-            >
-              {`Cancel Order`}
-            </Button>
-          </View>
-        </>
-      );
-    } */
-    if (isCompleted /* &&
-                    (props.validation.selectedIndex === 1 ||
-                    props.validation.selectedIndex === 2) */) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-        style: {
-          marginBottom: 8
-        }
-      }, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-        labelStyle: _CommonStyles.CommonStyles.nextButtonLabel,
-        style: _CommonStyles.CommonStyles.nextButton,
-        uppercase: true,
-        onPress: async () => {
-          let shipmentCount = 0;
-          let totalShipments = 0;
-          if (isMultiObjectiveEnable || props.scanMode === 'SINGLE' || props.validation.selectedIndex === 0 || props.scanCountLimit) {
-            shipmentCount = (0, _utils.getScannedItemCount)(scansMap);
-            if (props.scanMode === 'SINGLE' || isMultiObjectiveEnable) {
-              totalShipments = SINGLE_MODE_COUNT;
-            } else if (props.validation.selectedIndex === 0) {
-              //@ts-ignore
-              totalShipments = props.validation.logic.length;
-            } else if (props.scanCountLimit) {
-              totalShipments = props.scanCountLimit;
-            }
-          } else if (props.validation.selectedIndex === 1 || props.validation.selectedIndex === 2) {
-            shipmentCount = (0, _utils.getScannedItemCount)(scansMap);
-          }
-          if (shipmentCount < totalShipments) {
-            setShowUnscannedShipmentModal(true);
-          } else {
-            var _props$applicableReas;
-            setSnackBar({
-              show: false,
-              message: '',
-              type: _SnackBarCustom.SnackBarType.SUCCESS
-            });
-            props.onSubmitET({
-              baseResponse: {
-                ...(await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, true, (0, _EventCodeContainer.getEventCodeByET)(_ETConfig.ExecutionTaskID.SCAN, true, isErcSelector ? undefined : (_props$applicableReas = props.applicableReasons) === null || _props$applicableReas === void 0 ? void 0 : _props$applicableReas.success), isErcSelector ? _constants2.REASON_NOT_USED : ''))
-              },
-              ...(await (0, _utils.getScanETOutput)(scansMap, props.validation.selectedIndex, blindDataMap, props.scanMode, props.scanCountLimit, props.defaultERC, isMultiObjectiveEnable, props.applicableReasons, isErcSelector))
-            });
-          }
-        }
-      }, `Proceed`)), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-        style: styles.bottomButtons
-      }, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-        labelStyle: _CommonStyles.CommonStyles.exitButtonLabel,
-        style: {
-          ..._CommonStyles.CommonStyles.exitButton,
-          flex: 1,
-          marginEnd: 5
-        },
-        uppercase: false,
-        onPress: () => {
-          setSnackBar({
-            show: false,
-            message: '',
-            type: _SnackBarCustom.SnackBarType.SUCCESS
-          });
-          setShowModal(true);
-        }
-      }, `Cancel`), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-        labelStyle: _CommonStyles.CommonStyles.cancelButtonLabel,
-        style: {
-          ..._CommonStyles.CommonStyles.cancelButton,
-          flex: 1,
-          marginStart: 5
-        },
-        uppercase: true,
-        onPress: () => {
-          setSnackBar({
-            show: false,
-            message: '',
-            type: _SnackBarCustom.SnackBarType.SUCCESS
-          });
-          setShowScanList(!showScanList);
-        }
-      }, `View Summary`)));
-    }
-    if (!isCompleted) {
-      return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-        style: styles.bottomButtons
-      }, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-        labelStyle: _CommonStyles.CommonStyles.exitButtonLabel,
-        style: {
-          ..._CommonStyles.CommonStyles.exitButton,
-          flex: 1,
-          marginEnd: 5
-        },
-        uppercase: false,
-        onPress: () => {
-          setSnackBar({
-            show: false,
-            message: '',
-            type: _SnackBarCustom.SnackBarType.SUCCESS
-          });
-          setShowModal(true);
-        }
-      }, `Cancel`), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-        labelStyle: _CommonStyles.CommonStyles.cancelButtonLabel,
-        style: {
-          ..._CommonStyles.CommonStyles.cancelButton,
-          flex: 1,
-          marginStart: 5
-        },
-        uppercase: true,
-        onPress: () => {
-          setSnackBar({
-            show: false,
-            message: '',
-            type: _SnackBarCustom.SnackBarType.SUCCESS
-          });
-          setShowScanList(!showScanList);
-        }
-      }, `View Summary`));
-      // return (
-      //   <>
-      //     <View style={{ marginTop: 8, marginBottom: 8 }}>
-      //       <Button
-      //         labelStyle={CommonStyles.cancelButtonLabel}
-      //         style={CommonStyles.cancelButton}
-      //         uppercase={true}
-      //         onPress={() => {
-      //           setSnackBar({
-      //             show: false,
-      //             message: '',
-      //             type: SnackBarType.SUCCESS,
-      //           });
-      //           setShowScanList(!showScanList);
-      //         }}
-      //       >
-      //         {`View Summary`}
-      //       </Button>
-      //     </View>
-      //     <View style={{ marginTop: 8 }}>
-      //       <Button
-      //         labelStyle={CommonStyles.exitButtonLabel}
-      //         style={CommonStyles.exitButton}
-      //         uppercase={false}
-      //         onPress={() => {
-      //           setSnackBar({
-      //             show: false,
-      //             message: '',
-      //             type: SnackBarType.SUCCESS,
-      //           });
-      //           setShowModal(true);
-      //         }}
-      //       >
-      //         {`Cancel`}
-      //       </Button>
-      //     </View>
-      //   </>
-      // );
-    }
-
-    return null;
+    // NEW CODE
+    return /*#__PURE__*/_react.default.createElement(_reactNative.View, null, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
+      labelStyle: _CommonStyles.CommonStyles.nextButtonLabel,
+      style: _CommonStyles.CommonStyles.nextButton,
+      uppercase: false,
+      onPress: () => {
+        setSnackBar({
+          show: false,
+          message: '',
+          type: _SnackBarCustom.SnackBarType.SUCCESS
+        });
+        setShowScanList(!showScanList);
+      }
+    }, `View Summary`));
   };
 
   // Handle back-button click when scanList was being viewed
@@ -476,13 +403,25 @@ const ScanET = props => {
         setShowScanList(false);
         return true;
       } else {
-        if (!showModal) setShowModal(true);
+        setShowUnscannedShipmentModal(true);
+        // props.navigation.goBack();
         return true;
       }
     };
     _reactNative.BackHandler.addEventListener('hardwareBackPress', onBackPress);
     return () => _reactNative.BackHandler.removeEventListener('hardwareBackPress', onBackPress);
   }, [showScanList]));
+  (0, _react.useEffect)(() => {
+    if (showScanList) {
+      props.navigation.setOptions({
+        title: 'Summary'
+      });
+    } else {
+      props.navigation.setOptions({
+        title: `${props.title}`
+      });
+    }
+  }, [showScanList]);
   (0, _react.useEffect)(() => {
     let timeout;
     if (!showScanner) {
@@ -495,40 +434,25 @@ const ScanET = props => {
     };
   }, [showScanner]);
   const renderModal = () => {
-    return /*#__PURE__*/_react.default.createElement(_reactNativePaper.Portal, null, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Modal, {
-      visible: showBackModal,
-      dismissable: true,
-      contentContainerStyle: styles.modalContent
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-      style: styles.modalView
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.subText
-    }, 'Are you sure you want to go back?'), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-      labelStyle: _CommonStyles.CommonStyles.nextButtonLabel,
-      style: {
-        ..._CommonStyles.CommonStyles.nextButton,
-        marginTop: 10
-      },
-      uppercase: false,
-      onPress: async () => {
-        props.onSubmitET({
-          baseResponse: {
-            ...(await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, false, _constants2.GO_BACK_EVENT_CODE, ''))
-          },
-          ...(await (0, _utils.getScanETOutput)(scansMap, props.validation.selectedIndex, blindDataMap, props.scanMode, props.scanCountLimit, props.defaultERC, isMultiObjectiveEnable, props.applicableReasons, isErcSelector, true))
-        });
+    return /*#__PURE__*/_react.default.createElement(_GoBackModal.default, {
+      showModal: showBackModal,
+      setShowModal: setShowBackModal,
+      onSuccess: async () => {
+        const output = await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, false, _constants2.GO_BACK_EVENT_CODE, '', props.mergedObjectiveId, _ETConfig.ExecutionTaskID.SCAN);
+        const _scanOutput = {
+          ['default']: {
+            output,
+            count: shipmentCount.totalCount
+          }
+        };
+        props.onSubmitET(_scanOutput);
         setShowBackModal(false);
-      }
-    }, "Yes"), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-      labelStyle: _CommonStyles.CommonStyles.cancelButtonLabel,
-      style: {
-        ..._CommonStyles.CommonStyles.cancelButton,
-        marginTop: 10
       },
-      uppercase: false,
-      onPress: () => setShowBackModal(false)
-    }, "No"))));
+      onFailure: () => setShowBackModal(false)
+    });
   };
+
+  // TODO: Modify to Modal Widget
   const renderUnscannedShipmentModal = () => {
     return /*#__PURE__*/_react.default.createElement(_reactNativePaper.Portal, null, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Modal, {
       visible: showUnscannedShipmentModal,
@@ -539,15 +463,23 @@ const ScanET = props => {
       }]
     }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: styles.modalView
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+    }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+      style: {
+        justifyContent: 'center',
+        alignItems: 'center',
+        marginBottom: 10
+      }
+    }, /*#__PURE__*/_react.default.createElement(_vectorIcons.AntDesign, {
+      name: "exclamationcircleo",
+      size: 40,
+      color: "#D97706"
+    })), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
       style: styles.titleText
-    }, 'Unscanned Shipments!'), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.unscannedShipmentModalSubText
-    }, 'There are unscanned shipments. If you proceed, the following status will be applied to them:'), /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.modalDefaultERCStyle
-    }, "Event:"), ' ', `${defaultERCLabel.eventCode}`), props.defaultERC.reasonCode ? /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.modalDefaultERCStyle
-    }, "Reason: "), ' ', `${defaultERCLabel.reasonCode}`) : null, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
+    }, 'Exit scan flow?'), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+      style: [styles.unscannedShipmentModalSubText, {
+        textAlign: 'center'
+      }]
+    }, 'All the progress made will be lost'), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
       labelStyle: _CommonStyles.CommonStyles.nextButtonLabel,
       style: {
         ..._CommonStyles.CommonStyles.nextButton,
@@ -555,7 +487,7 @@ const ScanET = props => {
       },
       uppercase: false,
       onPress: () => setShowUnscannedShipmentModal(false)
-    }, "Go Back"), /*#__PURE__*/_react.default.createElement(_reactNative.TouchableOpacity, {
+    }, "Continue Scanning"), /*#__PURE__*/_react.default.createElement(_reactNative.TouchableOpacity, {
       style: {
         ..._CommonStyles.CommonStyles.cancelButton,
         marginTop: 10,
@@ -565,70 +497,46 @@ const ScanET = props => {
         alignItems: 'center'
       },
       onPress: async () => {
-        var _props$applicableReas2;
         setSnackBar({
           show: false,
           message: '',
           type: _SnackBarCustom.SnackBarType.SUCCESS
         });
-        props.onSubmitET({
-          baseResponse: {
-            ...(await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, true, (0, _EventCodeContainer.getEventCodeByET)(_ETConfig.ExecutionTaskID.SCAN, true, isErcSelector ? undefined : (_props$applicableReas2 = props.applicableReasons) === null || _props$applicableReas2 === void 0 ? void 0 : _props$applicableReas2.success), isErcSelector ? _constants2.REASON_NOT_USED : ''))
-          },
-          ...(await (0, _utils.getScanETOutput)(scansMap, props.validation.selectedIndex, blindDataMap, props.scanMode, props.scanCountLimit, props.defaultERC, isMultiObjectiveEnable, props.applicableReasons, isErcSelector))
-        });
+
+        // Clear Scan
+        await Promise.all([(0, _utils.clearScanOutput)(prefixedMergedObjectiveId), _platformCoreosExecutionEngineSdk.DispatchExecutor.removeShipment(prefixedMergedObjectiveId)]);
+        props.navigation.goBack();
       }
     }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
       style: _CommonStyles.CommonStyles.cancelButtonLabel
-    }, "Update all unscanned shipments")))));
+    }, "Exit Scan Flow")))));
+  };
+  const renderShipmentCount = () => {
+    return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+      style: {
+        justifyContent: 'flex-end',
+        marginStart: 10,
+        marginEnd: 10,
+        marginBottom: 10
+      }
+    }, isMultiObjectiveEnable || props.scanMode === 'SINGLE' || props.validation.selectedIndex === 0 || props.scanCountLimit ? /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, `${shipmentCount.scannedCount}/${shipmentCount.totalCount} shipments scanned.`) : props.validation.selectedIndex === 1 || props.validation.selectedIndex === 2 ? /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, `${shipmentCount.scannedCount} shipments scanned.`) : null);
   };
   if (showScanList) {
-    const [pendingShipments, scannedShipments] = (0, _utils.getShipmentData)(props.validation.selectedIndex, scansMap);
     return /*#__PURE__*/_react.default.createElement(_reactNativePaper.Provider, null, renderModal(), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: _CommonStyles.CommonStyles.mainContainer
-    }, /*#__PURE__*/_react.default.createElement(_ScanList.default, {
-      validation: props.validation,
-      pending: pendingShipments,
-      scanned: scannedShipments
+    }, /*#__PURE__*/_react.default.createElement(_SummaryPage.default, {
+      ercSelector: props.ercSelector || [],
+      eventCodeItems: eventCodeItems ?? [],
+      handleSubmitET: handleSubmitET,
+      shipmentCount: shipmentCount,
+      updateShipmentCount: updateShipmentCount,
+      scanProps: props,
+      mergedScanETOutput: mergedScanETOutput
     })));
   } else {
     return /*#__PURE__*/_react.default.createElement(_reactNativePaper.Provider, null, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: _CommonStyles.CommonStyles.mainContainer
-    }, renderModal(), renderUnscannedShipmentModal(), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Portal, null, /*#__PURE__*/_react.default.createElement(_reactNativePaper.Modal, {
-      visible: showModal,
-      dismissable: true,
-      contentContainerStyle: styles.modalContent
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-      style: styles.modalView
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.titleText
-    }, 'Are you sure?'), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      style: styles.subText
-    }, 'Going back will undo all scans done for this order. Do you want to proceed?'), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-      labelStyle: _CommonStyles.CommonStyles.nextButtonLabel,
-      style: {
-        ..._CommonStyles.CommonStyles.nextButton,
-        marginTop: 10
-      },
-      uppercase: false,
-      onPress: async () => {
-        setShowModal(false);
-        props.onSubmitET({
-          baseResponse: {
-            ...(await (0, _ExecTaskUtils.getBaseETResponse)(_ETConfig.EntityCode.SCAN, false, props.defaultERC.eventCode, props.defaultERC.reasonCode || ''))
-          },
-          ...(await (0, _utils.getScanETOutput)(scansMap, props.validation.selectedIndex, blindDataMap, props.scanMode, props.scanCountLimit, props.defaultERC, isMultiObjectiveEnable, props.applicableReasons, isErcSelector, true))
-        });
-      }
-    }, "Confirm"), /*#__PURE__*/_react.default.createElement(_reactNativePaper.Button, {
-      labelStyle: _CommonStyles.CommonStyles.cancelButtonLabel,
-      style: {
-        ..._CommonStyles.CommonStyles.cancelButton,
-        marginTop: 10
-      },
-      uppercase: false,
-      onPress: () => setShowModal(false)
-    }, "Resume Scan")))), /*#__PURE__*/_react.default.createElement(_ProgressDialog.default, {
+    }, renderModal(), renderUnscannedShipmentModal(), /*#__PURE__*/_react.default.createElement(_ProgressDialog.default, {
       visible: showProgress,
       label: _strings.PLEASE_WAIT
     }), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
@@ -684,7 +592,8 @@ const ScanET = props => {
         marginEnd: 20,
         flex: 1,
         fontSize: 16,
-        fontFamily: _CommonStyles.Fonts.IBMPlexSans_600SemiBold
+        fontFamily: _CommonStyles.Fonts.IBMPlexSans_600SemiBold,
+        color: '#CECECE'
       },
       placeholder: 'Enter Shipment ID'
     }), /*#__PURE__*/_react.default.createElement(_reactNative.TouchableOpacity, {
@@ -712,7 +621,7 @@ const ScanET = props => {
         lineHeight: 20,
         color: '#3D445C'
       }
-    }, 'ADD'))), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+    }, 'APPLY'))), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: styles.cameraContainer
     }, showScanner ? /*#__PURE__*/_react.default.createElement(_CScanner.default, {
       barCodeTypes: (0, _utils.getBarCodeTypes)(props),
@@ -735,18 +644,7 @@ const ScanET = props => {
       customBottom: 20
     })), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: styles.bottomView
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-      style: {
-        justifyContent: 'flex-end',
-        marginStart: 10,
-        marginEnd: 10,
-        marginBottom: 10
-      }
-    }, isMultiObjectiveEnable || props.scanMode === 'SINGLE' || props.validation.selectedIndex === 0 || props.scanCountLimit ? /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, `${(0, _utils.getScannedItemCount)(scansMap)}/${props.scanMode === 'SINGLE' || isMultiObjectiveEnable ? SINGLE_MODE_COUNT :
-    //@ts-ignore
-    props.validation.selectedIndex === 0 ?
-    //@ts-ignore
-    props.validation.logic.length : props.scanCountLimit} shipments scanned.`) : props.validation.selectedIndex === 1 || props.validation.selectedIndex === 2 ? /*#__PURE__*/_react.default.createElement(_reactNative.Text, null, `${(0, _utils.getScannedItemCount)(scansMap)} shipments scanned.`) : null), renderActionButtons())));
+    }, renderShipmentCount(), renderActionButtons())));
   }
 };
 var _default = ScanET;