@os1-platform/dispatch-mobile 2.1.1 → 2.1.3

package/src/components/executiontasks/payments/processPayment/ProcessPaymentET.tsx

@@ -17,7 +17,7 @@ import { PaymentStyles } from '../PaymentStyles';
 import { isEmptyOrBlank } from '../../../../utils/utils';
 import { CommonStyles } from '../../../../styles/executionTasks/CommonStyles';
 import { getPaymentValue } from '../PaymentUtils';
-import { Button, Modal, Portal, Provider, TextInput } from 'react-native-paper';
+import { Button, Provider, TextInput } from 'react-native-paper';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 import { GO_BACK_EVENT_CODE } from '../../../../constants/constants';
 import GoBackModal from '../../../../components/widgets/GoBackModal';
@@ -170,7 +170,7 @@ const ProcessPaymentET = (props: ProcessPaymentInput) => {
               marginEnd: 10,
             }}
           >
-            <Button
+            {(props.isSelfLoop == false) && <Button
               style={[
                 CommonStyles.cancelButton,
                 {
@@ -207,6 +207,7 @@ const ProcessPaymentET = (props: ProcessPaymentInput) => {
             >
               Cancel
             </Button>
+            }
             <Button
               disabled={disableNext}
               style={[

package/src/components/executiontasks/payments/processPayment/ProcessPaymentSchema.ts

@@ -11,6 +11,7 @@ import type { ETAmount } from '../init/InitPaymentSchema';
  */
 
 export type ProcessPaymentInput = BaseETRequest & {
+  isSelfLoop: boolean;
   amount: ETAmount;
   paymentMode: string;
   transactionId: string;

package/src/components/executiontasks/pickup/PickpSchema.ts

@@ -17,6 +17,7 @@ export type PickupETInput = BaseETRequest & {
   items: LineItem[];
   pickupCount?: number;
   shipCount?: number;
+  isSelfLoop: boolean;
   confirmCustodyExchange?: boolean;
   onSubmitET(pickupRemark: PickupETOutput): void;
 };

package/src/components/executiontasks/pickup/SLPickupET.tsx

@@ -1,5 +1,5 @@
 import { BackHandler, StyleSheet, Text, View, Modal, Platform, TouchableOpacity } from 'react-native';
-import React, { useState, useLayoutEffect, useCallback } from 'react';
+import React, { useState, useLayoutEffect, useCallback, useEffect } from 'react';
 import { Button, Portal, Provider } from 'react-native-paper';
 
 import {
@@ -29,6 +29,7 @@ import Str from '../../../locale/Str';
 import CircleMark from '../../../icons/circleMark.svg';
 import ModalWidget from '../../../components/widgets/ModalWidget';
 
+
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <View style={{ justifyContent: 'center' }}>
     <Text style={DeliverPickupStyles.itemTextStyle}>
@@ -58,6 +59,7 @@ const SLPickupET = (props: PickupETInput) => {
   const [showPickupModal, setShowPickupModal] = useState(true);
   const [goBack, setGoBack] = useState(false);
 
+
   useFocusEffect(
     useCallback(() => {
       const onBackPress = () => {
@@ -260,7 +262,7 @@ const SLPickupET = (props: PickupETInput) => {
                 >
                   Yes
                 </Button>
-                <Button
+                {(props?.isSelfLoop == false) && <Button
                   disabled={disableProceed}
                   uppercase={false}
                   style={[CommonStyles.cancelButton, { marginTop: 5 }]}
@@ -286,7 +288,7 @@ const SLPickupET = (props: PickupETInput) => {
                   }}
                 >
                   No
-                </Button>
+                </Button>}
               </View>
             </View>
           </View>

package/src/constants/constants.ts

@@ -7,6 +7,6 @@ export const DEFAULT_PICKUP_MESSAGE = 'Confirm Pickup of $ orders';
 export const DEFAULT_DELIVER_TITLE = 'Drop Order';
 export const DEFAULT_DELIVER_MESSAGE = 'Confirm Drop of $ orders';
 export const DEFAULT_SIGN_ET_MESSAGE =
-  'Please capture a clear signature from the customer';
+  'Please sign here';
 export const REASON_NOT_USED = 'NOT_TO_BE_USED';
 export const GO_BACK_EVENT_CODE = 'E-099';

package/src/index.tsx

@@ -14,7 +14,7 @@ import useFCMMessage, {
   getFCMToken,
   registerBackgroundHandler,
   requestFirebasePermissions,
-  onNotificationOpenedApp,	
+  onNotificationOpenedApp,
   onTokenRefresh,
   getInitialNotification,
 } from './utils/fcm/FcmUtils';
@@ -45,6 +45,7 @@ import {
   IDispatch,
   IDispatchExecutor,
 } from '@os1-platform/platform-coreos-execution-engine-sdk';
+import Helper from './utils/helper';
 
 export { DispatchExecutor, IDispatch, IDispatchExecutor };
 export { Storage, DispatchExecNavigator };
@@ -61,7 +62,7 @@ export {
   requestFirebasePermissions,
   FCM,
   registerBackgroundHandler,
-  onNotificationOpenedApp,	
+  onNotificationOpenedApp,
   onTokenRefresh,
   getInitialNotification,
   DispatchStateContainer,
@@ -78,3 +79,4 @@ export { DispatchSDKManager };
 
 export type { MTSStartRequest, MTSInitRequest };
 export { MtsSdk };
+export { Helper };

package/src/locale/Str.ts

@@ -5,9 +5,11 @@ export default {
     //string constants
     DEFAULT_PICKUP_MESSAGE: 'DEFAULT_PICKUP_MESSAGE',
     DEFAULT_DELIVER_MESSAGE: 'DEFAULT_DELIVER_MESSAGE',
+    DEFAULT_RETURN_MESSAGE: 'DEFAULT_RETURN_MESSAGE',
     Expected_Shipments: 'Expected_Shipments',
     Expected_Shipment: 'Expected_Shipment',
     Shipment_handed_over: 'Shipment_handed_over',
     Shipments_handed_over: 'Shipments_handed_over',
-    shipments: 'shipments'
+    shipments: 'shipments',
+    skip: 'skip'
 }

package/src/locale/en.json

@@ -2,5 +2,6 @@
     "Expected_Shipment": "Expected Shipment",
     "Expected_Shipments": "Expected Shipments",
     "Shipment_handed_over": "Shipment handed over",
-    "Shipments_handed_over": "Shipments handed over"
+    "Shipments_handed_over": "Shipments handed over",
+    "skip": "Skip"
 }

package/src/locale/i18n.ts

@@ -2,8 +2,8 @@ import { I18n } from "i18n-js";
 import en from './en.json';
 
 const i18n = new I18n({
-    ...en,
     en: {
+        ...en,
         DEFAULT_PICKUP_MESSAGE: {
             one: "Confirm Pickup of 1 order",
             other: "Confirm Pickup of %{count} orders",
@@ -12,6 +12,10 @@ const i18n = new I18n({
             one: "Confirm Drop of 1 order",
             other: "Confirm Drop of %{count} orders"
         },
+        DEFAULT_RETURN_MESSAGE: {
+            one: "Confirm Return of 1 order",
+            other: "Confirm Return of %{count} orders"
+        },
         shipments: {
             one: "(%{count} shipment)?",
             other: "(%{count} shipments)?"

package/src/manager/syncmanager/DBConfig.ts

@@ -7,7 +7,7 @@ export enum DispatchSyncType {
   DISPATCH_SUB_STATUS_UPDATE = 'DISPATCH_SUB_STATUS_UPDATE',
 }
 
-export const DATABASE_NAME = 'DISPATCH_DB';
+export const DATABASE_NAME = 'OS1_Driver_App_DB';
 export const EVENTS_TABLE = 'EVENTS_TABLE';
 export const REASONS_TABLE = 'REASONS_TABLE';
 export const EVENT_CODES_TABLE = 'EVENT_CODES_TABLE';

package/src/styles/executionTasks/CommonStyles.ts

@@ -85,6 +85,7 @@ export const CommonStyles = StyleSheet.create({
     lineHeight: 20,
     textAlign: 'center',
     fontStyle: 'normal',
+    textTransform:'capitalize'
   },
   mainExitButton: {
     backgroundColor: SdkColors[ColorTheme.LIGHT].exitButton,

package/src/ui/screens/DeliverScreen.tsx

@@ -15,6 +15,7 @@ import {
   SHARED_PREFERENCE_SCAN_OUTPUT,
 } from '../../manager/syncmanager/constants';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
+import Helper from '../../utils/helper';
 
 const DeliverScreen = ({
   navigation,
@@ -25,13 +26,37 @@ const DeliverScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
   const [returnPackageCount, setReturnPackageCount] = useState(0);
   const [shipCount, setShipCount] = useState(0);
   const [items, setItems] = useState([]);
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      onTaskStart(
+        nextState,
+        route.params[RouteParams.ROOT_META_DATA].customEventsData
+      );
+      getMergedReturnPackageCount();
+      await getSelfLoopBool();
+    })();
+  }, [])
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
 
   const getMergedReturnPackageCount = async () => {
     const count = await DispatchExecutor.getScannedShipmentsCount(
@@ -40,13 +65,6 @@ const DeliverScreen = ({
     setReturnPackageCount(count.totalCount);
     setShipCount(count.shipCount);
   };
-  useEffect(() => {
-    onTaskStart(
-      nextState,
-      route.params[RouteParams.ROOT_META_DATA].customEventsData
-    );
-    getMergedReturnPackageCount();
-  }, []);
 
   useEffect(() => {
     if (returnPackageCount === 1) {
@@ -79,6 +97,7 @@ const DeliverScreen = ({
         {...input}
         items={items}
         navigation={navigation}
+        isSelfLoop={isSelfLoopTrue}
         taskMeta={taskMeta}
         mergedObjectiveId={mergedObjectiveId}
         returnPackageCount={returnPackageCount}

package/src/ui/screens/DoodleScreen.tsx

@@ -8,7 +8,9 @@ import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
-import { GO_BACK_EVENT_CODE } from '../../constants/constants';	
+import { GO_BACK_EVENT_CODE } from '../../constants/constants';
+import Helper from '../../utils/helper';
+
 const DoodleScreen = ({
   route,
   navigation,
@@ -18,8 +20,9 @@ const DoodleScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
   useEffect(() => {
     onTaskStart(
@@ -29,6 +32,25 @@ const DoodleScreen = ({
   }, []);
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState<any>();
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      await getSelfLoopBool();
+    })();
+  }, [])
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
+
   const submitOutput = useCallback(
     async (base64Data: any) => {
       await DispatchStateContainer.getInstance().navigateToNextTask(
@@ -52,6 +74,7 @@ const DoodleScreen = ({
         // jobIDs={getJobIDs(route.params[RouteParams.NEXT_STATES])}
         // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}
         navigation={navigation}
+        isSelfLoop={isSelfLoopTrue}
         taskMeta={taskMeta}
         mergedObjectiveId={mergedObjectiveId}
         onSubmitET={async (base64Data) => {

package/src/ui/screens/DropCashScreen.tsx

@@ -12,6 +12,8 @@ import { onTaskStart } from '../../utils/ExecTaskUtils';
 
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
+import Helper from '../../utils/helper';
+
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
 //   let totalAmount = 0;
@@ -35,8 +37,9 @@ const DropCashScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
   const [expectedAmount, setExpectedAmount] = useState<ETAmount>({
@@ -44,6 +47,18 @@ const DropCashScreen = ({
     minorUnit: input.expectedAmount.minorUnit,
     currencyCode: input.expectedAmount.currencyCode,
   });
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      onTaskStart(
+        nextState,
+        route.params[RouteParams.ROOT_META_DATA].customEventsData
+      );
+      getTotalExpected();
+      await getSelfLoopBool();
+    })();
+  }, [])
 
   const getTotalExpected = async () => {
     const totalAmount: number = await DispatchExecutor.getTotalAmountMWI(
@@ -52,13 +67,16 @@ const DropCashScreen = ({
     setExpectedAmount({ ...expectedAmount, value: totalAmount });
   };
 
-  useEffect(() => {
-    onTaskStart(
-      nextState,
-      route.params[RouteParams.ROOT_META_DATA].customEventsData
-    );
-    getTotalExpected();
-  }, []);
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
 
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState<any>();
@@ -82,6 +100,7 @@ const DropCashScreen = ({
       <SLDropCash
         {...input}
         expectedAmount={expectedAmount}
+        isSelfLoop={isSelfLoopTrue}
         navigation={navigation}
         mergedObjectiveId={mergedObjectiveId}
         taskMeta={taskMeta}

package/src/ui/screens/FormsScreen.tsx

@@ -13,6 +13,7 @@ import SnackBarCustom, {
 import callbackHandler from '../../manager/sdk/callbacksHandler';
 import { DispatchExecutor as dispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { AjvError } from '@rjsf/core';
+import Helper from '../../utils/helper';
 
 const FormsScreen = ({
   route,
@@ -23,15 +24,18 @@ const FormsScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const [snackBar, setSnackBar] = useState({
     show: false,
     type: SnackBarType.SUCCESS,
     message: '',
   });
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
   const [_input, setInputs] = useState(input);
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
   useEffect(() => {
     (async () => {
       onTaskStart(
@@ -77,11 +81,29 @@ const FormsScreen = ({
     })();
   }, []);
 
+  useEffect(() => {
+    (async () => {
+      await getSelfLoopBool();
+    })();
+  }, [])
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
+
   return (
     <>
       <FormGenerator
         {..._input}
         navigation={navigation}
+        isSelfLoop={isSelfLoopTrue}
         mergedObjectiveId={mergedObjectiveId}
         taskMeta={taskMeta}
         onError={(error: AjvError[] | AjvError) => {

package/src/ui/screens/ImageCaptureScreen.tsx

@@ -6,8 +6,9 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
 import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
-
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
+import Helper from '../../utils/helper';
+
 
 const ImageCaptureScreen = ({
   route,
@@ -18,12 +19,36 @@ const ImageCaptureScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
   const firstInput = input;
   const [inputs, setInputs] = useState(firstInput);
   const [captureCount, setCaptureCount] = useState(0);
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      onTaskStart(
+        route.params[RouteParams.NEXT_STATES],
+        route.params[RouteParams.ROOT_META_DATA].customEventsData
+      );
+      getMergedCaptureCount();
+      await getSelfLoopBool();
+    })();
+  }, [])
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
 
   const getMergedCaptureCount = async () => {
     const count = await DispatchExecutor.getScannedShipmentsCount(
@@ -32,14 +57,6 @@ const ImageCaptureScreen = ({
     setCaptureCount(count.totalCount);
   };
 
-  useEffect(() => {
-    onTaskStart(
-      route.params[RouteParams.NEXT_STATES],
-      route.params[RouteParams.ROOT_META_DATA].customEventsData
-    );
-    getMergedCaptureCount();
-  }, []);
-
   useEffect(() => {
     let _captureCountLimit = captureCount * input.captureCountLimit;
 
@@ -53,12 +70,13 @@ const ImageCaptureScreen = ({
     <ImageCapture
       {...inputs}
       captureCount={captureCount}
+      isSelfLoop={isSelfLoopTrue}
       navigation={navigation}
       taskMeta={taskMeta}
       mergedObjectiveId={mergedObjectiveId}
       // jobIds={getJobIDs(route.params[RouteParams.NEXT_STATES])}
       // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}
-      onSubmitET={async (imageDataList) => {
+      onSubmitET={async (imageDataList: { success: boolean; }) => {
         await DispatchStateContainer.getInstance().navigateToNextTask(
           navigation,
           route,

package/src/ui/screens/PaymentScreen.tsx

@@ -20,6 +20,8 @@ import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer
 import { useEffect } from 'react';
 import { IDispatch } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
+import Helper from '../../utils/helper';
+
 const PaymentScreen = ({
   navigation,
   route,
@@ -29,21 +31,38 @@ const PaymentScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
-  useEffect(() => {
-    onTaskStart(
-      route.params[RouteParams.NEXT_STATES],
-      route.params[RouteParams.ROOT_META_DATA].customEventsData
-    );
-  }, []);
   let currentState = route.params[
     RouteParams.NEXT_STATES
   ] as IDispatch.IExecutionTaskQueryResponse;
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState<any>();
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      onTaskStart(
+        route.params[RouteParams.NEXT_STATES],
+        route.params[RouteParams.ROOT_META_DATA].customEventsData
+      );
+      await getSelfLoopBool();
+    })();
+  }, [])
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
 
   const taskId = currentState.taskId as ExecutionTaskID;
 
@@ -69,6 +88,7 @@ const PaymentScreen = ({
         <InitPaymentET
           {...input}
           navigation={navigation}
+          isSelfLoop={isSelfLoopTrue}
           taskMeta={taskMeta}
           mergedObjectiveId={mergedObjectiveId}
           onSubmitET={async (etOutput) => {
@@ -135,12 +155,13 @@ const PaymentScreen = ({
           <ProcessPaymentET
             {...input}
             navigation={navigation}
+            isSelfLoop={isSelfLoopTrue}
             mergedObjectiveId={mergedObjectiveId}
             taskMeta={taskMeta}
             onSubmitET={async (etOutput) => {
-              if (	
-                etOutput.success ||	
-                etOutput.eventCode == GO_BACK_EVENT_CODE	
+              if (
+                etOutput.success ||
+                etOutput.eventCode == GO_BACK_EVENT_CODE
               ) {
                 await submitOutput(etOutput);
               } else {
@@ -169,6 +190,7 @@ const PaymentScreen = ({
       <CompletePaymentET
         {...input}
         navigation={navigation}
+        isSelfLoop={isSelfLoopTrue}
         taskMeta={taskMeta}
         mergedObjectiveId={mergedObjectiveId}
         onSubmitET={async (etOut) => {

package/src/ui/screens/PickupScreen.tsx

@@ -9,6 +9,7 @@ import { onTaskStart } from '../../utils/ExecTaskUtils';
 
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import SLPickupET from '../../components/executiontasks/pickup/SLPickupET';
+import Helper from '../../utils/helper';
 
 const PickupScreen = ({
   route,
@@ -19,13 +20,27 @@ const PickupScreen = ({
   navigation: any;
   baseETProps: BaseETProps;
 }) => {
+  const helperInstance = Helper.getInstance();
+
   const nextState = route.params[RouteParams.NEXT_STATES];
-  const { taskMeta, mergedObjectiveId, input, wfMeta } =
+  const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
 
   const [pickupCount, setPickupCount] = useState(0);
   const [shipCount, setShipCount] = useState(0);
   const [items, setItems] = useState([]);
+  const [isSelfLoopTrue, setSelfLoop] = useState(false);
+
+  useEffect(() => {
+    (async () => {
+      onTaskStart(
+        nextState,
+        route.params[RouteParams.ROOT_META_DATA].customEventsData
+      );
+      getMergedPickCount();
+      await getSelfLoopBool();
+    })();
+  }, []);
 
   const getMergedPickCount = async () => {
     const count = await DispatchExecutor.getScannedShipmentsCount(
@@ -34,13 +49,24 @@ const PickupScreen = ({
     setPickupCount(count.totalCount);
     setShipCount(count.shipCount);
   };
-  useEffect(() => {
-    onTaskStart(
-      nextState,
-      route.params[RouteParams.ROOT_META_DATA].customEventsData
-    );
-    getMergedPickCount();
-  }, []);
+
+  const getSelfLoopBool = async () => {
+    try {
+      const splitArr = mergedObjectiveId[0]?.split('#');
+      console.log("aks::workflowId", JSON.stringify(splitArr))
+      //
+      const workflowId = splitArr[1];
+      console.log("aks::workflowId", workflowId)
+      //
+      const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(workflowId, taskName)
+      console.log("aks::isSelfLoopTrue", isSelfLoopTrue)
+      //
+      setSelfLoop(isSelfLoopTrue);
+      console.log('isSelfLoopTrue code execution successful!');
+    } catch (error) {
+      console.log('isSelfLoopTrue code execution error', error);
+    }
+  }
 
   useEffect(() => {
     if (pickupCount === 1) {
@@ -67,6 +93,7 @@ const PickupScreen = ({
       shipCount={shipCount}
       navigation={navigation}
       taskMeta={taskMeta}
+      isSelfLoop={isSelfLoopTrue}
       onSubmitET={async (pickupOutput) => {
         await DispatchStateContainer.getInstance().navigateToNextTask(
           navigation,