TP-38288 | UAT Fixes + Version Bump

android/app/build.gradle

@@ -131,8 +131,8 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-def VERSION_CODE = 94
-def VERSION_NAME = "2.4.10"
+def VERSION_CODE = 97
+def VERSION_NAME = "2.5.2"
 
 android {
     ndkVersion rootProject.ext.ndkVersion

package.json

@@ -1,6 +1,6 @@
 {
   "name": "AV_APP",
-  "version": "2.4.10",
+  "version": "2.5.2",
   "private": true,
   "scripts": {
     "android:dev": "yarn move:dev && react-native run-android",

src/screens/Dashboard/DashBoardScreens.tsx

@@ -28,7 +28,15 @@ function DashBoardScreens() {
           animationDuration: SCREEN_ANIMATION_DURATION,
         }}
       />
-      <Stack.Screen name={PageRouteEnum.CASH_COLLECTED} component={CashCollected} />
+      <Stack.Screen
+        name={PageRouteEnum.CASH_COLLECTED}
+        component={CashCollected}
+        options={{
+          header: () => null,
+          animationDuration: SCREEN_ANIMATION_DURATION,
+          animation: Animation.SLIDE_FROM_RIGHT,
+        }}
+      />
       <Stack.Screen
         name={PageRouteEnum.FILTERED_CASES}
         component={FilteredCases}

src/screens/Dashboard/PerformanceItem.tsx

@@ -28,6 +28,7 @@ const PerformanceItem = (props: PerformanceItemProps) => {
         GenericStyles.spaceBetween,
         styles.performanceContainer,
       ]}
+      hitSlop={{ left: 16, right: 16 }}
       onPress={handlePress}
     >
       <View style={[GenericStyles.row, GenericStyles.alignCenter]}>

src/screens/Dashboard/PerformanceOverview.tsx

@@ -60,7 +60,10 @@ const PerformanceOverview = (props: PerformanceOverviewProps) => {
             rightSideView={
               <View style={[GenericStyles.row, GenericStyles.alignCenter]}>
                 <Text style={[GenericStyles.fontSize16, styles.fw700, styles.leftContent]}>
-                  {performanceOverviewData?.suspiciousFeedback?.toFixed(1)}%
+                  {performanceOverviewData?.suspiciousFeedback
+                    ? performanceOverviewData?.suspiciousFeedback?.toFixed(1)
+                    : performanceOverviewData?.suspiciousFeedback}
+                  %
                 </Text>
               </View>
             }

src/screens/Dashboard/constants.ts

@@ -18,7 +18,7 @@ export const PerformanceCardDetails = {
   brokenPtp: 'broken PTPs',
   suspicious: 'suspicious',
   genuine: 'genuine',
-  feedbacks: 'feedbacks',
+  feedbacks: 'feedbacks today',
   ptps: 'PTPs',
   paid: 'paid',
 };

src/screens/allCases/CasesList.tsx

@@ -101,9 +101,6 @@ const CasesList: React.FC<ICasesList> = ({
     showAgentSelectionBottomSheet: state.reportees.showAgentSelectionBottomSheet,
   }));
 
-  const { showToast = false, caseType = '' } =
-    useAppSelector((state: RootState) => state.allCases?.filteredListToast) || {};
-
   const [showFilterModal, setShowFilterModal] = React.useState<boolean>(false);
   const flashListRef = useRef<GenericType>(null);
   const scrollAnimation = useRef(new Animated.Value(0)).current;
@@ -245,23 +242,6 @@ const CasesList: React.FC<ICasesList> = ({
     intermediateTodoListMap,
   ]);
 
-  useEffect(() => {
-    if (showToast) {
-      const filteredCasesCount = filteredCasesList.length;
-      toast({
-        type: 'info',
-        text1: `${filteredCasesCount} ${caseType} case(s) have been filtered`,
-        visibilityTime: 3000,
-      });
-      dispatch(
-        setFilteredListToast({
-          showToast: false,
-          caseType,
-        })
-      );
-    }
-  }, [filteredCasesList]);
-
   const handleSearchChange = useCallback(
     debounce((query: string) => {
       setSearchQuery(query);

src/screens/cashCollected/CashCollectedItem.tsx

@@ -43,13 +43,15 @@ const CashCollectedItem = (props: CashCollectedItemProps) => {
     >
       <View style={[GenericStyles.row, GenericStyles.alignCenter, styles.flexBasis96]}>
         <CaseItemAvatar caseDetailObj={caseItemAvatarCaseDetailObj} shouldBatchAvatar={false} />
-        <View style={GenericStyles.pl12}>
-          <Text style={styles.textHeading}>{sanitizeString(customerName)}</Text>
-          <Text style={styles.subText}>
-            Collected : <Text>{formatAmount(Number(amountCollected?.toFixed(2)), false)}</Text>
+        <View style={[GenericStyles.pl12, GenericStyles.fill]}>
+          <Text style={styles.textHeading} numberOfLines={1}>
+            {sanitizeString(customerName)}
           </Text>
           <Text style={styles.subText}>
-            Current outstanding :{' '}
+            Collected: <Text>{formatAmount(Number(amountCollected?.toFixed(2)), false)}</Text>
+          </Text>
+          <Text style={styles.subText}>
+            Current outstanding:{' '}
             <Text style={totalOverdueAmount > 0 ? styles.red : styles.overdueAmountColor}>
               {formatAmount(totalOverdueAmount, false)}
             </Text>

src/screens/cashCollected/index.tsx

@@ -100,6 +100,30 @@ const CashCollected = () => {
       </View>
     );
 
+  const listFooterComponent = () => {
+    if (data?.length) {
+      if (data.length < paginationDetails.totalElements) {
+        return (
+          <View
+            style={[GenericStyles.centerAlignedRow, GenericStyles.mb12, styles.loadingContainer]}
+          >
+            {isLoading ? <ActivityIndicator color={COLORS.BASE.BLUE} /> : null}
+          </View>
+        );
+      }
+
+      if (data.length === paginationDetails.totalElements) {
+        return (
+          <View style={[GenericStyles.centerAlignedRow, { marginTop: -6, marginBottom: 36 }]}>
+            <Text style={{ color: COLORS.TEXT.LIGHT }}>You have reached the end of the list</Text>
+          </View>
+        );
+      }
+    }
+
+    return null;
+  };
+
   return (
     <Layout>
       <SafeAreaView style={[GenericStyles.fill, styles.container]}>
@@ -117,19 +141,7 @@ const CashCollected = () => {
             )}
             onEndReached={fetchMoreData}
             onEndReachedThreshold={0.5}
-            ListFooterComponent={
-              data?.length && data.length < paginationDetails.totalElements ? (
-                <View
-                  style={[
-                    GenericStyles.centerAlignedRow,
-                    GenericStyles.mb12,
-                    styles.loadingContainer,
-                  ]}
-                >
-                  {isLoading ? <ActivityIndicator color={COLORS.BASE.BLUE} /> : null}
-                </View>
-              ) : null
-            }
+            ListFooterComponent={listFooterComponent()}
           />
         ) : (
           <View style={styles.centerAbsolute}>