@os1-platform/dispatch-mobile 2.1.23 → 2.1.25

package/lib/typescript/components/executiontasks/collectPayment/CollectPaymentSchema.d.ts

@@ -51,6 +51,7 @@ export interface QrResponse {
         txnId?: string;
         paymentCompleted?: boolean;
         status?: STATUS;
+        expiresIn?: number;
     };
 }
 export interface QR_REQUEST_BODY {

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

@@ -89,4 +89,24 @@ export declare const PaymentStyles: {
         justifyContent: "center";
         alignItems: "center";
     };
+    qrImage: {
+        width: number;
+        height: number;
+        backgroundColor: string;
+    };
+    overlay: {
+        position: "absolute";
+        width: string;
+        height: string;
+        justifyContent: "center";
+        alignItems: "center";
+        backgroundColor: string;
+    };
+    snackBarContainer: {
+        position: "absolute";
+        alignSelf: "center";
+        bottom: number;
+        width: string;
+        borderRadius: number;
+    };
 };

package/lib/typescript/components/executiontasks/collectPayment/PaymentUtils.d.ts

@@ -14,3 +14,4 @@ export declare function getSharedPrefPaymentSelection(refId: string, storage: St
 export declare function setSharedPrefPaymentSelection(refId: string, mode: AllowedModes, storage: Storage): Promise<void>;
 export declare function removeSharedPrefPaymentData(refId: string, storage: Storage): Promise<void>;
 export declare const formatTime: (time: number) => string;
+export declare const formatExpiryTime: (timeInSeconds: number) => string;

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

@@ -18,7 +18,8 @@ export interface SnackbarProps {
 export declare enum SnackBarType {
     SUCCESS = 0,
     FAILURE = 1,
-    WARNING = 2
+    WARNING = 2,
+    PAYMENT_WARNING = 3
 }
 declare const _default: React.ComponentType<Pick<SnackbarProps, "visible" | "message" | "type" | "onDismiss" | "duration" | "customBottom" | "customTop"> & {
     theme?: import("@callstack/react-theme-provider").$DeepPartial<ReactNativePaper.Theme> | undefined;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -259,7 +259,7 @@
     ]
   },
   "dependencies": {
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.15",
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.16",
     "@rjsf/core": "^2.0.0",
     "apollo-link-timeout": "^4.0.0",
     "decompress": "^4.2.1",
@@ -277,4 +277,4 @@
     "rjsf-native": "^1.0.14",
     "toggle-switch-react-native": "^3.3.0"
   }
-}
+}

package/src/analytics/firebase/FirebaseLogging.ts

@@ -1,29 +1,20 @@
 import analytics from '@react-native-firebase/analytics';
-import {
-  createObjectWithoutNullValues,
-  flattenObject,
-} from '../../utils/utils';
 import { Event } from '@sentry/types';
 import { SentryEventNameSdkConstants } from '../sentry/SentrySdkConstants';
