@os1-platform/dispatch-mobile 3.1.5 → 3.1.7

package/src/manager/syncmanager/AppSyncManager.ts

@@ -61,11 +61,7 @@ export default class AppSyncManager {
   ): AppSyncManager {
     // removing this check to allow tenant change in app due to this manager instance did't re-init and event and docs didn't sync
     // if (!AppSyncManager.instance) {
-    Logger.getInstance().logEvent(
-      'initAppSync',
-      'CREATING NEW INSTANCE',
-      LOG_TYPE.SDK_INFO
-    );
+    Logger.getInstance().logCora("Info", `AppSyncManager initialized with ${tenantBaseURL}`);
     AppSyncManager.instance = new AppSyncManager(
       tenantBaseURL,
       syncRetryCount
@@ -108,11 +104,7 @@ export default class AppSyncManager {
         AppSyncManager.getInstance().isSyncActive = false;
       }
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        'startAppSyncManager',
-        `Unable to start App Sync Manager ${error.message}`,
-        LOG_TYPE.SDK_WARNING
-      );
+      Logger.getInstance().logCora("Error", `AppSyncManager startAppSyncManager: ${error}`);
     }
   }
 
@@ -176,13 +168,7 @@ export default class AppSyncManager {
       AppSyncManager.getInstance().startSDKSyncManager();
       return true;
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        'pushToQueue ',
-        JSON.stringify({
-          errorMessage: error.message,
-        }),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `AppSyncManager pushToQueue: ${error}`);
       return false;
     }
   }

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

@@ -18,100 +18,106 @@ export default class DocumentHttpClient extends HttpClient {
   constructor(baseURL: string) {
     super(baseURL);
   }
+
   public async uploadDocument(document: DocumentRow): Promise<string | null> {
-    if (document.base64 && document.data != null) {
-      const response = await this.uploadBase64File(document);
-      let info = '';
-      if (
-        response &&
-        response.data !== null &&
-        response.data.body !== null &&
-        response.status !== 202
-      ) {
-        let body = response.data.body;
-        info = body.substring(40);
-      } else {
-        info = String(response.status);
-      }
-      let extraParameters = {
-        response: info,
-        fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
-        dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
-        dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
-      };
+    try {
+      if (document.base64 && document.data != null) {
+        const response = await this.uploadBase64File(document);
+        let info = '';
+        if (
+          response &&
+          response.data !== null &&
+          response.data.body !== null &&
+          response.status !== 202
+        ) {
+          let body = response.data.body;
+          info = body.substring(40);
+        } else {
+          info = String(response.status);
+        }
+        let extraParameters = {
+          response: info,
+          fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
+          dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
+          dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
+        };
 
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.API_RESPONSE,
-        screenName: 'uploadDocument:Upload_Base64_File_Response',
-        extraParams: extraParameters,
-      });
+        fireEventWithScreenName({
+          severityLevel: SeverityLevelValue.LOG,
+          eventName: SentryEventNameSdkConstants.API_RESPONSE,
+          screenName: 'uploadDocument:Upload_Base64_File_Response',
+          extraParams: extraParameters,
+        });
 
-      Logger.getInstance().logEvent(
-        'uploadDocument:uploadBase64FileResponse',
-        flattenObject(extraParameters),
-        LOG_TYPE.SDK_ERROR
-      );
-      if (
-        response &&
-        response.data != null &&
-        response.data.data != null &&
-        response.data.data.id &&
-        response.status === 202
-      ) {
-        return response.data.data.id;
-      } else {
-        return null;
-      }
-    } else {
-      const uploadResponse = await this.uploadBinaryFile(document);
-      let info = '';
-      if (
-        uploadResponse &&
-        uploadResponse.body !== null &&
-        uploadResponse.status !== 202
-      ) {
-        let body = uploadResponse.body;
-        info = body.substring(40);
+        Logger.getInstance().logEvent(
+          'uploadDocument:uploadBase64FileResponse',
+          flattenObject(extraParameters),
+          LOG_TYPE.SDK_ERROR
+        );
+        if (
+          response &&
+          response.data != null &&
+          response.data.data != null &&
+          response.data.data.id &&
+          response.status === 202
+        ) {
+          return response.data.data.id;
+        } else {
+          return null;
+        }
       } else {
-        info = String(uploadResponse.status);
-      }
-      let extraParameters = {
-        response: info,
-        fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
-        dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
-        dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
-      };
+        const uploadResponse = await this.uploadBinaryFile(document);
+        let info = '';
+        if (
+          uploadResponse &&
+          uploadResponse.body !== null &&
+          uploadResponse.status !== 202
+        ) {
+          let body = uploadResponse.body;
+          info = body.substring(40);
+        } else {
+          info = String(uploadResponse.status);
+        }
+        let extraParameters = {
+          response: info,
+          fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
+          dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
+          dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
+        };
 
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.API_RESPONSE,
-        screenName: 'uploadDocument:Upload_Binary_File_Response',
-        extraParams: extraParameters,
-      });
-      Logger.getInstance().logEvent(
-        'uploadDocument:uploadBinaryFileResponse',
-        flattenObject(extraParameters),
-        LOG_TYPE.SDK_ERROR
-      );
-      if (
-        uploadResponse != null &&
-        uploadResponse.status === 202 &&
-        uploadResponse.body != null
-      ) {
+        fireEventWithScreenName({
+          severityLevel: SeverityLevelValue.LOG,
+          eventName: SentryEventNameSdkConstants.API_RESPONSE,
+          screenName: 'uploadDocument:Upload_Binary_File_Response',
+          extraParams: extraParameters,
+        });
         Logger.getInstance().logEvent(
-          'uploadDocument:DeletingFiles',
+          'uploadDocument:uploadBinaryFileResponse',
           flattenObject(extraParameters),
           LOG_TYPE.SDK_ERROR
         );
-        FileSystem.deleteAsync(document.file_path).then().catch(); // WE DELETE FILE HERE
-        if (document?.processed_file_path != null && document?.processed_file_path != '') {
-          FileSystem.deleteAsync(document.processed_file_path).then().catch(); // WE DELETE FILE HERE
+        if (
+          uploadResponse != null &&
+          uploadResponse.status === 202 &&
+          uploadResponse.body != null
+        ) {
+          Logger.getInstance().logEvent(
+            'uploadDocument:DeletingFiles',
+            flattenObject(extraParameters),
+            LOG_TYPE.SDK_ERROR
+          );
+          FileSystem.deleteAsync(document.file_path).then().catch(); // WE DELETE FILE HERE
+          if (document?.processed_file_path != null && document?.processed_file_path != '') {
+            FileSystem.deleteAsync(document.processed_file_path).then().catch(); // WE DELETE FILE HERE
+          }
+          return JSON.parse(uploadResponse.body)?.data?.id;
+        } else {
+          return null;
         }
-        return JSON.parse(uploadResponse.body)?.data?.id;
-      } else {
-        return null;
       }
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `DocumentHttpClient uploadDocument: ${error}`);
+      return null;
     }
   }
 
