@os1-platform/dispatch-mobile 3.1.1 → 3.1.4

package/src/components/executiontasks/validateOTP/ValidateOTPET.tsx

@@ -61,6 +61,7 @@ import {
   INVALID_OTP_LENGTH,
   INVALID_OTP_ONE_ATTEMPT_LEFT,
   OTP_SENT_SUCCESSFULLY,
+  TAG_VERIFY_OTP,
   UNABLE_TO_SEND_OTP,
 } from './constants';
 
@@ -89,6 +90,7 @@ import {
   SeverityLevelValue,
 } from '../../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../../analytics/sentry/SentryAnalyticsUtils';
+import Logger, { LOG_TYPE } from '../../../utils/Logger';
 
 const ValidateOTPET: FC<ValidateOTPInput> = (props) => {
   const { contacts, navigation } = props;
@@ -284,28 +286,47 @@ const ValidateOTPET: FC<ValidateOTPInput> = (props) => {
         },
       };
 
+      Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:payloadForGenerateOTP : ${JSON.stringify(payload)}`);
+      
       const response = await generateOTP(payload, { ...props, domain });
 
-      if (!response?.status) {
-        if (!response.status && response?.code === '101080001017') {
-          setCurrentScreen(VALIDATE_OTP_SCREENS.OTP_VIEW);
-          setLoading(false);
-          setSnackBar({
-            show: true,
-            message: response?.data?.result?.message || UNABLE_TO_SEND_OTP,
-            type: SnackBarType.OTP_FAILED,
-          });
-        } else {
-          setLoading(false);
-          setSnackBar({
-            show: true,
-            message: response?.data?.result?.message || ERROR_GENERATING_OTP,
-            type: SnackBarType.OTP_FAILED,
-          });
-        }
+      Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:responseForGenerateOTP : ${JSON.stringify(response)}`);
 
