@os1-platform/dispatch-mobile 2.1.23 → 2.1.25

package/src/components/widgets/SnackBarCustom.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import React from 'react';
 import {
   Animated,
@@ -12,7 +13,11 @@ import {
 import { Surface, withTheme } from 'react-native-paper';
 import { AntDesign } from '@expo/vector-icons';
 import { Fonts } from '../../styles/executionTasks/CommonStyles';
-import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import {
+  ScreenNameSdkConstants,
+  SentryEventNameSdkConstants,
+  SeverityLevelValue,
+} from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 export interface SnackbarProps {
@@ -37,6 +42,7 @@ export enum SnackBarType {
   SUCCESS,
   FAILURE,
   WARNING,
+  PAYMENT_WARNING,
 }
 
 const SnackbarCustom = ({
@@ -52,7 +58,7 @@ const SnackbarCustom = ({
   const { current: opacity } = React.useRef<Animated.Value>(
     new Animated.Value(0.0)
   );
-  const [hidden, setHidden] = React.useState<boolean>(!visible);
+  const [hidden, setHidden] = React.useState<boolean>(true);
 
   const hideTimeout = React.useRef<NodeJS.Timeout | undefined>(undefined);
   const { scale } = theme.animation;
@@ -135,7 +141,7 @@ const SnackbarCustom = ({
                 },
               ],
             },
-            { backgroundColor: colors.onSurface },
+            // { backgroundColor: colors.onSurface },
           ] as StyleProp<ViewStyle>
         }
       >
@@ -145,23 +151,44 @@ const SnackbarCustom = ({
               ? styles.fail
               : type && type === SnackBarType.WARNING
               ? styles.warn
+              : type && type === SnackBarType.PAYMENT_WARNING
+              ? styles.paymentWarn
               : styles.main
           }
         >
           {type && type === SnackBarType.FAILURE ? (
             <AntDesign name="exclamationcircleo" size={20} color="white" />
+          ) : type && type === SnackBarType.PAYMENT_WARNING ? (
+            <AntDesign name="infocirlceo" size={20} color="#D97706" />
           ) : (
             <AntDesign name="checkcircleo" size={20} color="white" />
           )}
-          <Text style={styles.messageStyle}>{message}</Text>
+          <Text
+            style={[
+              styles.messageStyle,
+              type === SnackBarType.PAYMENT_WARNING && { color: '#B45309' },
+            ]}
+          >
+            {message}
+          </Text>
           <AntDesign
             name="close"
-            size={16}
-            color="white"
+            size={20}
+            color={
+              type && type === SnackBarType.PAYMENT_WARNING
+                ? '#3D445C'
+                : 'white'
+            }
             onPress={() => {
               setHidden(true);
-              const cta = "Close";
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_BAR_CUSTOM_SCREEN, cta: cta });
+              onDismiss();
+              const cta = 'Close';
+              fireEventWithScreenName({
+                severityLevel: SeverityLevelValue.LOG,
+                eventName: SentryEventNameSdkConstants.BUTTON_CLICKED,
+                screenName: ScreenNameSdkConstants.SCAN_BAR_CUSTOM_SCREEN,
+                cta: cta,
+              });
             }}
           />
         </View>
@@ -183,40 +210,53 @@ const styles = StyleSheet.create({
     justifyContent: 'space-between',
     alignItems: 'center',
     margin: 8,
-    borderRadius: 4,
+    borderRadius: 8,
   },
   main: {
-    padding: 16,
+    padding: 12,
     flexDirection: 'row',
     alignItems: 'center',
     backgroundColor: '#059669',
     flex: 1,
-    borderRadius: 4,
+    borderRadius: 8,
   },
   fail: {
-    padding: 16,
+    padding: 12,
     flexDirection: 'row',
     alignItems: 'center',
     backgroundColor: '#DC2626',
     flex: 1,
+    borderRadius: 8,
   },
   warn: {
-    padding: 16,
+    padding: 12,
     flexDirection: 'row',
     alignItems: 'center',
     backgroundColor: '#D97706',
     flex: 1,
+    borderRadius: 8,
   },
-  messageStyle: {
+  paymentWarn: {
+    padding: 16,
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: '#FFFBEB',
     flex: 1,
-    marginStart: 20,
-    marginEnd: 20,
+    borderRadius: 8,
+  },
+  messageStyle: {
+    fontSize: 14,
+    marginStart: 8,
+    marginEnd: 8,
+    width: '80%',
     color: '#ffffff',
-    fontWeight: '600',
+    flex: 1,
+    fontWeight: '400',
+    lineHeight: 20,
     fontFamily:
       Platform.OS === 'android'
-        ? Fonts.IBMPlexSans_600SemiBold
-        : 'IBMPlexSans-SemiBold',
+        ? Fonts.IBMPlexSans_400Regular
+        : 'IBMPlexSans_400Regular',
   },
 });
 

package/src/manager/syncmanager/constants.ts

@@ -4,5 +4,5 @@ export const SHARED_PREFERENCE_DISPATCH_ID = 'sharedPreferenceDispatchId';
 export const SHARED_PREFERENCE_SCAN_OUTPUT = 'scanETMappedOutput';
 export const SCAN_MERGED_OBJ_ID_OUTPUT = 'scanMergedObjectiveIDs';
 export const POD_DOC = 'POD_DOC';
-export const PROCESS_MAX_RETRIED_ROWS = false;
+export const PROCESS_MAX_RETRIED_ROWS = true;
 export const MAX_RETRY_COUNT = 3;

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

@@ -6,7 +6,7 @@ import type { SQLResultSet } from 'expo-sqlite';
 export default class DocumentManager {
   private static instance: DocumentManager;
 
-  private constructor() {}
+  private constructor() { }
 
   public static async getInstance(): Promise<DocumentManager> {
     if (!DocumentManager.instance) {
@@ -48,8 +48,6 @@ export default class DocumentManager {
     fmsFolderID: string | null,
     desc: string,
     dspID: string,
-    // jobID: string,
-    // objectiveRef: string,
     base64: boolean,
     fileName: string,
     fileType: string,
@@ -108,14 +106,14 @@ export default class DocumentManager {
   }
 
   public async getAllUnsyncedDocs(): Promise<DocumentRow[]> {
-    if(PROCESS_MAX_RETRIED_ROWS){
+    if (PROCESS_MAX_RETRIED_ROWS) {
       let resultSet = await Database.executeQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0;`,
         []
       );
       return resultSet.rows._array;
-    }else{
+    } else {
       let resultSet = await Database.executeQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 AND ${DOCUMENT_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT};`,
@@ -154,7 +152,7 @@ export default class DocumentManager {
       [sync, fmsID, attempt, id]
     );
   }
-    // This function is updating processed_file_path column for the base64 overlayed data and overlayed image file for POD. Also if it is base 64 then it is also storing temprary file path in file_path as original bae64 image.
+  // This function is updating processed_file_path column for the base64 overlayed data and overlayed image file for POD. Also if it is base 64 then it is also storing temprary file path in file_path as original bae64 image.
   public async updateProcesedFilePath(
     id: number,
     origialFilePath: String,
@@ -198,7 +196,7 @@ export default class DocumentManager {
 
   public async getUnsyncedDocument(): Promise<DocumentRow[]> {
     // If it is allowed max_retried_rows are allowed to process then it will refetch those data which are even have tried max attempt otherwise it will skip those events.
-    if(PROCESS_MAX_RETRIED_ROWS){
+    if (PROCESS_MAX_RETRIED_ROWS) {
       let rs = await Database.executeQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 \
@@ -206,7 +204,7 @@ export default class DocumentManager {
         []
       );
       return rs.rows._array;
-    }else{
+    } else {
       let rs = await Database.executeQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 AND ${DOCUMENT_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} \

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

@@ -14,15 +14,11 @@ import NetworkUtil from '../../../utils/NetworkUtil';
 import ETEventsManager from '../events/ETEventsManager';
 import { LAST_SYNCED_EVENT_ID, MAX_RETRY_COUNT, POD_DOC } from '../../syncmanager/constants';
 import EventsSyncManager from '../events/EventsSyncManager';
-import Marker, {
-  Position,
-  TextBackgroundType,
-  ImageFormat,
-} from 'react-native-image-marker';
+import Marker, { Position, TextBackgroundType, ImageFormat } from 'react-native-image-marker';
 import RNFS from 'react-native-fs';
 import Storage from '../../../utils/storage';
 import { Platform } from 'react-native';
-import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
+import { SentryEventNameSdkConstants, SeverityLevelValue } from '../../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
 const latlngToDms = require('latlng-to-dms');
 
@@ -68,8 +64,7 @@ export default class DocumentSyncManager {
           this.docManager = await DocumentManager.getInstance();
         }
         if (hasNetwork) {
-          let documentRows: DocumentRow[] =
-            await this.docManager.getUnsyncedDocument();
+          let documentRows: DocumentRow[] = await this.docManager.getUnsyncedDocument();
           if (documentRows?.length > 0) {
             await this.uploadDocToServer(documentRows[0]);
           } else {
@@ -83,11 +78,7 @@ export default class DocumentSyncManager {
                 msg: 'No data to sync'
               },
             });
-            Logger.getInstance().logEvent(
-              cta,
-              'No data to sync',
-              LOG_TYPE.SDK_ERROR
-            );
+            Logger.getInstance().logEvent(cta, 'No data to sync', LOG_TYPE.SDK_ERROR);
           }
         } else {
           let cta = 'startDocumentSync-NoNetwork'
@@ -179,8 +170,6 @@ export default class DocumentSyncManager {
     base64: boolean,
     desc: string,
     dspID: string,
-    // jobID: string,
-    // objRef: string,
     filePath: string | null,
     fileType: string,
     fileName: string,
@@ -191,17 +180,12 @@ export default class DocumentSyncManager {
     if (
       isEmptyOrBlank(desc) ||
       isEmptyOrBlank(dspID) ||
-      // isEmptyOrBlank(jobID) ||
-      // isEmptyOrBlank(objRef) ||
       isEmptyOrBlank(fileType) ||
       isEmptyOrBlank(fileName) ||
       (base64 && isEmptyOrBlank(data)) ||
       (!base64 && isEmptyOrBlank(filePath))
     )
-      throw new BaseError(
-        BaseErrorCodes.InvalidArgumentError,
-        InvalidArgumentsError
-      );
+      throw new BaseError(BaseErrorCodes.InvalidArgumentError, InvalidArgumentsError);
     else {
       if (!this.docManager) {
         this.docManager = await DocumentManager.getInstance();
@@ -211,8 +195,6 @@ export default class DocumentSyncManager {
         fmsFolderID,
         desc,
         dspID,
-        // jobID,
-        // objRef,
         base64,
         fileName,
         fileType,
@@ -229,12 +211,12 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg: 'INIT DOC SYNC AGAIN'
+          msg: 'insertResponse ' + flattenObject(insertResponse)
         },
       });
       Logger.getInstance().logEvent(
         cta,
-        'INIT DOC SYNC AGAIN',
+        'insertResponse ' + flattenObject(insertResponse),
         LOG_TYPE.SDK_ERROR
       );
       return insertResponse;
@@ -247,23 +229,6 @@ export default class DocumentSyncManager {
     await this.startDocumentSync();
   }
 
-  // private async updateDocument(documentRow: DocumentRow, fmsID: string) {
-  //   if (!this.docManager) this.docManager = await DocumentManager.getInstance();
-  //   try {
-  //     await this.docManager.markDocumentSynced(documentRow.id, fmsID);
-  //     let eventsManager = await ETEventsManager.getInstance();
-  //     let podId = POD_DOC + '_' + documentRow.id;
-  //     await eventsManager.markPODDocEventSynced(1, 1, podId);
-  //     EventsSyncManager.getInstance().startSync();
-  //   } catch (err: any) {
-  //     Logger.getInstance().logEvent(
-  //       'updateDocument',
-  //       err.message,
-  //       LOG_TYPE.SDK_WARNING
-  //     );
-  //   }
-  // }
-
   // This function will update document row with attempt count and sync status
   private async updateDocumentWithAttempt(
     documentRow: DocumentRow,
@@ -329,7 +294,7 @@ export default class DocumentSyncManager {
       Logger.getInstance().logEvent(
         cta,
         flattenObject(err),
-        LOG_TYPE.SDK_WARNING
+        LOG_TYPE.SDK_ERROR
       );
     }
   }

package/src/ui/screens/CollectPaymentScreen.tsx

@@ -79,7 +79,6 @@ const CollectPaymentScreen = ({
   );
 
   useEffect(() => {
-    
     if (
       taskId === ExecutionTaskID.COLLECT_PAYMENT_ET &&
       (!isMandatoryKeysPresent(route.params[RouteParams.ROOT_META_DATA], [
@@ -149,6 +148,10 @@ const CollectPaymentScreen = ({
           ...modifiedInput.allowedModes,
           ...updatedInput.allowedModes,
         ];
+        const index = updatedInput.allowedModes.indexOf('ONLINE');
+        if (index > -1) {
+          updatedInput.allowedModes.splice(index, 1);
+        }
       }
       if (!updatedInput.allowedModes?.length) {
         navigateWithError(
@@ -191,10 +194,10 @@ const CollectPaymentScreen = ({
       // };
 
       const configData = paymentResp?.data?.data?.configDetails[0];
-      if (configData?.paymentMethods?.QR) {
+      if (configData?.paymentMethods?.QR === true) {
         response.methods.push('QR_CODE');
       }
-      if (configData?.paymentMethods?.paymentLink) {
+      if (configData?.paymentMethods?.paymentLink === true) {
         response.methods.push('PAYMENT_LINK');
       }
       if (configData?.modesMapping) {

package/src/ui/screens/StartWorkFlowScreen.tsx

@@ -226,7 +226,7 @@ const StartWorkFlowScreen = ({
         }
       } catch (error: any) {
         baseETProps.showProgress(false);
-        navigateWithError(ErrorCodes.UNEXPECTED_ERROR, error.message);
+        navigateWithError(error?.code ?? ErrorCodes.UNEXPECTED_ERROR, error.message);
         Logger.getInstance().logEvent(TAG, error.message, LOG_TYPE.SDK_ERROR);
       }
     })();

package/src/utils/Logger.ts

@@ -1,6 +1,4 @@
-import DispatchSdkCache from '../manager/sdk/DispatchSdkCache';
 import type { DispatchSDKConfig } from '../models/sdk';
-import * as Sentry from '@sentry/react-native';
 import crashlytics from '@react-native-firebase/crashlytics';
 
 export const enum LOG_TYPE {
@@ -33,8 +31,6 @@ class Logger {
 
   logEvent(TAG: string, message: string, logType: LOG_TYPE) {
     if (this.enableLogs) console.log(TAG, message);
-    // crashlytics().log(`${TAG} - ${logType} -${message}`);
-    // this.sendSentryMessage(message, TAG, logType);
     if (
       logType === LOG_TYPE.SDK_WARNING ||
       logType === LOG_TYPE.SDK_ERROR ||
@@ -42,8 +38,7 @@ class Logger {
       logType === LOG_TYPE.APP_WARNING
     ) {
       crashlytics().recordError(new Error(message), TAG);
-      //this.sendSentryException(new Error(message), TAG, logType);
-     }
+    }
   }
 
 
@@ -53,58 +48,6 @@ class Logger {
     }
     return Logger.instance;
   }
-
-  // public sendSentryException(exception: any, logTag: string, logType: string) {
-  //   // (async () => {
-  //   //   try {
-  //   //     Sentry.captureException(
-  //   //       exception,
-  //   //       await this.getUserConfig(Severity.Error, logType, logTag)
-  //   //     );
-  //   //   } catch (error: any) {}
-  //   // })();
-  // }
-
-  // public sendSentryMessage(message: string, logTag: string, logType: string) {
-  //   // (async () => {
-  //   //   try {
-  //   //     Sentry.captureMessage(
-  //   //       message,
-  //   //       await this.getUserConfig(Severity.Warning, logType, logTag)
-  //   //     );
-  //   //   } catch (error: any) {}
-  //   // })();
-  // }
-
-  // private async getUserConfig(
-  //   logLevel: Severity,
-  //   logType: string,
-  //   logTag: string
-  // ) {
-  //   try {
-  //     const config = (await DispatchSdkCache.getInstance().getObjectFromCache(
-  //       DispatchSdkCache.KEYS.SDK_CONFIG
-  //     )) as DispatchSDKConfig;
-  //     const dspId = await DispatchSdkCache.getInstance().getKeyFromCache(
-  //       DispatchSdkCache.KEYS.DISPATCH_ID
-  //     );
-  //     return {
-  //       user: {
-  //         id: config?.userID,
-  //         username: config?.userName,
-  //       },
-  //       tags: {
-  //         dispatchId: dspId,
-  //         errorTime: Date.now(),
-  //         logType: logType,
-  //         logTag: logTag,
-  //       },
-  //       level: logLevel,
-  //     };
-  //   } catch (error: any) {
-  //     return undefined;
-  //   }
-  // }
 }
 
 export default Logger;