@os1-platform/dispatch-mobile 2.1.1 → 2.1.3

package/src/components/executiontasks/deliver/SLDeliverET.tsx

@@ -52,10 +52,14 @@ export const renderItem = ({ item }: { item: LineItem }) => (
 
 const getMessage = (
   returnPackageCount: number | undefined,
-  message: string | undefined
+  message: string | undefined,
+  title: string | undefined
 ) => {
   try {
-    const msg = message || getStrVal(Str.DEFAULT_DELIVER_MESSAGE, Str.count, returnPackageCount && returnPackageCount >= 1 ? returnPackageCount : '');
+    const isReturnOrder = title?.toString()?.toLowerCase()?.includes("return");
+    //message ||
+    //Str.DEFAULT_DELIVER_MESSAGE
+    const msg = getStrVal(isReturnOrder ? Str.DEFAULT_RETURN_MESSAGE : Str.DEFAULT_DELIVER_MESSAGE, Str.count, returnPackageCount && returnPackageCount >= 1 ? returnPackageCount : '');
     return msg;
   } catch (error: any) {
     return message || '';
@@ -361,11 +365,14 @@ const DeliverET = (props: DeliverETInput) => {
                     {props.title || DEFAULT_DELIVER_TITLE}
                   </Text>
                   <Text style={DeliverPickupStyles.messageText}>
-                    {getMessage(props.returnPackageCount, props.message)}
+                    {getMessage(props.returnPackageCount, props.message, props.title)}
                   </Text>
-                  <Text style={DeliverPickupStyles.messageText}>
+                  {/* {(props.title?.trim?.toString()?.toLowerCase()?.includes("return")) && <Text style={DeliverPickupStyles.messageText}>
+                    {getStrVal(Str.DEFAULT_DELIVER_MESSAGE, Str.count, props.returnPackageCount && props.returnPackageCount >= 1 ? props.returnPackageCount : '')}
+                  </Text>} */}
+                  {(props.title?.toString()?.toLowerCase()?.includes("return")) == false && <Text style={DeliverPickupStyles.messageText}>
                     {props?.shipCount ? getStrVal(Str.shipments, Str.count, props.shipCount) : ''}
-                  </Text>
+                  </Text>}
 
                   {/* Removed showing the item when item.length === 1 */}
                   {/* {props.returnPackageCount === 1 && props.items.length ? (
@@ -405,7 +412,7 @@ const DeliverET = (props: DeliverETInput) => {
                     Confirm
                   </Button>
                   {props.restrictCancel === true ? null : (
-                    <Button
+                    (props.isSelfLoop == false) && <Button
                       labelStyle={CommonStyles.cancelButtonLabel}
                       style={[CommonStyles.cancelButton, { marginTop: 10 }]}
                       mode={'outlined'}

package/src/components/executiontasks/doodle/SignatureET.tsx

@@ -8,7 +8,7 @@ import {
   View,
 } from 'react-native';
 import type { SignatureInput } from './SignatureSchema';
-import { Button, Modal, Portal, Provider } from 'react-native-paper';
+import { Button, Provider } from 'react-native-paper';
 import { getBaseETResponse } from '../../../utils/ExecTaskUtils';
 import { getEventCodeByET } from '../../../manager/dispatchCodes/EventCodeContainer';
 import {
@@ -32,12 +32,15 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
 import { hasGoBackConnector } from '../../../components/utils';
 import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
+import { getStr } from '../../../locale/util';
+import Str from '../../../locale/Str';
 
 const SignatureET = (props: SignatureInput) => {
   const signatureViewRef = useRef<any>();
   const [dragged, setDragged] = useState(0);
   const dragRef = useRef<number>(0);
   const [showBackModal, setShowBackModal] = useState(false);
+  const [buttonProceed, setButtonProceed] = useState(false);
 
   // Handle back-button click when scanList was being viewed
   useFocusEffect(
@@ -62,28 +65,24 @@ const SignatureET = (props: SignatureInput) => {
 
   useLayoutEffect(() => {
     props.navigation.setOptions({
-      title: props.title,
-      headerLeft: () => {
-        return (
+      headerTitle: () => (
+        <View style={{ flexDirection: 'row', alignItems: 'center', marginRight: "50%" }}>
           <Icon
             onPress={() => {
-              if (
-                props.taskMeta?.enableGoBack &&
-                hasGoBackConnector(props.applicableReasons)
-              )
+              if (props.taskMeta?.enableGoBack && props.applicableReasons) {
                 setShowBackModal(true);
-              else props.navigation.goBack();
+              } else {
+                props.navigation.goBack();
+              }
             }}
             name="arrow-back"
-            color={'black'}
-            size={25}
-            style={{
-              paddingRight: 15,
-              paddingTop: 5,
-            }}
+            color="black"
+            size={22}
+            style={{ paddingRight: 6 }}
           />
-        );
-      },
+          <Text style={{ fontSize: 16, fontFamily: Fonts.IBMPlexSans_500Medium, lineHeight: 24 }}>{props.title}</Text>
+        </View>
+      ),
     });
   }, [props.navigation, props.title]);
 
@@ -176,9 +175,11 @@ const SignatureET = (props: SignatureInput) => {
       {renderModal()}
       <View style={styles.mainContainer}>
         <View style={styles.doodleView}>
-          <Text style={styles.messageText}>
-            {props.message || DEFAULT_SIGN_ET_MESSAGE}
-          </Text>
+          <View style={{ paddingVertical: 20, marginTop: 20, backgroundColor: "#FFF" }}>
+            <Text style={styles.messageText}>
+              {props.message || DEFAULT_SIGN_ET_MESSAGE}
+            </Text>
+          </View>
           <View style={styles.horizontalLine} />
           <View>
             {/* <Text style={styles.messageText2}>{'Received by'}</Text> */}
@@ -192,10 +193,10 @@ const SignatureET = (props: SignatureInput) => {
                 signatureViewRef.current?.resetImage();
               }}
             >
-              <Text style={styles.clearBtn}>{'Clear'}</Text>
+              <Text style={styles.clearBtn}>{''}</Text>
             </TouchableOpacity>
           </View>
-          <View style={{ flex: 1 }}>
+          <View style={{ height: 470, width: 310, borderWidth: 1, borderColor: "#E0E3EB", alignSelf: "center", borderRadius: 10, overflow: 'hidden' }}>
             <SignatureCapture
               ref={signatureViewRef}
               rotateClockwise={false}
@@ -231,8 +232,10 @@ const SignatureET = (props: SignatureInput) => {
               onDragEvent={(drag) => {
                 if (drag.dragged) {
                   if (Platform.OS === 'android') {
+                    setButtonProceed(true)
                     setDragged((prevState) => prevState + 1);
                   } else {
+                    setButtonProceed(true)
                     dragRef.current = dragRef.current + 1;
                   }
                 }
@@ -240,20 +243,27 @@ const SignatureET = (props: SignatureInput) => {
             />
           </View>
         </View>
+        <View style={{ backgroundColor: '#DDDDDD', width: '100%', height: 1 }} />
         <View style={styles.bottomButtons}>
-          <Button
-            style={[CommonStyles.cancelButton, { flex: 1, marginEnd: 5 }]}
+          {(props.isSelfLoop == false) && <Button
+            style={[CommonStyles.cancelButton, { flex: 1, marginEnd: 7 }]}
             labelStyle={CommonStyles.cancelButtonLabel}
             mode={'outlined'}
             onPress={async () => {
               await saveAndSubmit(true, '');
-            }}
-          >
-            Skip
+            }}>{getStr(Str.skip)}
           </Button>
+          }
           <Button
-            labelStyle={CommonStyles.nextButtonLabel}
-            style={[CommonStyles.nextButton, { flex: 1, marginStart: 5 }]}
+            labelStyle={{
+              color: buttonProceed ? "#ffff" : "#A3AAC2",
+              fontFamily: Fonts.IBMPlexSans_500Medium,
+              fontSize: 14,
+              lineHeight: 20,
+              textAlign: 'center',
+              textTransform: 'capitalize'
+            }}
+            style={[CommonStyles.nextButton, { flex: 1, marginStart: 8, backgroundColor: buttonProceed ? "#5B80F7" : "#E0E3EB" }]}
             mode={'contained'}
             onPress={async () => signatureViewRef.current?.saveImage()}
           >
@@ -266,26 +276,23 @@ const SignatureET = (props: SignatureInput) => {
 };
 const styles = StyleSheet.create({
   horizontalLine: {
-    backgroundColor: '#DDDDDD',
-    width: '100%',
-    height: 1,
     marginTop: 13,
-    marginBottom: 15,
   },
   doodleView: {
     flex: 1,
-    padding: 20,
+    // padding: 20,
   },
   mainContainer: {
     flex: 1,
-    backgroundColor: '#ffffff',
+    backgroundColor: '#F9F9F9',
   },
   bottomButtons: {
     justifyContent: 'flex-end',
-    marginBottom: 10,
     flexDirection: 'row',
-    marginStart: 10,
-    marginEnd: 10,
+    marginStart: 14,
+    marginEnd: 14,
+    backgroundColor: "white",
+    paddingVertical: 12,
   },
   clearBtn: {
     color: SdkColors[ColorTheme.LIGHT].primaryButton,
@@ -300,11 +307,9 @@ const styles = StyleSheet.create({
   messageText: {
     fontSize: 16,
     lineHeight: 20,
-    color: '#474A57',
-    fontFamily:
-      Platform.OS === 'android'
-        ? Fonts.IBMPlexSans_400Regular
-        : 'IBMPlexSans-Regular',
+    color: '#111',
+    fontFamily: Platform.OS === 'android' ? Fonts.IBMPlexSans_400Regular : 'IBMPlexSans-Regular',
+    marginStart: 20
   },
   messageText2: {
     flex: 1,

package/src/components/executiontasks/doodle/SignatureSchema.ts

@@ -28,6 +28,7 @@ export type SignatureInput = BaseETRequest & {
   resolution: Dimension;
   fileSizeLimit: MaxFileSize;
   penColor?: PenColor;
+  isSelfLoop: boolean;
   onSubmitET: (value: SignatureOutput) => void;
 } & {
   jobIDs: string[];

package/src/components/executiontasks/dropCash/DropCashSchema.ts

@@ -10,6 +10,7 @@ import type { ETAmount } from '../payments/init/InitPaymentSchema';
 export type DropCashInput = BaseETRequest & {
   expectedAmount: ETAmount;
   confirmAmount?: boolean;
+  isSelfLoop: boolean;
   onSubmitET: (etOutput: DropCashOutput) => void;
   confirmCustodyExchange?: boolean;
 };

package/src/components/executiontasks/dropCash/SLDropCash.tsx

@@ -27,9 +27,9 @@ const SLDropCash = (props: DropCashInput) => {
     props.confirmAmount
       ? ''
       : `${getPaymentValue(
-          props.expectedAmount.value,
-          props.expectedAmount.minorUnit
-        )}`
+        props.expectedAmount.value,
+        props.expectedAmount.minorUnit
+      )}`
   );
   const [inputError, setInputError] = useState('');
 
@@ -250,7 +250,7 @@ const SLDropCash = (props: DropCashInput) => {
               >
                 Confirm
               </Button>
-              {!props.confirmCustodyExchange && (
+              {!props.confirmCustodyExchange && (props.isSelfLoop == false) && (
                 <Button
                   labelStyle={CommonStyles.cancelButtonLabel}
                   style={[CommonStyles.cancelButton, { marginTop: 10 }]}

package/src/components/executiontasks/forms/FormGenerator.tsx

@@ -1,4 +1,4 @@
-import React, { useRef, useState, useLayoutEffect } from 'react';
+import React, { useRef, useState, useLayoutEffect, useEffect } from 'react';
 import {
   BackHandler,
   KeyboardAvoidingView,
@@ -212,7 +212,7 @@ const FormGenerator = (props: FormInputSchema) => {
                   }
                 }}
               >
-                <Text>{}</Text>
+                <Text>{ }</Text>
               </ReactNativeForm>
             </FormContext.Provider>
           </View>
@@ -235,7 +235,7 @@ const FormGenerator = (props: FormInputSchema) => {
             </Button>
           </View>
           <View>
-            <Button
+            {(props.isSelfLoop == false) && <Button
               style={[CommonStyles.cancelButton, { width: 165, marginEnd: 10 }]}
               labelStyle={CommonStyles.cancelButtonLabel}
               mode={'outlined'}
@@ -249,6 +249,7 @@ const FormGenerator = (props: FormInputSchema) => {
             >
               Cancel
             </Button>
+            }
           </View>
         </View>
       </KeyboardAvoidingView>

package/src/components/executiontasks/forms/FormSchema.ts

@@ -6,6 +6,7 @@ import type {
 export type FormInputSchema = BaseETRequest & {
   jsonSchema: JSONSchema;
   uiSchema: UISchame;
+  isSelfLoop: boolean;
   onError: (e: any) => void;
   onSubmitET: (result: FormOutputSchema) => void;
 };

package/src/components/executiontasks/imageCapture/CaptureSchema.ts

@@ -73,6 +73,7 @@ export interface AdditionalMultiConfig {
 }
 
 export type CaptureInput = BaseETRequest & {
+  isSelfLoop: boolean;
   resolution: Resolution;
   fileSizeLimit: MaxFileSize;
   captureMode: CaptureMode;

package/src/components/executiontasks/imageCapture/CaptureUtils.ts

@@ -22,18 +22,13 @@ import { BaseError } from '../../../errors/BaseError';
 import BaseErrorCodes from '../../../errors/ErrorCodes';
 import DispatchSdkCache from '../../../manager/sdk/DispatchSdkCache';
 import { insertDocumentInDB } from '../../../utils/SyncManagerUtils';
-
 import {CameraOptions, launchCamera} from 'react-native-image-picker';
-import { useState } from 'react';
 
-export async function deleteImage(
-  imageData: ImageData,
-  images: ImageData[]
-): Promise<ImageData[]> {
+export async function deleteImage(imageData: { path: string; id: { toString: () => string; }; }, images: any[]) {
   await FileSystem.deleteAsync(imageData.path);
-  let filtered = images.filter((img) => {
-    return img.id !== imageData.id;
-  });
+  let filtered = images.filter(ele=>ele).filter(img => img.id.toString().toLowerCase() !== imageData.id.toString().toLowerCase()
+  );
+  console.log("filtered",filtered);
   return filtered;
 }