@os1-platform/dispatch-mobile 3.1.6 → 3.1.8

package/src/manager/syncmanager/document/DocumentSyncManager.ts

@@ -98,21 +98,7 @@ export default class DocumentSyncManager {
           );
         }
       } catch (error: any) {
-        let cta = 'startDocumentSync-error'
-        fireEventWithScreenName({
-          severityLevel: SeverityLevelValue.LOG,
-          eventName: SentryEventNameSdkConstants.APP_LOG,
-          screenName: cta,
-          cta: cta,
-          extraParams: {
-            msg: flattenObject(error)
-          },
-        });
-        Logger.getInstance().logEvent(
-          cta,
-          flattenObject(error),
-          LOG_TYPE.SDK_ERROR
-        );
+        Logger.getInstance().logCora("Error", `DocumentSyncManager startDocumentSync: ${error}`);
       } finally {
         this.inProgress = false;
         let syncPending = await this.isSyncPending();
@@ -190,7 +176,6 @@ export default class DocumentSyncManager {
       if (!this.docManager) {
         this.docManager = await DocumentManager.getInstance();
       }
-      console.log('insertDocument1:', fmsFolderID);
       let insertResponse = await this.docManager?.insertDocument(
         fmsFolderID,
         desc,
@@ -281,21 +266,7 @@ export default class DocumentSyncManager {
       }
       EventsSyncManager.getInstance().startSync();
     } catch (err: any) {
-      let cta = 'updateDocumentWithAttempt'
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.APP_LOG,
-        screenName: cta,
-        cta: cta,
-        extraParams: {
-          msg: flattenObject(err)
-        },
-      });
-      Logger.getInstance().logEvent(
-        cta,
-        flattenObject(err),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `DocumentSyncManager updateDocumentWithAttempt: ${err}`);
     }
   }
 
@@ -313,21 +284,7 @@ export default class DocumentSyncManager {
         processedPath
       );
     } catch (err: any) {
-      let cta = 'updateDocument-updateDocumentProcessedPath-Error'
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.ERROR,
-        eventName: SentryEventNameSdkConstants.APP_ERROR,
-        screenName: cta,
-        cta: cta,
-        extraParams: {
-          msg: flattenObject(err)
-        },
-      });
-      Logger.getInstance().logEvent(
-        cta,
-        flattenObject(err),
-        LOG_TYPE.SDK_WARNING
-      );
+      Logger.getInstance().logCora("Error", `DocumentSyncManager updateDocumentProcessedPath: ${err}`);
     }
   }
 
