@os1-platform/dispatch-mobile 2.1.24 → 2.1.26

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/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) {