-import crashlytics from '@react-native-firebase/crashlytics';
-import Logger, { LOG_TYPE } from '../../utils/Logger';
 
 export async function fireFirebaseEvent(eventName: string, data: Event) {
   let strEventVal = eventName;
-  console.log('fireFirebaseEvent:eventName', eventName);
-  console.log('fireFirebaseEvent:data', data.extra);
   try {
     if (
       eventName === SentryEventNameSdkConstants.API_CALL ||
-      eventName === SentryEventNameSdkConstants.API_RESPONSE || 
+      eventName === SentryEventNameSdkConstants.API_RESPONSE ||
       eventName === SentryEventNameSdkConstants.API_ERROR ||
       eventName === SentryEventNameSdkConstants.APP_LOG
     ) {
-      if(data?.extra){
+      if (data?.extra) {
         strEventVal = JSON.stringify(data?.extra);
       }
     }
-    console.log('fireFirebaseEvent:strEventVal', strEventVal);
     analytics().logEvent(eventName, { eventNameData: strEventVal });
   } catch (error: any) {
     analytics().logEvent(eventName, { eventNameData: 'fireFirebaseEvent error' });

package/src/analytics/sentry/SentryAnalyticsUtils.ts

@@ -10,13 +10,6 @@ export async function fireEventWithScreenName({ severityLevel, eventName, cta =
 
   //ignoring the button clicked event for now
   if (eventName === SentryEventNameSdkConstants.BUTTON_CLICKED) return;
-
-  console.log("sentry::fireEventWithScreenName()", " called")
-  console.log("sentry::fireEventWithScreenName::severityLevel", severityLevel)
-  console.log("sentry::fireEventWithScreenName::eventName", eventName)
-  console.log("sentry::fireEventWithScreenName::cta", cta)
-  console.log("sentry::fireEventWithScreenName::screenName", screenName)
-  console.log("sentry::fireEventWithScreenName::extraParams", JSON.stringify(extraParams))
   // 
   const singletonInstance = SentryAnalyticsSingleton.getInstance();
   const tenantId = singletonInstance.getDispatchAndUserData()?.tenantId ?? "N/A"

package/src/components/executiontasks/collectPayment/CollectPaymentSchema.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import {
   BaseETRequest,
   BaseETResponse,
@@ -69,6 +70,7 @@ export interface QrResponse {
     txnId?: string;
     paymentCompleted?: boolean;
     status?: STATUS;
+    expiresIn?: number;
   };
 }
 

package/src/components/executiontasks/collectPayment/PaymentStyles.ts

@@ -11,14 +11,16 @@ export const PaymentStyles = StyleSheet.create({
     alignItems: 'center',
     paddingTop: 25,
     paddingBottom: 25,
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_600SemiBold
-    : 'IBMPlexSans-SemiBold',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_600SemiBold
+        : 'IBMPlexSans-SemiBold',
   },
   messageStyle: {
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_400Regular
-    : 'IBMPlexSans-Regular',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_400Regular
+        : 'IBMPlexSans-Regular',
     backgroundColor: '#FFFFFF',
     color: '#111111',
     padding: 20,
@@ -27,9 +29,10 @@ export const PaymentStyles = StyleSheet.create({
     fontSize: 14,
   },
   textStyle1: {
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_400Regular
-    : 'IBMPlexSans-Regular',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_400Regular
+        : 'IBMPlexSans-Regular',
     marginTop: 20,
     marginStart: 20,
     marginEnd: 20,
@@ -41,9 +44,10 @@ export const PaymentStyles = StyleSheet.create({
   reasonTextStyle: {
     flex: 1,
     flexWrap: 'wrap',
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_400Regular
-    : 'IBMPlexSans-Regular',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_400Regular
+        : 'IBMPlexSans-Regular',
     fontStyle: 'normal',
     fontSize: 14,
     lineHeight: 21,
@@ -99,4 +103,25 @@ export const PaymentStyles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  // QR
+  qrImage: {
+    width: 300,
+    height: 300,
+    backgroundColor: 'transparent',
+  },
+  overlay: {
+    position: 'absolute',
+    width: '100%',
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'rgba(255, 255, 255, 0.5)', // Semi-transparent background
+  },
+  snackBarContainer: {
+    position: 'absolute',
+    alignSelf: 'center',
+    bottom: 0,
+    width: '95%',
+    borderRadius: 8,
+  },
 });

package/src/components/executiontasks/collectPayment/PaymentUtils.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import Logger, { LOG_TYPE } from '../../../utils/Logger';
 import { APIData, getApiResponse } from '../../../utils/ApiUtils';
 import * as jsonLogic from 'json-logic-js';
@@ -9,6 +10,8 @@ import {
 } from './CollectPaymentSchema';
 import Storage from '../../../utils/storage';
 import { ENV } from '../../../models/sdk';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { AppState, AppStateStatus } from 'react-native';
 
 export const PAYMENT_SHARED_PREF_KEY = '@Payment_';
 export const PAYMENT_SELECTION_SHARED_PREF_KEY = '@Payment_Selection_';
@@ -198,3 +201,17 @@ export const formatTime = (time: number) => {
     minutes > 0 ? String(minutes).padStart(2, '') + ' min' : ''
   } ${String(remainingSeconds).padStart(2, '')} sec`;
 };
+
+// Function to format the expiry time (without showing '0 sec' when it's unnecessary)
+export const formatExpiryTime = (timeInSeconds: number) => {
+  const minutes = Math.floor(timeInSeconds / 60);
+  const seconds = timeInSeconds % 60;
+
+  if (minutes > 0 && seconds > 0) {
+    return `${minutes} min ${seconds} sec`;
+  } else if (minutes > 0 && seconds === 0) {
+    return `${minutes} min`;
+  } else {
+    return `${seconds} sec`;
+  }
+};

package/src/components/executiontasks/collectPayment/components/CompletePayment.tsx

@@ -39,12 +39,11 @@ const CompletePayment = (props: CollectPaymentInput & CollectPaymentOutput) => {
   const [disableProceed, setDisableProceed] = useState(false);
   const [showModal, setShowModal] = useState<boolean>(true);
 
-  // TO hide header for modal screen
-  useLayoutEffect(() => {
-    props.navigation.setOptions({
-      headerShown: false,
-    });
-  }, [props.navigation]);
+  // useLayoutEffect(() => {
+  //   props.navigation.setOptions({
+  //     headerShown: false,
+  //   });
+  // }, [props.navigation]);
 
   // Handle back-button click
   useFocusEffect(
@@ -58,12 +57,12 @@ const CompletePayment = (props: CollectPaymentInput & CollectPaymentOutput) => {
     }, [])
   );
 
-  // useLayoutEffect(() => {
-  //   props.navigation.setOptions({
-  //     title: 'Payment Complete',
-  //     headerShown: false,
-  //   });
-  // }, [props.navigation, props.title]);
+  useLayoutEffect(() => {
+    props.navigation.setOptions({
+      title: 'Payment Complete',
+      headerShown: false, // To hide header for modal screen
+    });
+  }, [props.navigation, props.title]);
 
   useEffect(() => {
     if (props.success) {
@@ -254,9 +253,10 @@ const styles = StyleSheet.create({
     lineHeight: 28,
     textAlign: 'center',
     color: '#111111',
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_600SemiBold
-    : 'IBMPlexSans-SemiBold',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_600SemiBold
+        : 'IBMPlexSans-SemiBold',
   },
   message1: {
     fontStyle: 'normal',
@@ -266,8 +266,9 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     color: '#111111',
     marginTop: 12,
-    fontFamily: Platform.OS === 'android'
-    ? Fonts.IBMPlexSans_400Regular
-    : 'IBMPlexSans-Regular',
+    fontFamily:
+      Platform.OS === 'android'
+        ? Fonts.IBMPlexSans_400Regular
+        : 'IBMPlexSans-Regular',
   },
 });

package/src/components/executiontasks/collectPayment/components/InitPayment.tsx

@@ -455,10 +455,11 @@ const InitPayment = (props: CollectPaymentInput) => {
 
   const renderItem = ({ item }: { item: AllowedModes }) => {
     return (
-      <TouchableOpacity activeOpacity={1}
-      onPress={() => {
-        setPaymentMode(item);
-      }}
+      <TouchableOpacity
+        activeOpacity={1}
+        onPress={() => {
+          setPaymentMode(item);
+        }}
         style={[
           styles.reasonItemStyle,
           { marginBottom: 4, paddingVertical: 8 },