@@ -336,21 +293,7 @@ export default class DocumentSyncManager {
     try {
       await this.docManager.updateDocSyncError(documentRow.id, uploadError);
     } catch (err: any) {
-      let cta = 'updateDocError'
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.ERROR,
-        eventName: SentryEventNameSdkConstants.APP_ERROR,
-        screenName: cta,
-        cta: cta,
-        extraParams: {
-          msg: flattenObject(err)
-        },
-      });
-      Logger.getInstance().logEvent(
-        cta,
-        flattenObject(err),
-        LOG_TYPE.SDK_WARNING
-      );
+      Logger.getInstance().logCora("Error", `DocumentSyncManager updateDocError: ${err}`);
     }
   }
   private checkForInitialization() {
@@ -443,6 +386,7 @@ export default class DocumentSyncManager {
           documentRow.processed_file_path = completeFilePath;
         }
       } catch (error: any) {
+        Logger.getInstance().logCora("Error", `DocumentSyncManager processImageData: ${error}`);
         this.updateDocumentProcessedPath(
           documentRow,
           documentRow.file_path, //original file path catprued from camera
@@ -665,21 +609,7 @@ export default class DocumentSyncManager {
         this._retries + 1,
         0
       );
-      const cta = 'uploadDocToServer-error';
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.ERROR,
-        eventName: SentryEventNameSdkConstants.API_ERROR,
-        screenName: cta,
-        cta: cta,
-        extraParams: {
-          error: flattenObject(error),
-        },
-      });
-      Logger.getInstance().logEvent(
-        cta,
-        flattenObject(error),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `DocumentSyncManager uploadDocToServer: ${error}`);
       this._retries++;
       this.startSyncAfterMaxRetry(null, error);
       await this.updateDocError(

package/src/manager/syncmanager/events/EventsSyncManager.ts

@@ -41,7 +41,7 @@ export default class EventsSyncManager {
     this._retries = value;
   }
 
-  private constructor() {}
+  private constructor() { }
 
   public initSyncManager(baseURL: string, retryCount: number) {
     if (isEmptyOrBlank(baseURL))
@@ -66,7 +66,7 @@ export default class EventsSyncManager {
       }
       try {
         this.checkForInitialization();
-      
+
         if (hasNetwork) {
           // NEW CODE
           const lastSyncedEventId = await Storage.getInstance().getSharedItem(
@@ -135,11 +135,7 @@ export default class EventsSyncManager {
           );
         }
       } catch (error: any) {
-        Logger.getInstance().logEvent(
-          'startSync-error',
-          flattenObject(error),
-          LOG_TYPE.SDK_ERROR
-        );
+        Logger.getInstance().logCora("Error", `startSync: ${error}`);
       } finally {
         this.inProgress = false;
         const lastSyncedEventId = await Storage.getInstance().getSharedItem(
@@ -168,7 +164,6 @@ export default class EventsSyncManager {
           hasNetwork: hasNetwork,
           pending: arrEventsToSync.length != 0,
         };
-        console.log("finally:",arrEventsToSync.length);
         if (arrEventsToSync.length != 0 && hasNetwork) {
           await this.startSync();
           Logger.getInstance().logEvent('startSync-finally-data-sync-available', flattenObject(extraParameters), LOG_TYPE.SDK_ERROR);
@@ -272,11 +267,7 @@ export default class EventsSyncManager {
       try {
         promises.push(this.eventsManager.updateError(ev.id, errorString));
       } catch (err: any) {
-        Logger.getInstance().logEvent(
-          'updateEventError',
-          flattenObject(err),
-          LOG_TYPE.SDK_WARNING
-        );
+        Logger.getInstance().logCora("Error", `updateEventError: ${JSON.stringify(err)}`);
       }
     }
     await Promise.all(promises);
@@ -298,7 +289,7 @@ export default class EventsSyncManager {
       this.eventsManager = await ETEventsManager.getInstance();
     }
 
-  
+
     // NEW CODE
     const lastSyncedEventId = await Storage.getInstance().getSharedItem(
       LAST_SYNCED_EVENT_ID
@@ -329,11 +320,7 @@ export default class EventsSyncManager {
       try {
         promises.push(await this.eventsManager.markEventSynced(ev.id));
       } catch (err: any) {
-        Logger.getInstance().logEvent(
-          'markEventSynced',
-          flattenObject(err),
-          LOG_TYPE.SDK_WARNING
-        );
+        Logger.getInstance().logCora("Error", `markEventSynced: ${JSON.stringify(err)}`);
       }
     }
 
@@ -461,11 +448,7 @@ export default class EventsSyncManager {
       if (requiredPayload) return requiredPayload.data;
       else return null;
     } catch (err: any) {
-      Logger.getInstance().logEvent(
-        'getObjectiveSummary',
-        flattenObject(err),
-        LOG_TYPE.SDK_WARNING
-      );
+      Logger.getInstance().logCora("Error", `getObjectiveSummary: ${JSON.stringify(err)}`);
       return null;
     }
   }
@@ -568,11 +551,7 @@ export default class EventsSyncManager {
       }
     } catch (error: any) {
       this._retries++;
-      Logger.getInstance().logEvent(
-        'syncBulkEventToServer-error',
-        flattenObject(error),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `syncBulkEventToServer: ${JSON.stringify(error)}`);
       await this.updateEventError(
         eventRows,
         JSON.stringify({

package/src/manager/syncmanager/events/SyncHttpClient.ts

@@ -168,6 +168,7 @@ export default class SyncHttpClient extends HttpClient {
               resolve(null);
           }
         } catch (error: any) {
+          Logger.getInstance().logCora("Error", `SyncHttpClient syncEvent: ${error}`);
           reject(error);
         }
       }, 0); //1000
@@ -218,11 +219,7 @@ export default class SyncHttpClient extends HttpClient {
             resolve(true);
           }
         } catch (error: any) {
-          Logger.getInstance().logEvent(
-            'syncBulkEvent-error',
-            flattenObject(error),
-            LOG_TYPE.SDK_ERROR
-          );
+          Logger.getInstance().logCora("Error", `SyncHttpClient syncBulkEvent: ${error}`);
           reject(error);
         }
       }, 0); //1000

package/src/network/client.ts

@@ -1,5 +1,6 @@
-import axios, { AxiosInstance, AxiosResponse } from 'axios';
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import StatusCode from '../constants/statuscode';
+import Logger from '../utils/Logger';
 // import { handleAccessTokenExpiry } from './utils/helper';
 
 export default abstract class HttpClient {
@@ -15,18 +16,27 @@ export default abstract class HttpClient {
   }
 
   private _initializeResponseInterceptor = () => {
+    this.instance.interceptors.request.use(
+      this._handleRequest
+    )
     this.instance.interceptors.response.use(
       this._handleResponse,
       this._handleError
     );
   };
 
+  protected _handleRequest = (request: AxiosRequestConfig) => {
+    Logger.getInstance().logCora("Info", `API:Request: ${JSON.stringify(request)}`);
+    return request;
+  };
+
   protected _handleResponse = (response: AxiosResponse) => {
+    Logger.getInstance().logCora("Info", `API:Response: ${JSON.stringify(response)}`);
     return response;
   };
 
   protected _handleError = (error: any) => {
-    console.log('error.response: ', error);
+    Logger.getInstance().logCora("Error", `API:Error: ${JSON.stringify(error)}`);
     if (error.response) {
       // Request made and server responded
       const { status } = error.response;

package/src/ui/screens/CollectPaymentScreen.tsx

@@ -126,11 +126,7 @@ const CollectPaymentScreen = ({
             modifiedInput.allowedModes.splice(index, 1);
           }
         } catch (error: any) {
-          Logger.getInstance().logEvent(
-            '~ getTotalExpected triggered ',
-            JSON.stringify(error?.response?.data || error),
-            LOG_TYPE.SDK_ERROR
-          );
+          Logger.getInstance().logCora("Error", `CollectPaymentScreen getPaymentModes: ${error}`);
           updatedInput.allowedModes = [];
           updatedInput.plModes = [];
           const index = modifiedInput.allowedModes.indexOf('ONLINE');
@@ -206,46 +202,35 @@ const CollectPaymentScreen = ({
 
       return response;
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        '~ getPaymentModes triggered ',
-        JSON.stringify(error?.response?.data || error),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `CollectPaymentScreen getPaymentModes: ${error}`);
       return null;
     }
   };
 
   const getTotalExpected = async () => {
-    const totalAmount: number = await DispatchExecutor.getTotalPaymentAmountMWI(
-      mergedObjectiveId
-    );
-    setExpectedAmount(totalAmount);
-    // setExpectedAmount(1000); //FOR TESTING
-    return totalAmount;
+    try {
+      const totalAmount: number = await DispatchExecutor.getTotalPaymentAmountMWI(
+        mergedObjectiveId
+      );
+      setExpectedAmount(totalAmount);
+      return totalAmount;
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `CollectPaymentScreen getTotalExpected: ${error}`);
+      return 0;
+    }
   };
 
   const submitOutput = useCallback(
     async (etOutput: any) => {
-      console.log('CollectPaymentScreen:SubmitOutput:', etOutput);
+      Logger.getInstance().logCora("Info", `CollectPaymentScreen submitOutput: ${JSON.stringify(etOutput)}`);
       if (etOutput.paymentMode == 'QR_CODE') {
-        console.log(
-          'CollectPaymentScreen:SubmitOutput:etOutput.paymentMode',
-          etOutput.paymentMode
-        );
         let jobData = await DispatchExecutor.wQueryJobForMOId(
           mergedObjectiveId[0]
         );
-        console.log(
-          'CollectPaymentScreen:SubmitOutput:etOutput.jobData',
-          jobData
-        );
+
         let result = await DispatchExecutor.wUpdateAmountToZero(
           jobData[0].jobId
         );
-        console.log(
-          'CollectPaymentScreen:SubmitOutput:etOutput.result',
-          result
-        );
       }
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
@@ -261,9 +246,6 @@ const CollectPaymentScreen = ({
     [baseETProps, navigation, route]
   );
 
-  // console.log("collectpayment1:",contextData)
-  // console.log("collectpayment2:",modifiedInput.allowedModes.includes('ONLINE'))
-  // console.log("collectpayment3:",modifiedInput.allowedModes?.length)
   useEffect(() => {
     if (contextData && modifiedInput?.allowedModes?.length) {
       setShowScreen(true);
@@ -287,7 +269,6 @@ const CollectPaymentScreen = ({
         taskMeta={taskMeta}
         route={route}
         onSubmitET={async (etOutput) => {
-          console.log('etOutput: ', JSON.stringify(etOutput));
           if (etOutput.success || etOutput.eventCode == GO_BACK_EVENT_CODE) {
             await submitOutput(etOutput);
           } else {

package/src/ui/screens/CompleteObjectiveScreen.tsx

@@ -6,7 +6,7 @@ import { getObjectiveCompleteResp } from '../../utils/ExecTaskUtils';
 import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
-import Logger, { LOG_TYPE } from '../../utils/Logger';
+import Logger from '../../utils/Logger';
 import { showToast } from '../../components/widgets/Toaster';
 import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 
@@ -40,6 +40,7 @@ const CompleteObjectiveScreen = ({
           mergedObjectiveId,
           nextState.taskId
         );
+        Logger.getInstance().logCora("Info", `Objective Completed: ${JSON.stringify(etResponse)}`);
         await DispatchStateContainer.getInstance().navigateToNextTask(
           navigation,
           route,
@@ -54,11 +55,7 @@ const CompleteObjectiveScreen = ({
         );
       } catch (error: any) {
         baseETProps.showProgress(false);
-        Logger.getInstance().logEvent(
-          'COMPLETE_OBJECTIVE',
-          error.message,
-          LOG_TYPE.SDK_ERROR
-        );
+        Logger.getInstance().logCora("Error", `Objective Completion Error: ${error.message}`);
         showToast(error.message);
       }
     })();

package/src/ui/screens/DeliverScreen.tsx

@@ -15,6 +15,7 @@ import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 import { PROGRESS_GROUP } from '../../utils/Constants';
+import Logger from '../../utils/Logger';
 
 const DeliverScreen = ({
   navigation,
@@ -58,24 +59,27 @@ const DeliverScreen = ({
       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);
+      Logger.getInstance().logCora("Error", `Deliver Screen getSelfLoopBool: ${error}`);
     }
   }
 
   const getMergedReturnPackageCount = async () => {
-    let progressGroup = null;
     try {
-      progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
-    } catch (error) {
-      progressGroup = null;
+      let progressGroup = null;
+      try {
+        progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
+      } catch (error) {
+        progressGroup = null;
+      }
+      const count = await DispatchExecutor.getShipmentsCountForDeliverET(
+        mergedObjectiveId, progressGroup
+      );
+      setReturnPackageCount(count.totalCount);
+      setShipCount(count.shipCount);
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `DeliverScreen getMergedReturnPackageCount: ${error}`);
     }
-    const count = await DispatchExecutor.getShipmentsCountForDeliverET(
-      mergedObjectiveId, progressGroup
-    );
-    setReturnPackageCount(count.totalCount);
-    setShipCount(count.shipCount);
   };
 
   useEffect(() => {
@@ -89,6 +93,7 @@ const DeliverScreen = ({
   const [sResponse, setResponse] = useState<any>();
   const submitOutput = useCallback(
     async (deliverOutput: any) => {
+      Logger.getInstance().logCora("Info", `DeliverScreen submitOutput: ${JSON.stringify(deliverOutput)}`);
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/DropCashScreen.tsx

@@ -9,15 +9,14 @@ import type { ETAmount } from '../../components/executiontasks/payments/init/Ini
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { getBaseETResponse, 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';
-//{ fireEventWithScreenName } from 'src/analytics/sentry/SentryAnalyticsUtils';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 import ProgressDialog from '../../components/widgets/ProgressDialog';
 import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';
+import Logger from '../../utils/Logger';
 
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
@@ -72,9 +71,7 @@ const DropCashScreen = ({
 
   useEffect(() => {
     (async () => {
-      console.log("expectedAmount:", expectedAmount);
       if (expectedAmount.value === 0) {
-        // setLoading(true);
         let dropCashETOutput = {
           amount: {
             value: expectedAmount.value,
@@ -102,7 +99,6 @@ const DropCashScreen = ({
             return dropCashETOutput;
           });
         }
-        // setLoading(false);
       }
     })();
   }, [expectedAmount.value])
@@ -110,9 +106,13 @@ const DropCashScreen = ({
 
 
   const getTotalExpected = async () => {
-    const totalAmountArr: any[] = await DispatchExecutor.getTotalAmountMWI(mergedObjectiveId);
-    let finalValue = totalAmountArr.map(Number).reduce((sum, num) => sum + num, 0).toFixed(2);
-    setExpectedAmount({ ...expectedAmount, value: Number(finalValue) });
+    try {
+      const totalAmountArr: any[] = await DispatchExecutor.getTotalAmountMWI(mergedObjectiveId);
+      let finalValue = totalAmountArr.map(Number).reduce((sum, num) => sum + num, 0).toFixed(2);
+      setExpectedAmount({ ...expectedAmount, value: Number(finalValue) });
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `Error in getTotalExpected: ${error}`);
+    }
   };
 
   const getSelfLoopBool = async () => {
@@ -120,9 +120,8 @@ const DropCashScreen = ({
       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);
+      Logger.getInstance().logCora("Error", `Error in getSelfLoopBool: ${error}`);
     }
   }
 
@@ -130,6 +129,7 @@ const DropCashScreen = ({
   const [sResponse, setResponse] = useState<any>();
   const submitOutput = useCallback(
     async (etOutput: any) => {
+      Logger.getInstance().logCora("Info", `DropCashScreen submitOutput: ${JSON.stringify(etOutput)}`);
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/ImageCaptureScreen.tsx

@@ -10,6 +10,7 @@ import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import Logger from '../../utils/Logger';
 
 
 const ImageCaptureScreen = ({
@@ -49,9 +50,8 @@ const ImageCaptureScreen = ({
       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);
+      Logger.getInstance().logCora("Error", `ImageCaptureScreen getSelfLoopBool: ${error}`);
     }
   }
 

package/src/ui/screens/PickupScreen.tsx

@@ -3,15 +3,14 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import type { BaseETProps } from '../../models/DispatchModels';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 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 SLPickupET from '../../components/executiontasks/pickup/SLPickupET';
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import Logger from '../../utils/Logger';
 
 const PickupScreen = ({
   route,
@@ -32,12 +31,12 @@ const PickupScreen = ({
   const [items, setItems] = useState([]);
   const [isSelfLoopTrue, setSelfLoop] = useState(false);
 
-  
+
 
   useEffect(() => {
     (async () => {
       //fire sentry event
-      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.PICKUP_ET_OPENED, screenName:ScreenNameSdkConstants.PICKUP_ET_SCREEN});
+      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.PICKUP_ET_OPENED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN });
       //      
       onTaskStart(
         nextState,
@@ -59,18 +58,11 @@ const PickupScreen = ({
   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);
+      Logger.getInstance().logCora("Error", `PickupScreen getSelfLoopBool: ${error}`);
     }
   }
 
@@ -101,6 +93,7 @@ const PickupScreen = ({
       taskMeta={taskMeta}
       isSelfLoop={isSelfLoopTrue}
       onSubmitET={async (pickupOutput) => {
+        Logger.getInstance().logCora("Info", `PickupScreen onSubmitET: ${JSON.stringify(pickupOutput)}`);
         await DispatchStateContainer.getInstance().navigateToNextTask(
           navigation,
           route,

package/src/ui/screens/StartWorkFlowScreen.tsx

@@ -225,9 +225,9 @@ const StartWorkFlowScreen = ({
           );
         }
       } catch (error: any) {
+        Logger.getInstance().logCora("Error", `StartWorkFlowScreen Catch: ${error}`);
         baseETProps.showProgress(false);
         navigateWithError(error?.code ?? ErrorCodes.UNEXPECTED_ERROR, error.message);
-        Logger.getInstance().logEvent(TAG, error.message, LOG_TYPE.SDK_ERROR);
       }
     })();
   }, []);

package/src/utils/Constants.ts

@@ -1,5 +1,4 @@
-import { Platform } from "react-native";
 
 const KEY_STORAGE_PREFIX = '@Dsp_Executor_';
 export const PROGRESS_GROUP = KEY_STORAGE_PREFIX + 'progressGroup';
-export const EXPIRY_TIME = Platform.OS === 'android' ? 216000 : 60000;
+export const EXPIRY_TIME = 21600; // 6 hours