some bug fixed

src/components/JoinedGroupCard.tsx

@@ -29,12 +29,15 @@ interface JoinedGroupCardProps {
   hasPaid?: boolean;              // whether user has already paid
 }
 
-const formatDate = (dateArray: [number, number, number] | null): string => {
-  if (!dateArray) return 'N/A';
-  const date = new Date(dateArray[0], dateArray[1] - 1, dateArray[2]);
-  return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
+const formatDate = (dateStr: string | null): string => {
+  if (!dateStr) return 'N/A';
+
+  const [year, month, day] = dateStr.split('-');
+  return `${day}-${month}-${year}`;
 };
 
+
+
 const getStatusStyle = (status: JoinedGroup['status']) => {
   switch (status) {
     case 'ACTIVE':
@@ -67,6 +70,9 @@ export const JoinedGroupCard: FC<JoinedGroupCardProps> = ({ item, onViewPress, h
   const [loading, setLoading] = React.useState(false);
   const [payable, setPayable] = React.useState<any>();
 
+
+
+
   const onPayPress = async () => {
     // Navigate to payment screen or handle payment logic
     // navigation.navigate('PaymentScreen', { groupId: item.id, amount: item.contributionAmount });
@@ -126,18 +132,29 @@ export const JoinedGroupCard: FC<JoinedGroupCardProps> = ({ item, onViewPress, h
       {/* Footer with Dates & Buttons */}
       <View style={styles.footer}>
         <Text style={styles.dateText}>
-          {formatDate(item.startDate)} - {formatDate(item.endDate)}
+          {formatDate(item.startDate)} to {formatDate(item.endDate)}
         </Text>
         {/* Add Pay / Paid button here */}
-        {hasPaid ? (
+        {/* {hasPaid ? (
           <View style={styles.paidButton}>
             <Text style={styles.paidButtonText}>Paid</Text>
           </View>
         ) : (
+          
           <TouchableOpacity style={styles.payButton} onPress={onPayPress}>
-            <Text style={styles.payButtonText}>{loading ? 'Loading...' : 'Pay'}</Text>
+            <Text style={styles.payButtonText}>{loading ? 'Loading...' : ' Pay'}</Text>
           </TouchableOpacity>
-        )}
+        )} */}
+        {
+          hasPaid && <View style={styles.paidButton}>
+            <Text style={styles.paidButtonText}>Paid</Text>
+          </View>
+        }
+        {
+          item.status !== 'COMPLETED' && <TouchableOpacity style={styles.payButton} onPress={onPayPress}>
+            <Text style={styles.payButtonText}>{loading ? 'Loading...' : ' Pay'}</Text>
+          </TouchableOpacity>
+        }
       </View>
     </TouchableOpacity>
   );

src/components/common/Header.tsx

@@ -37,7 +37,7 @@ const Header: React.FC<HeaderProps> = ({
         <TouchableOpacity onPress={handleBack} style={{padding:6}}>
           <Ionicons name="arrow-back" size={24} color={arrowColor} />
         </TouchableOpacity>
-      )}
+     )}
       <Text style={[styles.headerTitle, {color:titleColor}]}>{title}</Text>
       <View>{rightAction}</View>
     </View>
@@ -49,14 +49,15 @@ export default Header;
 const styles = StyleSheet.create({
   header: {
     flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
+    // alignItems: "center",
+    // justifyContent: "space-between",
     paddingVertical: 12,
     paddingHorizontal:12
   },
   headerTitle: {
-    fontSize: 18,
+    fontSize: 22,
     fontWeight: "600",
-    textTransform: "capitalize",
+    // textTransform: "capitalize",
   },
+  
 });

src/screens/home/UserProfileStatus.tsx

@@ -69,6 +69,7 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
   const [selectedGroupIds, setSelectedGroupIds] = useState<string[]>([]);
   const [submitting, setSubmitting] = useState(false);
 
+  // console.log("user me : ", userDashboard)
   // Preselect all due groups at mount and on change
   useEffect(() => {
     if (userDashboard?.dueGroupDetails) {
@@ -77,22 +78,25 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
   }, [userDashboard?.dueGroupDetails]);
 
   // Show profile completion modal only if profile is incomplete
+
+  console.log("userDashboard : ", userDashboard)
   useEffect(() => {
     if (statusData && !statusData.profileStatus) setShowModal(true);
   }, [statusData]);
 
   // Top grid info items
   const infoItems = useMemo(
-    () => [
-      { label: "Role", value: statusData?.role || "-" },
-      { label: "Active Groups", value: userDashboard?.activeStatusMyGroupCount?.toString() || "0" },
-      { label: "Joined Groups", value: userDashboard?.myJoinedGroups?.length?.toString() || "0" },
-      { label: "My Groups", value: userDashboard?.myCreatedGroups?.length?.toString() || "0" },
-      { label: "Total Due", value: `₹${userDashboard?.multiplePayAmount || 0}` },
-      { label: "Completed", value: userDashboard?.completeStatusMyGroupCount?.toString() || "0" },
-    ],
-    [userDashboard, statusData]
-  );
+  () => [
+    { icon: <Ionicons name="person-outline" size={20} color={colors.primary} />, label: "Role", value: statusData?.role || "-" },
+    { icon: <Ionicons name="pie-chart-outline" size={20} color={colors.primary} />, label: "Active Groups", value: userDashboard?.activeStatusMyGroupCount?.toString() || "0" },
+    { icon: <Ionicons name="book-outline" size={20} color={colors.primary} />, label: "Joined Groups", value: userDashboard?.myJoinedGroups?.length?.toString() || "0" },
+    { icon: <Ionicons name="people-outline" size={20} color={colors.primary} />, label: "My Groups", value: userDashboard?.myCreatedGroups?.length?.toString() || "0" },
+    { icon: <Ionicons name="document-text-outline" size={20} color={colors.primary} />, label: "Total Due", value: `₹${userDashboard?.multiplePayAmount || 0}` },
+    { icon: <Ionicons name="checkmark-done-outline" size={20} color={colors.primary} />, label: "Completed", value: userDashboard?.completeStatusMyGroupCount?.toString() || "0" },
+  ],
+  [userDashboard, statusData]
+);
+
 
   // Utility for info color
   const getValueColor = (value: string) => {
@@ -127,18 +131,9 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
     }
     setSubmitting(true);
     try {
-      const response = await apiCall(PAY_ALL_URL, 'POST',{ groupIds: selectedGroupIds }, undefined, "Payment failed. Try again.") as any;
+      const response = await apiCall(PAY_ALL_URL, 'POST', { groupIds: selectedGroupIds }, undefined, "Payment failed. Try again.") as any;
 
-      console.log("-=-=-=-=-=-=-=-=-=-=-=",response)
-      
-      // const response = await fetch(
-      //   "https://api.godemo.in/FundCollect/api/payments/payments/bulk",
-      //   {
-      //     method: "POST",
-      //     headers: { "Content-Type": "application/json" },
-      //     body: JSON.stringify({ groupIds: selectedGroupIds, payAllDue: true }),
-      //   }
-      // );
+      console.log("-=-=-=-=-=-=-=-=-=-=-=", response)
       if (response.status) {
         ToastAndroid.show("Payment initiated!", ToastAndroid.LONG);
         setShowPayDialog(false);
@@ -261,7 +256,6 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
             </Text>
           </View>
         </View>
-
         <View style={styles.contentSection}>
           <View style={styles.leftSection}>
             <View style={styles.infoGrid}>
@@ -269,7 +263,7 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
                 <View key={item.label} style={styles.infoCard}>
                   <View style={styles.infoCardHeader}>
                     <View style={styles.iconContainer}>
-                      <Ionicons name="information-circle-outline" size={16} color={colors.primary} />
+                      {item.icon}
                     </View>
                     <Text style={styles.infoLabel} >
                       {item.label}
@@ -289,17 +283,19 @@ const UserProfileStatus: React.FC<UserProfileStatusProps> = ({
               activeOpacity={0.8}
             >
               <View style={styles.profileContainer}>
-                {profileImage ? (
+                {profileImage !== undefined ? (
                   <Image source={{ uri: profileImage.uri }} style={styles.avatar} />
                 ) : (
                   <View style={styles.avatarPlaceholder}>
                     <Ionicons name="person" size={45} color="#fff" />
                   </View>
                 )}
-                <View style={styles.profileBadge}>
-                  <Ionicons name="camera" size={18} color={colors.primary} />
-                </View>
               </View>
+              <View style={styles.infoCardOne}>
+              <Text style={{ color: "#fff", fontWeight: "400"}}>Total Paid Amount {userDashboard?.totalPaidAmountMonth}</Text>
+              {/* <Text style={{ color: "#fff", fontWeight: "400"}}>Total Paid Amount {userDashboard?.totalPaidAmountMonth}</Text> */}
+          
+           </View>
             </TouchableOpacity>
           </View>
         </View>
@@ -419,6 +415,16 @@ const styles = StyleSheet.create({
     minWidth: '45%',
     marginBottom: 8,
   },
+  infoCardOne: {
+    backgroundColor: 'rgba(255,255,255,0.15)',
+    borderRadius: 14,
+    padding: 12,
+    borderWidth: 1,
+    borderColor: 'rgba(255,255,255,0.2)',
+    // flex: 1,
+    minWidth: '45%',
+    marginTop: 21,
+  },
   infoCardHeader: {
     flexDirection: 'row',
     alignItems: 'center',
@@ -546,7 +552,7 @@ const styles = StyleSheet.create({
     gap: 16,
     paddingVertical: 12,
     paddingHorizontal: 14,
-   borderColor: colors.primary,
+    borderColor: colors.primary,
     borderWidth: 1,
     borderRadius: 12,
     marginBottom: 8,
@@ -592,8 +598,8 @@ const styles = StyleSheet.create({
     paddingHorizontal: 24,
     borderRadius: 20,
     elevation: 4,
-    borderColor:colors.primary,
-    borderWidth:1,
+    borderColor: colors.primary,
+    borderWidth: 1,
     gap: 8,
   },
   payButtonText: {

src/screens/home/user-home/CycleDashboard.tsx

@@ -9,7 +9,7 @@ import {
     UIManager,
     Platform,
 } from 'react-native';
-import { Ionicons } from "@react-native-vector-icons/ionicons";import colors from "../../../components/colors"; // Assuming a colors file
+import { Ionicons } from "@react-native-vector-icons/ionicons"; import colors from "../../../components/colors"; // Assuming a colors file
 
 // Enable LayoutAnimation for Android
 if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) {
@@ -68,14 +68,11 @@ interface CycleDashboardData {
 
 // --- Helper Functions ---
 
-const formatDate = (dateArray: [number, number, number]): string => {
-    if (!dateArray || dateArray.length < 3) return 'N/A';
-    const [year, month, day] = dateArray;
-    return new Date(year, month - 1, day).toLocaleDateString('en-US', {
-        month: 'short',
-        day: 'numeric',
-        year: 'numeric',
-    });
+const formatDate = (dateStr: string | null): string => {
+    if (!dateStr) return 'N/A';
+
+    const [year, month, day] = dateStr.split('-');
+    return `${day}-${month}-${year}`;
 };
 
 const formatCurrency = (amount: number): string => {
@@ -106,7 +103,7 @@ const CycleItem = ({ item, isExpanded, onToggle }: { item: Cycle, isExpanded: bo
                 <View style={styles.cycleDetails}>
                     {/* Withdrawal Info */}
                     {item.withdrawal && (
-                         <View style={styles.section}>
+                        <View style={styles.section}>
                             <Text style={styles.sectionTitle}>Withdrawal</Text>
                             <View style={styles.withdrawalCard}>
                                 <Ionicons name="arrow-down-circle-outline" size={32} color={colors.Home} />
@@ -116,18 +113,19 @@ const CycleItem = ({ item, isExpanded, onToggle }: { item: Cycle, isExpanded: bo
                                 </View>
                                 <Text style={styles.withdrawalDate}>{formatDate(item.withdrawal.paidDate)}</Text>
                             </View>
-                         </View>
+                        </View>
                     )}
 
                     {/* Contributions List */}
                     <View style={styles.section}>
                         <Text style={styles.sectionTitle}>Contributions ({item.paidParticipants}/{item.totalParticipants})</Text>
                         {item.contributions.map(contribution => (
-                            <View key={contribution.transactionId} style={styles.contributionItem}>
+                            <View key={contribution.transactionId} style={[styles.contributionItem, { backgroundColor: contribution.status === 'SUCCESS' ? '#D1FAE5' : contribution.status === 'PENDING' ? '#FEF3C7' : '#FEE2E2' }]}>
                                 <Ionicons name="person-circle-outline" size={28} color="#475569" />
                                 <View style={{ flex: 1, marginLeft: 10 }}>
-                                    <Text style={styles.contributorName}>{contribution.userName}</Text>
+                                    <Text style={styles.contributorName} numberOfLines={1} > {contribution.userName}</Text>
                                     <Text style={styles.contributionDate}>{formatDate(contribution.paidDate)}</Text>
+                                    <Text style={{color: contribution.status === 'SUCCESS' ? 'green' : contribution.status === 'PENDING' ? 'orange' : 'red', fontSize:12, textTransform:'capitalize'}}>{contribution.status}</Text>
                                 </View>
                                 <Text style={styles.contributionAmount}>{formatCurrency(contribution.totalAmount)}</Text>
                             </View>
@@ -150,6 +148,7 @@ const CycleDashboard = ({ data }: { data: CycleDashboardData }) => {
         setExpandedCycle(expandedCycle === cycleNumber ? null : cycleNumber);
     };
 
+    console.log("expanded cycle : ", data)
     const renderHeader = () => (
         <View style={styles.headerContainer}>
             <Text style={styles.groupName}>{data.groupName}</Text>
@@ -297,6 +296,9 @@ const styles = StyleSheet.create({
         flexDirection: 'row',
         alignItems: 'center',
         paddingVertical: 10,
+        paddingHorizontal: 8,
+        borderRadius: 6,
+        marginBottom: 10,
         borderBottomWidth: 1,
         borderBottomColor: '#f1f5f9',
     },

src/screens/home/user-home/GroupDetails.tsx

@@ -77,7 +77,7 @@ const GroupDetails = () => {
     const [openModal, setOpenModal] = useState(false);
     const [payable, setPayable] = useState<any>();
     const [refreshing, setRefreshing] = useState(false);
-    const [cycleDashboardData, setCycleDashboardData] = useState<any>();
+    const [cycleDashboardData, setCycleDashboardData] = useState<any>([]);
     const [selectedCycleNumber, setSelectedCycleNumber] = useState(null);
     const [cycleItems, setCycleItems] = useState([]);
     const [selectedUser, setSelectedUser] = useState() as string | any;
@@ -109,8 +109,8 @@ const GroupDetails = () => {
         try {
             const response = await apiCall(`${BASE_URL}payments/groups/${group.id || route?.params?.groupId}/cycle-dashboard`, "GET") as any;
             const responseData = response.data;
-            setCycleDashboardData(responseData);
-            console.log("cycledata", responseData)
+            setCycleDashboardData(responseData || []);
+            console.log("cycle data", responseData)
             if (responseData?.cycles) {
                 const items = responseData.cycles.map((cycle: any) => ({
                     label: `Cycle ${cycle.cycleNumber}`,
@@ -191,7 +191,8 @@ const GroupDetails = () => {
     };
 
 
-    const selectedCycleData = cycleDashboardData?.cycles.find((c: any) => c.cycleNumber === selectedCycleNumber);
+    const selectedCycleData = cycleDashboardData?.cycles?.find((c: any) => c.cycleNumber === selectedCycleNumber);
+    // const selectedCycleData = cycleDashboardData?.cycles.find((c: any) => c.cycleNumber === selectedCycleNumber);
 
 
     return (
@@ -263,14 +264,12 @@ const GroupDetails = () => {
                 ))}
 
 
-                {cycleDashboardData?.status === 'ACTIVE' || cycleDashboardData?.status === 'DELAY' && !payable?.hasPaid && (
+                {(cycleDashboardData?.status === 'ACTIVE' || cycleDashboardData?.status === 'DELAY') && !payable?.hasPaid && (
                     <TouchableOpacity onPress={() => setOpenModal(true)} style={styles.button}>
                         <Text style={styles.buttonText}>Contribute</Text>
                     </TouchableOpacity>
                 )}
             </ScrollView>
-
-
             {openModal && (
                 <ContributionScreen
                     data={payable}

src/screens/management/Payments.tsx

@@ -38,6 +38,8 @@ interface PaymentDetails {
     contributionAmount: number;
     totalDueWithLateFee: number;
     participants: Participant[];
+    nextCycleStart: string;
+    cycleCompleted: boolean;
 }
 
 type PaymentStackParamList = { Payments: { groupId: string } };
@@ -253,7 +255,9 @@ const Payments: React.FC = () => {
                                 </View>
                             </View>
                             <Text style={styles.sectionTitle}>Participants</Text>
-                            {paymentDetails.participants.map(renderParticipant)}
+                           { paymentDetails?.cycleCompleted &&
+                            <Text style={{ marginLeft: 20, marginBottom: 10, color: '#6c757d' }}>Next Cycle from : {paymentDetails?.nextCycleStart}</Text>    
+                            }{paymentDetails.participants.map(renderParticipant)}
                         </>
                     )}
                 </ScrollView>

src/screens/management/WinnerUser.tsx

@@ -34,7 +34,7 @@ interface WinnerUserProps {
   }
   visible: boolean
   onClose: () => void
-  groupId:string | number
+  groupId: string | number
 }
 
 const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId }) => {
@@ -95,7 +95,7 @@ const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId
 
   const onConfirm = async () => {
     try {
-      const res = await apiCall(`${BASE_URL}payments/withdraw/${groupId}/${data?.selectedUser?.id}`, 'PUT')
+      const res = await apiCall(`${BASE_URL}payments/withdraw`, 'PUT', { groupId, userId: data?.selectedUser?.id, cycleNumber: currentCycle }) as any
       console.log("res winner user : ", res)
       ToastAndroid.show('Withdrawal successful', ToastAndroid.SHORT)
       onClose()
@@ -119,7 +119,7 @@ const WinnerUser: React.FC<WinnerUserProps> = ({ data, visible, onClose, groupId
           {/* Header */}
           <View style={styles.header}>
             <Ionicons name="trophy" size={24} color="#ff9800" />
-            <Text style={styles.cycle}>Cycle {currentCycle} Winner</Text>
+            <Text style={styles.cycle}>Cycle {currentCycle} Winner </Text>
             <Ionicons name="trophy" size={24} color="#ff9800" />
           </View>
 

src/screens/profile/Profile.tsx

@@ -30,7 +30,7 @@ import { clearUser, setUserData } from "../../redux/userSlice";
 import { StackNavigationProp } from "@react-navigation/stack";
 import { RootStackParamList } from "../../navigation/AppNavigator";
 import { firebase } from "@react-native-firebase/messaging";
-import FirebaseService, { deleteFcmToken } from "../../utils/firebase/firebaseServices";
+import FirebaseService, { deleteFcmToken, getFcmToken } from "../../utils/firebase/firebaseServices";
 
 
 type UserProfile = {
@@ -303,7 +303,15 @@ const Profile = () => {
         ToastAndroid.show('No user is currently logged in', ToastAndroid.SHORT);
         return;
       }
-
+      const fcmToken = await getFcmToken(user?.userId?.toString());
+      const res = await fetch(`${BASE_URL}token/remove?fcmToken=${fcmToken}`, {
+        method: "PUT",
+        headers: {
+          Accept: "*/*",
+          Authorization: `Bearer ${credentials.password}`,
+        },
+      });
+      console.log(" logout api response : ", res)
       await deleteFcmToken(user?.userId?.toString());
 
       // Clear stored credentials
@@ -354,24 +362,6 @@ const Profile = () => {
   };
 
  
-  console.log("user image :", user?.filePath);
- const getProfileImage = () => {
-   return require('../../assets/images/placeholder.png');
-  if (user?.imageBlob) {
-    return { uri: `data:image/jpeg;base64,${user.imageBlob}` };
-  }
-  if (user?.filePath) {
-    return { uri: user.filePath };
-  }
-  // Return a require for local asset if nothing is available
-  return require('../../assets/images/placeholder.png');
-};
-
-
-
-
-
-
   return (
     <AppView paddingHorizontal={5} >
       {/* Header */}
@@ -433,11 +423,12 @@ const Profile = () => {
             <View style={styles.profileImageSection}>
               <View style={styles.avatarContainer}>
                 <Image
-                   source={getProfileImage()}
+                  source={{ uri: user?.imageBlob ? `data:image/jpeg;base64,${user?.imageBlob}` : user?.filePath || 'https://via.placeholder.com/150' }}
                   style={styles.avatar}
                   onError={() => console.log("Error loading image")}
                   resizeMode='contain'
                 />
+                <Text numberOfLines={1}  style={{ textAlign: 'center', marginTop: 8 }}>{user?.filePath}</Text>
                 <TouchableOpacity style={styles.cameraIcon} onPress={pickImage}>
                   <Ionicons name="camera" size={18} color="#000" />
                 </TouchableOpacity>
@@ -638,29 +629,29 @@ const Profile = () => {
                   />
 
                   <View style={styles.inputContainer}>
-  <Text style={styles.inputLabel}>Gender</Text>
-  <View style={styles.genderRow}>
-    {["Male", "Female", "Other"].map((option) => (
-      <TouchableOpacity
-        key={option}
-        style={[
-          styles.genderButton,
-          user?.gender === option && styles.genderButtonActive,
-        ]}
-        onPress={() => setUser({ ...user, gender: option })}
-      >
-        <Text
-          style={[
-            styles.genderButtonText,
-            user?.gender === option && styles.genderButtonTextActive,
-          ]}
-        >
-          {option}
-        </Text>
-      </TouchableOpacity>
-    ))}
-  </View>
-</View>
+                    <Text style={styles.inputLabel}>Gender</Text>
+                    <View style={styles.genderRow}>
+                      {["Male", "Female", "Other"].map((option) => (
+                        <TouchableOpacity
+                          key={option}
+                          style={[
+                            styles.genderButton,
+                            user?.gender === option && styles.genderButtonActive,
+                          ]}
+                          onPress={() => setUser({ ...user, gender: option })}
+                        >
+                          <Text
+                            style={[
+                              styles.genderButtonText,
+                              user?.gender === option && styles.genderButtonTextActive,
+                            ]}
+                          >
+                            {option}
+                          </Text>
+                        </TouchableOpacity>
+                      ))}
+                    </View>
+                  </View>
 
 
                   <View style={styles.editButtons}>
@@ -887,33 +878,33 @@ const styles = StyleSheet.create({
     color: "#6366f1",
   },
   genderRow: {
-  flexDirection: "row",
-  justifyContent: "space-between",
-  marginTop: 8,
-  marginBottom: 16,
-  gap: 12,
-},
-genderButton: {
-  flex: 1,
-  paddingVertical: 12,
-  backgroundColor: "#f1f5f9",
-  borderRadius: 12,
-  alignItems: "center",
-  borderWidth: 1,
-  borderColor: "#e2e8f0",
-},
-genderButtonActive: {
-  backgroundColor: colors.pastelBlue,
-},
-genderButtonText: {
-  color: "#64748b",
-  fontWeight: "500",
-  fontSize: 16,
-},
-genderButtonTextActive: {
-  color: colors.black,
-  fontWeight: "700"
-},
+    flexDirection: "row",
+    justifyContent: "space-between",
+    marginTop: 8,
+    marginBottom: 16,
+    gap: 12,
+  },
+  genderButton: {
+    flex: 1,
+    paddingVertical: 12,
+    backgroundColor: "#f1f5f9",
+    borderRadius: 12,
+    alignItems: "center",
+    borderWidth: 1,
+    borderColor: "#e2e8f0",
+  },
+  genderButtonActive: {
+    backgroundColor: colors.pastelBlue,
+  },
+  genderButtonText: {
+    color: "#64748b",
+    fontWeight: "500",
+    fontSize: 16,
+  },
+  genderButtonTextActive: {
+    color: colors.black,
+    fontWeight: "700"
+  },
 
   buttonIcon: {
     marginRight: 8,

src/screens/transaction/TransactionList.tsx

@@ -69,9 +69,20 @@ const StatusBadge: React.FC<{ status?: string }> = ({ status }) => {
 };
 
 const TransactionItem: React.FC<{ item: Transaction }> = ({ item }) => {
-  const date = useMemo(() => parseTransactionDate(item.transactionDate), [item.transactionDate]);
-  const dateStr = date ? date.toLocaleString("en-IN") : "-";
+  const formatDate = (dateStr: string | null): string => {
+    if (!dateStr) return 'N/A';
 
+    const date = new Date(dateStr);
+    const day = String(date.getDate()).padStart(2, '0');
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const year = date.getFullYear();
+
+    return `${day}-${month}-${year}`;
+  };
+
+  const dateStr = item.transactionDate ? formatDate(item.transactionDate) : "N/A";
+
+  console.log("item of the transaction : ", item)
   return (
     <TouchableOpacity activeOpacity={0.8} style={styles.card}>
       <View style={styles.cardLeft}>
@@ -130,7 +141,7 @@ const TransactionsList: React.FC = () => {
 
   return (
     <AppView>
-      <Header title="transactions" titleColor={colors.Home} arrowColor={colors.Home}/>
+      <Header title="transactions" titleColor={colors.Home} arrowColor={colors.Home} />
 
       <Text style={styles.headerTitle}>{message}</Text>
 

src/utils/ApiUrls.tsx

@@ -1,6 +1,6 @@
 
-export const BASE_URL = "https://api.godemo.in/FundCollect/api/"
-// export const BASE_URL = "http://192.168.1.5:9060/api/"
+// export const BASE_URL = "https://11.godemo.in/FundCollect/api/"
+export const BASE_URL = "http://192.168.1.8:9060/api/"
 export const LOGIN_URL = `${BASE_URL}user/generate/otp?mobiles=`
 export const VARIFY_OTP_URL = `${BASE_URL}user/otp/verify`
 export const ORGRAGISTRATION = `${BASE_URL}organizer/registration/apply`