@os1-platform/dispatch-mobile 2.1.2 → 2.1.3

package/lib/typescript/components/executiontasks/doodle/SignatureSchema.d.ts

@@ -23,6 +23,7 @@ export type SignatureInput = BaseETRequest & {
     resolution: Dimension;
     fileSizeLimit: MaxFileSize;
     penColor?: PenColor;
+    isSelfLoop: boolean;
     onSubmitET: (value: SignatureOutput) => void;
 } & {
     jobIDs: string[];

package/lib/typescript/components/executiontasks/dropCash/DropCashSchema.d.ts

@@ -6,6 +6,7 @@ import type { ETAmount } from '../payments/init/InitPaymentSchema';
 export type DropCashInput = BaseETRequest & {
     expectedAmount: ETAmount;
     confirmAmount?: boolean;
+    isSelfLoop: boolean;
     onSubmitET: (etOutput: DropCashOutput) => void;
     confirmCustodyExchange?: boolean;
 };

package/lib/typescript/components/executiontasks/forms/FormSchema.d.ts

@@ -2,6 +2,7 @@ import type { BaseETRequest, BaseETResponse } from '../../../models/execTasks/ET
 export type FormInputSchema = BaseETRequest & {
     jsonSchema: JSONSchema;
     uiSchema: UISchame;
+    isSelfLoop: boolean;
     onError: (e: any) => void;
     onSubmitET: (result: FormOutputSchema) => void;
 };

package/lib/typescript/components/executiontasks/imageCapture/CaptureSchema.d.ts

@@ -65,6 +65,7 @@ export interface AdditionalMultiConfig {
     minCaptureCount: MultiAdditionalConfig;
 }
 export type CaptureInput = BaseETRequest & {
+    isSelfLoop: boolean;
     resolution: Resolution;
     fileSizeLimit: MaxFileSize;
     captureMode: CaptureMode;

package/lib/typescript/components/executiontasks/imageCapture/CaptureUtils.d.ts

@@ -1,6 +1,11 @@
 import type { CaptureInput, CaptureOutput, ImageData } from './CaptureSchema';
 import type { ImageResult } from 'expo-image-manipulator';
-export declare function deleteImage(imageData: ImageData, images: ImageData[]): Promise<ImageData[]>;
+export declare function deleteImage(imageData: {
+    path: string;
+    id: {
+        toString: () => string;
+    };
+}, images: any[]): Promise<any[]>;
 export declare function getMaxImagesCount(props: CaptureInput): number;
 export declare function getImagesFileName(): string;
 export declare function getCompressionRatio(uri: string, maxSize: number): Promise<number>;

package/lib/typescript/components/executiontasks/imageCapture/ImageCapture.d.ts

@@ -1,4 +1,3 @@
 import React from 'react';
-import type { CaptureInput } from './CaptureSchema';
-declare const ImageCapture: (props: CaptureInput) => React.JSX.Element;
+declare const ImageCapture: (props: any) => React.JSX.Element;
 export default ImageCapture;

package/lib/typescript/components/executiontasks/payments/PaymentStyles.d.ts

@@ -1,4 +1,3 @@
-import { Fonts } from '../../../styles/executionTasks/CommonStyles';
 export declare const PaymentStyles: {
     amountStyle: {
         fontSize: number;
@@ -9,10 +8,10 @@ export declare const PaymentStyles: {
         alignItems: "center";
         paddingTop: number;
         paddingBottom: number;
-        fontFamily: Fonts;
+        fontFamily: string;
     };
     messageStyle: {
-        fontFamily: Fonts;
+        fontFamily: string;
         backgroundColor: string;
         color: string;
         padding: number;
@@ -21,7 +20,7 @@ export declare const PaymentStyles: {
         fontSize: number;
     };
     textStyle1: {
-        fontFamily: Fonts;
+        fontFamily: string;
         marginTop: number;
         marginStart: number;
         marginEnd: number;
@@ -33,7 +32,7 @@ export declare const PaymentStyles: {
     reasonTextStyle: {
         flex: number;
         flexWrap: "wrap";
-        fontFamily: Fonts;
+        fontFamily: string;
         fontStyle: "normal";
         fontSize: number;
         lineHeight: number;

package/lib/typescript/components/executiontasks/payments/completePayment/CompletePaymentSchema.d.ts

@@ -4,6 +4,7 @@
 import type { BaseETRequest, BaseETResponse } from '../../../../models/execTasks/ETBaseModels';
 import type { ETAmount } from '../init/InitPaymentSchema';
 export type CompletePaymentInput = BaseETRequest & {
+    isSelfLoop: boolean;
     paymentMode: string;
     expectedAmount: ETAmount;
     collectedAmount: ETAmount;

package/lib/typescript/components/executiontasks/payments/init/InitPaymentSchema.d.ts

@@ -7,6 +7,7 @@ import type { BaseETRequest, BaseETResponse } from '../../../../models/execTasks
  */
 export type AllowedModes = 'CASH' | 'UPI' | 'PAYMENT_LINK';
 export type InitPaymentInput = BaseETRequest & {
+    isSelfLoop: boolean;
     amount: ETAmount;
     allowedModes: string[];
     onSubmitET: (output: InitPaymentOutput) => void;

package/lib/typescript/components/executiontasks/payments/processPayment/ProcessPaymentSchema.d.ts

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

package/lib/typescript/components/executiontasks/pickup/PickpSchema.d.ts

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

package/lib/typescript/components/widgets/SnackBarCustom.d.ts

@@ -19,7 +19,7 @@ export declare enum SnackBarType {
     FAILURE = 1,
     WARNING = 2
 }
-declare const _default: React.ComponentType<Pick<SnackbarProps, "visible" | "type" | "onDismiss" | "duration" | "message" | "customBottom"> & {
+declare const _default: React.ComponentType<Pick<SnackbarProps, "visible" | "message" | "type" | "onDismiss" | "duration" | "customBottom"> & {
     theme?: import("@callstack/react-theme-provider").$DeepPartial<ReactNativePaper.Theme> | undefined;
 }> & import("@callstack/react-theme-provider/typings/hoist-non-react-statics").NonReactStatics<React.ComponentType<SnackbarProps> & (({ visible, duration, onDismiss, message, theme, type, customBottom, }: SnackbarProps) => React.JSX.Element | null), {}>;
 export default _default;

package/lib/typescript/constants/constants.d.ts

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

package/lib/typescript/index.d.ts

@@ -7,7 +7,7 @@ import NativeSyncManager from './manager/syncmanager/NativeSyncManager';
 import type { DocumentRow, EventRow } from './manager/syncmanager/DBConfig';
 import { SyncMethod, DispatchSyncType } from './manager/syncmanager/DBConfig';
 import CancelOrderDialog from './components/widgets/CancelOrderDialog';
-import useFCMMessage, { getFCMToken, registerBackgroundHandler, requestFirebasePermissions, onNotificationOpenedApp, getInitialNotification } from './utils/fcm/FcmUtils';
+import useFCMMessage, { getFCMToken, registerBackgroundHandler, requestFirebasePermissions, onNotificationOpenedApp, onTokenRefresh, getInitialNotification } from './utils/fcm/FcmUtils';
 import FCM from './utils/fcm/FCM';
 import DispatchExecNavigator from './components/dispatch/DispatchExecNavigator';
 import DispatchStateContainer from './manager/dispatch/DispatchStateContainer';
@@ -21,14 +21,16 @@ import { SdkSyncType } from './models/DispatchModels';
 import EventListener from './events';
 import { BaseEvents } from './events/constants';
 import { DispatchExecutor, IDispatch, IDispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
+import Helper from './utils/helper';
 export { DispatchExecutor, IDispatch, IDispatchExecutor };
 export { Storage, DispatchExecNavigator };
 export { ETSummary, CompleteSummary, ObjectiveSummary, DispatchSyncType };
 export { BaseEvents, endEvent, startEvent, onScanRemoveEvent, onScanEvent };
-export { NativeSyncManager, AppSyncManager, SdkSyncType, EventRow, DocumentRow, useFCMMessage, getFCMToken, requestFirebasePermissions, FCM, registerBackgroundHandler, onNotificationOpenedApp, getInitialNotification, DispatchStateContainer, SdkUtils, Logger, LOG_TYPE, EventListener, };
+export { NativeSyncManager, AppSyncManager, SdkSyncType, EventRow, DocumentRow, useFCMMessage, getFCMToken, requestFirebasePermissions, FCM, registerBackgroundHandler, onNotificationOpenedApp, onTokenRefresh, getInitialNotification, DispatchStateContainer, SdkUtils, Logger, LOG_TYPE, EventListener, };
 export { SyncMethod, JobObjectiveType };
 export type { ETaskSchema };
 export { ExecutionTask, CancelOrderDialog };
 export { DispatchSDKManager };
 export type { MTSStartRequest, MTSInitRequest };
 export { MtsSdk };
+export { Helper };

package/lib/typescript/locale/Str.d.ts

@@ -0,0 +1,13 @@
+declare const _default: {
+    count: string;
+    DEFAULT_PICKUP_MESSAGE: string;
+    DEFAULT_DELIVER_MESSAGE: string;
+    DEFAULT_RETURN_MESSAGE: string;
+    Expected_Shipments: string;
+    Expected_Shipment: string;
+    Shipment_handed_over: string;
+    Shipments_handed_over: string;
+    shipments: string;
+    skip: string;
+};
+export default _default;

package/lib/typescript/locale/i18n.d.ts

@@ -0,0 +1,3 @@
+import { I18n } from "i18n-js";
+declare const i18n: I18n;
+export default i18n;

package/lib/typescript/locale/util.d.ts

@@ -0,0 +1,2 @@
+export declare const getStr: (str: string) => string;
+export declare const getStrVal: (str: string, varName: string, varVal: any) => string;

package/lib/typescript/manager/syncmanager/DBConfig.d.ts

@@ -2,7 +2,8 @@ import { IDispatch } from '@os1-platform/platform-coreos-execution-engine-sdk';
 export type ExecEngineSyncType = IDispatch.SyncType;
 export declare enum DispatchSyncType {
     DEFAULT = "DEFAULT",
-    DISPATCH_UPDATE = "DISPATCH_UPDATE"
+    DISPATCH_UPDATE = "DISPATCH_UPDATE",
+    DISPATCH_SUB_STATUS_UPDATE = "DISPATCH_SUB_STATUS_UPDATE"
 }
 export declare const DATABASE_NAME = "OS1_Driver_App_DB";
 export declare const EVENTS_TABLE = "EVENTS_TABLE";

package/lib/typescript/models/fcm.d.ts

@@ -1,3 +1,6 @@
 export interface messageReceived {
     (message: object): void;
 }
+export interface tokenRefreshed {
+    (token: string): void;
+}

package/lib/typescript/styles/executionTasks/CommonStyles.d.ts

@@ -82,6 +82,7 @@ export declare const CommonStyles: {
         lineHeight: number;
         textAlign: "center";
         fontStyle: "normal";
+        textTransform: "capitalize";
     };
     mainExitButton: {
         backgroundColor: string;

package/lib/typescript/utils/fcm/FcmUtils.d.ts

@@ -1,7 +1,8 @@
-import type { messageReceived } from '../../models/fcm';
+import type { messageReceived, tokenRefreshed } from '../../models/fcm';
 export default function useFCMMessage(): any;
 export declare function requestFirebasePermissions(): Promise<boolean>;
 export declare function getFCMToken(): Promise<string | null>;
 export declare function registerBackgroundHandler(callback: messageReceived): void;
 export declare function onNotificationOpenedApp(callback: messageReceived): void;
 export declare function getInitialNotification(callback: messageReceived): void;
+export declare function onTokenRefresh(callback: tokenRefreshed): void;

package/lib/typescript/utils/helper.d.ts

@@ -2,13 +2,14 @@
  *
  * @class Helper
  */
-declare class Helper {
+export default class Helper {
+    private static instance;
+    static getInstance(): Helper;
     /**
      * Check the availability of a network for an app.
      *
      * @returns {Promise<boolean>}
      */
     checkNetwork(): Promise<boolean>;
+    isSelfLoopExistOnET(workflowId: string, sourceTaskName: string): Promise<boolean>;
 }
-declare const helper: Helper;
-export default helper;

package/lib/typescript/utils/storage.d.ts

@@ -54,6 +54,7 @@ declare class Storage {
      * @returns {Promise<void>}
      */
     getMultiObject(keys: string[]): Promise<any[][]>;
+    clearStorage(): Promise<void>;
     /**
      * Deletes a single item
      * @param {string} key
@@ -70,9 +71,9 @@ declare class Storage {
         key: string;
         value: string;
     }[]): Promise<void>;
-    getSharedItem(key: string): Promise<string>;
+    getSharedItem(key: string): Promise<any>;
     getSharedItems(key: string[]): Promise<string[][]>;
-    getSharedAll(): Promise<[][]>;
+    getSharedAll(): Promise<any[][]>;
     getAllSharedKeys(): Promise<string[]>;
     clearShared(): Promise<void>;
     removeSharedItem(key: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -8,12 +8,19 @@
   "react-native": "lib/module/index",
   "source": "lib/module/index",
   "files": [
+    "src",
     "lib",
     "android",
+    "ios",
     "cpp",
-    "dispatch-sdk.podspec",
+    "*.podspec",
     "!lib/typescript/example",
+    "!ios/build",
     "!android/build",
+    "!android/gradle",
+    "!android/gradlew",
+    "!android/gradlew.bat",
+    "!android/local.properties",
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
@@ -32,13 +39,17 @@
     "example": "yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
     "bootstrap": "yarn example && yarn && yarn pods",
-    "local": "yarn && cd example && yarn start"
+    "local": "yarn && cd example && yarn start",
+    "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build"
   },
   "keywords": [
     "react-native",
-    "android"
+    "android",
+    "ios"
   ],
   "license": "MIT",
+  "author": "Amit Sanvedi <amit.sanvedi@delhivery.com> (https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk)",
+  "homepage": "https://github.com/FoxtrotPlatform/platform-coreos-dispatch-sdk/#readme",
   "devDependencies": {
     "@apollo/client": "^3.5.6",
     "@babel/core": "^7.12.9",
@@ -47,7 +58,7 @@
     "@babel/runtime": "^7.12.5",
     "@commitlint/config-conventional": "^11.0.0",
     "@expo-google-fonts/ibm-plex-sans": "*",
-    "@foxtrotplatform/platform-coreos-mts-sdk": "^1.0.0",
+    "@foxtrotplatform/platform-coreos-mts-sdk": "2.0.0",
     "@react-native-async-storage/async-storage": "^1.15.14",
     "@react-native-community/datetimepicker": "^3.5.2",
     "@react-native-community/eslint-config": "^2.0.0",
@@ -65,6 +76,7 @@
     "@sentry/react-native": "^3.2.13",
     "@tsconfig/react-native": "^2.0.2",
     "@types/enzyme": "^3.10.10",
+    "@types/i18n-js": "^3.8.8",
     "@types/jest": "^26.0.23",
     "@types/json-logic-js": "^1.2.1",
     "@types/jsonpath-plus": "^5.0.2",
@@ -107,6 +119,7 @@
     "react-native-builder-bob": "^0.18.0",
     "react-native-dropdown-picker": "^5.4.0",
     "react-native-get-random-values": "^1.8.0",
+    "react-native-image-picker": "^7.0.2",
     "react-native-paper": "^4.9.2",
     "react-native-safe-area-context": "^3.3.2",
     "react-native-screens": "^3.9.0",
@@ -118,7 +131,7 @@
   "peerDependencies": {
     "@apollo/client": "^3.5.6",
     "@expo-google-fonts/ibm-plex-sans": "*",
-    "@foxtrotplatform/platform-coreos-mts-sdk": "^1.0.0",
+    "@foxtrotplatform/platform-coreos-mts-sdk": "2.0.0",
     "@react-native-async-storage/async-storage": "^1.15.14",
     "@react-native-community/datetimepicker": "^3.5.2",
     "@react-native-community/netinfo": "^6.0.2",
@@ -245,9 +258,11 @@
     ]
   },
   "dependencies": {
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.5",
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.6",
     "@rjsf/core": "^2.0.0",
+    "apollo-link-timeout": "^4.0.0",
     "decompress": "^4.2.1",
+    "i18n-js": "^4.3.2",
     "json-logic-js": "^2.0.1",
     "jsonpath-plus": "^6.0.1",
     "jwt-decode": "^3.1.2",

package/src/@types/assets/index.d.ts

@@ -0,0 +1,6 @@
+declare module '*.svg' {
+  import React from 'react';
+  import {SvgProps} from 'react-native-svg';
+  const content: React.FC<SvgProps>;
+  export default content;
+}

package/src/components/dispatch/DispatchExecNavigator.tsx

@@ -0,0 +1,273 @@
+import * as React from 'react';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import * as ETScreen from '../../ui/screens/ETScreensIndex';
+import {
+  CustomScreens,
+  ExecutionTaskID,
+  ExecutionTaskName,
+} from '../../models/execTasks/ETConfig';
+import {
+  IBMPlexSans_100Thin,
+  IBMPlexSans_100Thin_Italic,
+  IBMPlexSans_200ExtraLight,
+  IBMPlexSans_200ExtraLight_Italic,
+  IBMPlexSans_300Light,
+  IBMPlexSans_300Light_Italic,
+  IBMPlexSans_400Regular,
+  IBMPlexSans_400Regular_Italic,
+  IBMPlexSans_500Medium,
+  IBMPlexSans_500Medium_Italic,
+  IBMPlexSans_600SemiBold,
+  IBMPlexSans_600SemiBold_Italic,
+  IBMPlexSans_700Bold,
+  IBMPlexSans_700Bold_Italic,
+  useFonts,
+} from '@expo-google-fonts/ibm-plex-sans';
+import ProgressDialog from '../widgets/ProgressDialog';
+import { RouteParams } from '../../ui/uiConfig/RouteParams';
+import { Platform } from 'react-native';
+import { Fonts } from '../../styles/executionTasks/CommonStyles';
+
+const Stack = createNativeStackNavigator();
+
+const DispatchExecNavigator = ({ route }: { route: any }) => {
+  let [fontsLoaded] = useFonts({
+    IBMPlexSans_400Regular,
+    IBMPlexSans_600SemiBold,
+    IBMPlexSans_300Light,
+    IBMPlexSans_700Bold,
+    IBMPlexSans_100Thin,
+    IBMPlexSans_100Thin_Italic,
+    IBMPlexSans_200ExtraLight,
+    IBMPlexSans_200ExtraLight_Italic,
+    IBMPlexSans_300Light_Italic,
+    IBMPlexSans_400Regular_Italic,
+    IBMPlexSans_500Medium,
+    IBMPlexSans_500Medium_Italic,
+    IBMPlexSans_600SemiBold_Italic,
+    IBMPlexSans_700Bold_Italic,
+  });
+  if (!fontsLoaded) {
+    return <ProgressDialog visible={true} label={'Please wait...'} />;
+  } else
+    return (
+      <Stack.Navigator
+        screenOptions={{
+          headerTitleStyle: {
+            fontWeight: '600',
+            fontSize: 16,
+            fontFamily: 'IBMPlexSans_600SemiBold',                            
+            color: '#111111',
+          },
+          orientation: 'portrait',
+          animation: 'slide_from_right',
+        }}
+        initialRouteName={ExecutionTaskID.START_WORKFLOW}
+      >
+        <Stack.Screen
+          name={ExecutionTaskID.START_WORKFLOW}
+          component={ETScreen.StartWorkFlowScreen}
+          initialParams={route.params}
+          options={{ headerShown: false, animation: 'simple_push' }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.DELIVER}
+          component={ETScreen.DeliverScreen}
+          options={{ headerShown: false, headerBackVisible: false }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.DOODLE}
+          component={ETScreen.DoodleScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.DOODLE,
+              orientation: 'portrait',
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.FORMS}
+          component={ETScreen.FormsScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.FORMS,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.IMAGE_CAPTURE}
+          component={ETScreen.ImageCaptureScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.IMAGE_CAPTURE,
+              orientation: 'portrait',
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.PICKUP}
+          component={ETScreen.PickupScreen}
+          options={{ headerShown: false, headerBackVisible: false }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.SCAN}
+          component={ETScreen.ScanScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.SCAN,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.VALIDATE_OTP_ET}
+          component={ETScreen.ValidateOTPScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.VALIDATE_OTP_ET,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.DISPLAY}
+          component={ETScreen.DisplayScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.DISPLAY,
+              presentation: 'modal',
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.INIT_PAYMENT}
+          component={ETScreen.PaymentScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.INIT_PAYMENT,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.PROCESS_PAYMENT}
+          component={ETScreen.PaymentScreen}
+          options={(rProps) => {
+            const mode = getMode(rProps.route);
+            if (mode == 'CASH') {
+              return {
+                headerShown: false,
+                headerBackVisible: false,
+              };
+            }
+
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.PROCESS_PAYMENT,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.COMPLETE_PAYMENT}
+          component={ETScreen.PaymentScreen}
+          options={{ headerShown: false, headerBackVisible: false }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.VERIFY_LOCATION}
+          component={ETScreen.GeofenceScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.VERIFY_LOCATION,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.CAPTURE_INPUT}
+          component={ETScreen.CaptureInputScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ? taskTitle : ExecutionTaskName.CAPTURE_INPUT,
+              headerBackVisible: false,
+            };
+          }}
+        />
+        <Stack.Screen
+          name={CustomScreens.REMARK_SCREEN}
+          component={ETScreen.CancellationScreen}
+          options={{
+            title: 'Select Event and Reason',
+            presentation: 'modal',
+            animation: 'slide_from_bottom',
+            headerBackVisible: false,
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.COMPLETED_SUCCESS}
+          component={ETScreen.CompleteObjectiveScreen}
+          options={{
+            headerShown: false,
+            animation: 'simple_push',
+            headerBackVisible: false,
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.COMPLETED_FAILURE}
+          component={ETScreen.CompleteObjectiveScreen}
+          options={{
+            headerShown: false,
+            animation: 'simple_push',
+            headerBackVisible: false,
+          }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.DELIVER_CASH}
+          component={ETScreen.DropCashScreen}
+          options={{ headerShown: false, headerBackVisible: false }}
+        />
+        <Stack.Screen
+          name={ExecutionTaskID.HTTP_REQUEST_ET}
+          component={ETScreen.HttpRequestScreen}
+          options={(rProps) => {
+            let taskTitle = getTaskTitle(rProps.route);
+            return {
+              title: taskTitle ?? ExecutionTaskName.HTTP_REQUEST_ET,
+              headerBackVisible: false,
+            };
+          }}
+        />
+      </Stack.Navigator>
+    );
+};
+
+function getMode(route: any): string {
+  try {
+    return route?.params[RouteParams.NEXT_STATES].input?.paymentMode;
+  } catch (error: any) {
+    return '';
+  }
+}
+
+function getTaskTitle(route: any): string {
+  try {
+    return route?.params[RouteParams.NEXT_STATES].input?.title;
+  } catch (error: any) {
+    return '';
+  }
+}
+
+export default DispatchExecNavigator;