@@ -185,7 +191,6 @@ export default class DocumentHttpClient extends HttpClient {
   private async uploadBinaryFile(
     document: DocumentRow
   ): Promise<FileSystemUploadResult> {
-
     let sdkConfig = (await cache.getObjectFromCache(
       cacheKeys.SDK_CONFIG
     )) as DispatchSDKConfig;
@@ -203,8 +208,7 @@ export default class DocumentHttpClient extends HttpClient {
     }
     const fileStat = await RNFS.stat(filePathToUpload);
 
-    const url =
-      sdkConfig.tenantBaseURL + `/api/folders/${document.fms_folder_id}/files`;
+    const url = sdkConfig.tenantBaseURL + `/api/folders/${document.fms_folder_id}/files`;
 
     let extraParameters = {
       fSize: fileStat.size + " b",

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

@@ -57,7 +57,6 @@ export default class DocumentManager {
     processedFilePath?: string | null,
     priority?: number
   ): Promise<SQLResultSet> {
-    console.log('insertDocument2:', fmsFolderID);
     return await Database.executeQuery(
       `INSERT INTO ${DOCUMENT_TABLE}(\
                                     ${DOCUMENT_COLUMNS.DATA},\

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/ETEventsManager.ts

@@ -218,7 +218,7 @@ export default class ETEventsManager {
         return [
           {
             data: {
-              action: DispatchSyncType.DISPATCH_UPDATE,
+              action: _bulkEventData.data.action == DispatchSyncType.DISPATCH_SUB_STATUS_UPDATE ? DispatchSyncType.DISPATCH_SUB_STATUS_UPDATE :  DispatchSyncType.DISPATCH_UPDATE,
               payload: this.getDispatchUpdatePayload(_bulkEventData),
             },
             length: 1,

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);
       }
     })();