+      if (response?.status != undefined) {
+        Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:response.status != undefined : ${JSON.stringify(response)}`);
+        if (!response?.status) {
+          Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:response.status == false : ${JSON.stringify(response)}`);
+          if (response?.code === '101080001017') {
+            setCurrentScreen(VALIDATE_OTP_SCREENS.OTP_VIEW);
+            setLoading(false);
+            Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:${UNABLE_TO_SEND_OTP}`);
+            setSnackBar({
+              show: true,
+              message: response?.data?.result?.message || UNABLE_TO_SEND_OTP,
+              type: SnackBarType.OTP_FAILED,
+            });
+          } else {
+            setLoading(false);
+            Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:${ERROR_GENERATING_OTP}`);
+            setSnackBar({
+              show: true,
+              message: response?.data?.result?.message || ERROR_GENERATING_OTP,
+              type: SnackBarType.OTP_FAILED,
+            });
+          }
+          return;
+        }
+      }else{
+        Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:response.status == undefined : ${JSON.stringify(response)}`);
+        setLoading(false);
+        setSnackBar({
+          show: true,
+          message: response?.data?.result?.message || ERROR_GENERATING_OTP,
+          type: SnackBarType.OTP_FAILED,
+        });
         return;
       }
+      Logger.getInstance().log(TAG_VERIFY_OTP, `handleContactListProceed:response.status == true : ${JSON.stringify(response)}`);
 
       const resendCountValue =
         Number(
@@ -322,9 +343,9 @@ const ValidateOTPET: FC<ValidateOTPInput> = (props) => {
         message: OTP_SENT_SUCCESSFULLY,
         type: SnackBarType.OTP_SUCCESS,
       });
-    } catch (error) {
+    } catch (error: any) {
+      Logger.getInstance().log(TAG_VERIFY_OTP,`handleContactListProceed:catch : ${error.message}`)
       setLoading(false);
-      console.error('Error in handleContactListProceed:', error);
       setSnackBar({
         show: true,
         message: ERROR_GENERATING_OTP,

package/src/components/executiontasks/validateOTP/constants.ts

@@ -29,3 +29,5 @@ export const DEFAULT_RETRY_CONFIG = {
   enableDelay: 60,
   maxResends: 5,
 };
+
+export const TAG_VERIFY_OTP = 'VerifyOTP';

package/src/components/executiontasks/validateOTP/utils.ts

@@ -2,7 +2,7 @@
 import * as jsonLogic from 'json-logic-js';
 import Logger, { LOG_TYPE } from '../../../utils/Logger';
 import { createApiData, getAxiosApiResponse } from '../../../utils/ApiUtils';
-import { DEFAULT_RETRY_CONFIG } from './constants';
+import { DEFAULT_RETRY_CONFIG, TAG_VERIFY_OTP } from './constants';
 import type {
   ResendOTPConfigType,
   EmailAndPhoneResponse,
@@ -56,8 +56,14 @@ export const generateOTP = async (
       isCustomConfig ? props.otpGeneration : undefined
     );
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `generateOTP:apiData : ${JSON.stringify(apiData)}`);
+
+
     const apiResponse = await getAxiosApiResponse(apiData);
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `generateOTP:apiResponse : ${JSON.stringify(apiResponse)}`);
+
+
     if (isCustomConfig && apiData.responseJsonLogic) {
       return jsonLogic.apply(
         <jsonLogic.RulesLogic>apiData.responseJsonLogic,
@@ -72,7 +78,10 @@ export const generateOTP = async (
       error.message,
       LOG_TYPE.SDK_ERROR
     );
-    console.error('error: ', JSON.stringify(error));
+
+    Logger.getInstance().log(TAG_VERIFY_OTP, `generateOTP:catch : ${error.message}`);
+
+    console.error('error: ', error.message);
     return error?.response?.data ?? false;
   }
 };
@@ -94,8 +103,12 @@ export const verifyOTP = async (
       isCustomConfig ? props.validationApi : undefined
     );
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `verifyOTP:apiData : ${JSON.stringify(apiData)}`);
+
     const apiResponse = await getAxiosApiResponse(apiData);
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `verifyOTP:apiResponse : ${JSON.stringify(apiResponse)}`);
+
     if (isCustomConfig && apiData.responseJsonLogic) {
       return jsonLogic.apply(
         <jsonLogic.RulesLogic>apiData.responseJsonLogic,
@@ -110,7 +123,8 @@ export const verifyOTP = async (
       error.message,
       LOG_TYPE.SDK_ERROR
     );
-    console.error('error: ', JSON.stringify(error));
+    console.error('error: ', error.message);
+    Logger.getInstance().log(TAG_VERIFY_OTP, `verifyOTP:catch : ${error.message}`);
     return error?.response?.data ?? false;
   }
 };
@@ -132,8 +146,13 @@ export const resendOTP = async (
       isCustomConfig ? props.resendApi : undefined
     );
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `resendOTP:apiData : ${JSON.stringify(apiData)}`);
+
     const apiResponse = await getAxiosApiResponse(apiData);
 
+    Logger.getInstance().log(TAG_VERIFY_OTP, `resendOTP:apiResponse : ${JSON.stringify(apiResponse)}`);
+
+
     if (isCustomConfig && apiData.responseJsonLogic) {
       return jsonLogic.apply(
         <jsonLogic.RulesLogic>apiData.responseJsonLogic,
@@ -141,6 +160,8 @@ export const resendOTP = async (
       );
     }
 
+    
+
     return apiResponse.data;
   } catch (error: any) {
     Logger.getInstance().logEvent(
@@ -148,7 +169,8 @@ export const resendOTP = async (
       error.message,
       LOG_TYPE.SDK_ERROR
     );
-    console.error('error: ', JSON.stringify(error));
+    Logger.getInstance().log(TAG_VERIFY_OTP, `resendOTP:catch : ${error.message}`);
+    console.error('error: ', error.message);
     return error?.response?.data ?? false;
   }
 };

package/src/manager/dispatch/DispatchStateContainer.tsx

@@ -32,7 +32,7 @@ import { RouteParams } from '../../ui/uiConfig/RouteParams';
 import { debounce } from 'lodash';
 import dispatchEvent from '../../events/EventDispatcher';
 import EventCodeContainer from '../dispatchCodes/EventCodeContainer';
-import { GO_BACK_EVENT_CODE, REASON_NOT_USED } from '../../constants/constants';
+import { GO_BACK_EVENT_CODE, REASON_NOT_USED, RETRY_LIMIT_REACHED_CODE } from '../../constants/constants';
 import AppSyncManager from '../syncmanager/AppSyncManager';
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 
@@ -555,6 +555,8 @@ export default class DispatchStateContainer {
             navigation.replace(CustomScreens.REMARK_SCREEN, rParams);
           } else {
             if (_eventCode === GO_BACK_EVENT_CODE) failureCodes = [];
+            else if (etOutput.reasonCode === RETRY_LIMIT_REACHED_CODE)
+              failureCodes = [];
             else
               failureCodes = await reasonsContainer.getReasonCodes(
                 route.params[RouteParams.NEXT_STATES].input.applicableReasons

package/src/manager/dispatchCodes/ReasonCodeContainer.ts

@@ -105,7 +105,7 @@ export default class ReasonCodeContainer {
       } catch (error: any) {
         Logger.getInstance().logEvent(
           'fetchReasonCode',
-          JSON.stringify(error),
+          error.message,
           LOG_TYPE.SDK_ERROR
         );
         throw new BaseError(ErrorCodes.REASON_CODE_API_ERROR, error.message);

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

@@ -638,11 +638,10 @@ export default class ETEventsManager {
   async getRowToSync(id: string, dispatchId: string): Promise<EventRow[]> {
     const sqlResult = await Database.executeQuery(
       `SELECT * from ${EVENTS_TABLE}\
-            WHERE ${EVENTS_COLUMNS.ID} = ? and \
-            ${EVENTS_COLUMNS.DISPATCH_ID} = ? and \
+            WHERE ${EVENTS_COLUMNS.DISPATCH_ID} = ? and \
             ${EVENTS_COLUMNS.SYNCED} = 0 \
             ORDER BY ${EVENTS_COLUMNS.ID} ASC;`,
-      [id, dispatchId]
+      [dispatchId]
     );
     return sqlResult.rows._array;
   }
@@ -654,11 +653,11 @@ export default class ETEventsManager {
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
             FROM ${EVENTS_TABLE} \
-              WHERE id <= t.id and ${EVENTS_COLUMNS.ID} > ${id} and ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 \
+              WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 \
               ) total \
               FROM ${EVENTS_TABLE} t \
               ) q \
-              WHERE total <= ${BULK_DATA_LIMIT} \
+              WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
       const sqlResult = await Database.executeQuery(query, []);
@@ -668,11 +667,11 @@ export default class ETEventsManager {
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
             FROM ${EVENTS_TABLE} \
-              WHERE id <= t.id and ${EVENTS_COLUMNS.ID} > ${id} and ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and ${EVENTS_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} \
+              WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and ${EVENTS_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} \
               ) total \
               FROM ${EVENTS_TABLE} t \
               ) q \
-              WHERE total <= ${BULK_DATA_LIMIT} \
+              WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and ${EVENTS_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
       const sqlResult = await Database.executeQuery(query, []);

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

@@ -289,6 +289,7 @@ export default class EventsSyncManager {
     if (!this.eventsManager)
       this.eventsManager = await ETEventsManager.getInstance();
     this._retries = 0;
+    this.inProgress = false;
     await this.startSync();
   }
 

package/src/ui/screens/DropCashScreen.tsx

@@ -59,7 +59,7 @@ const DropCashScreen = ({
   useEffect(() => {
     (async () => {
       //fire sentry event
-      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.RETURN_CASH_ET_OPENED, screenName:ScreenNameSdkConstants.RETURN_CASH_ET_SCREEN});
+      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.RETURN_CASH_ET_OPENED, screenName: ScreenNameSdkConstants.RETURN_CASH_ET_SCREEN });
       //      
       onTaskStart(
         nextState,
@@ -72,8 +72,8 @@ const DropCashScreen = ({
 
   useEffect(() => {
     (async () => {
-      console.log("expectedAmount:",expectedAmount);
-      if(expectedAmount.value === 0){
+      console.log("expectedAmount:", expectedAmount);
+      if (expectedAmount.value === 0) {
         // setLoading(true);
         let dropCashETOutput = {
           amount: {
@@ -103,17 +103,16 @@ const DropCashScreen = ({
           });
         }
         // setLoading(false);
-    }
+      }
     })();
   }, [expectedAmount.value])
 
 
 
   const getTotalExpected = async () => {
-    const totalAmount: number = await DispatchExecutor.getTotalAmountMWI(
-      mergedObjectiveId
-    );
-    setExpectedAmount({ ...expectedAmount, value: totalAmount });
+    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) });
   };
 
   const getSelfLoopBool = async () => {
@@ -144,30 +143,30 @@ const DropCashScreen = ({
     },
     [baseETProps, navigation, route]
   );
-  
+
   return (
     <View style={{ flex: 1 }}>
-      { expectedAmount.value === 0 ? <View><ProgressDialog visible={loading} label={'Please wait...'} /></View> : 
-      <SLDropCash
-        {...input}
-        expectedAmount={expectedAmount}
-        isSelfLoop={isSelfLoopTrue}
-        navigation={navigation}
-        mergedObjectiveId={mergedObjectiveId}
-        taskMeta={taskMeta}
-        onSubmitET={async (etOutput) => {
-          if (etOutput.success || etOutput.eventCode == GO_BACK_EVENT_CODE) {
-            await submitOutput(etOutput);
-          } else {
-            setResponse((_prevState: any) => {
-              setShowAlert(true);
-              return etOutput;
-            });
-          }
-        }}
-      />
+      {expectedAmount.value === 0 ? <View><ProgressDialog visible={loading} label={'Please wait...'} /></View> :
+        <SLDropCash
+          {...input}
+          expectedAmount={expectedAmount}
+          isSelfLoop={isSelfLoopTrue}
+          navigation={navigation}
+          mergedObjectiveId={mergedObjectiveId}
+          taskMeta={taskMeta}
+          onSubmitET={async (etOutput) => {
+            if (etOutput.success || etOutput.eventCode == GO_BACK_EVENT_CODE) {
+              await submitOutput(etOutput);
+            } else {
+              setResponse((_prevState: any) => {
+                setShowAlert(true);
+                return etOutput;
+              });
+            }
+          }}
+        />
       }
-      
+
       <CancelOrderDialog
         visible={showAlert}
         onSubmit={async (value) => {

package/src/utils/ExecTaskUtils.ts

@@ -118,6 +118,8 @@ export function getEntityCodeByET(etId: string): string {
       return EntityCode.PROCESS_PAYMENT;
     case ExecutionTaskID.COMPLETE_PAYMENT:
       return EntityCode.COMPLETE_PAYMENT;
+    case ExecutionTaskID.COLLECT_PAYMENT_ET:
+      return EntityCode.COLLECT_PAYMENT_ET;
     case ExecutionTaskID.DELIVER_CASH:
       return EntityCode.DELIVER_CASH;
     case ExecutionTaskID.VERIFY_INPUT:

package/src/utils/Logger.ts

@@ -1,5 +1,8 @@
+import { CoralogixRum } from '@coralogix/react-native-sdk';
 import type { DispatchSDKConfig } from '../models/sdk';
 import crashlytics from '@react-native-firebase/crashlytics';
+import { CoralogixLogSeverity } from '@coralogix/react-native-sdk/src/types-external';
+import SdkUtils from './SdkUtils';
 
 export const enum LOG_TYPE {
   SDK_ERROR = 'sdk_error',
@@ -39,8 +42,23 @@ class Logger {
     ) {
       crashlytics().recordError(new Error(message), TAG);
     }
+
   }
 
+  async log(Tag: string, msg: string) {
+    try {
+      let result = await SdkUtils.getRemoteConfig(0);
+      if (result?.enableLogging?._value && result?.enableLogging?._value === "true") {
+        console.log("====================================");
+        console.log("Logging to Coralogix: ",Tag,msg);
+        console.log("====================================");
+        CoralogixRum.log(CoralogixLogSeverity.Info, Tag, msg);
+      }
+    } catch (error:any) {
+      this.logEvent("DispatchSDK:RemoteConfigError:", error.message, LOG_TYPE.SDK_ERROR);
+      return;
+    }
+  }
 
   public static getInstance(): Logger {
     if (!Logger.instance) {

package/src/utils/SdkUtils.ts

@@ -43,6 +43,9 @@ export default class SdkUtils {
             isMandatoryUpdateiOS: 'false',
             toggleInAppUpdateiOS: 'false',
             toggleInAppUpdate: 'false',
+            enableLogging: 'true',
+            enableLoggingTenantIds: '',
+            enableLoggingUserIds: '',
           })
           .then(() => remoteConfig().fetchAndActivate())
           .then((fetchedRemotely) => {