@os1-platform/dispatch-mobile 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -132,8 +132,8 @@
   "peerDependencies": {
     "@apollo/client": "^3.5.6",
     "@expo-google-fonts/ibm-plex-sans": "*",
-    "@react-native-async-storage/async-storage": "^1.15.14",
-    "@react-native-community/datetimepicker": "^3.5.2",
+    "@react-native-async-storage/async-storage": ">=1.18.2",
+    "@react-native-community/datetimepicker": ">=7.2.0",
     "@react-native-community/netinfo": "^6.0.2",
     "@react-native-community/slider": "^4.1.7",
     "@react-native-firebase/analytics": "20.1.0",
@@ -167,7 +167,7 @@
     "react-native-vector-icons": "^9.0.0"
   },
   "dependencies": {
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.1.0",
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.1.1",
     "@rjsf/core": "^2.0.0",
     "apollo-link-timeout": "^4.0.0",
     "decompress": "^4.2.1",

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

@@ -262,9 +262,7 @@ const styles = StyleSheet.create({
   },
   mainBtnStyles: {
     display: 'flex',
-    flexDirection: 'row',
     justifyContent: 'center',
-    alignItems: 'center',
     flex: 1,
     borderRadius: 8,
     width: '100%',

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/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: