Merge branch 'dev' of https://git.zeptic.in/rohit/Procurelinc into dev

src/Screens/Tender/ProceedToBidDetail.tsx

@@ -122,11 +122,11 @@ const ProceedToBidDetail = () => {
         }
     };
 
-useFocusEffect(
+    useFocusEffect(
-  useCallback(() => {
+        useCallback(() => {
-    tenderRefetch();
+            tenderRefetch();
-  }, [tenderData?.tenderId])
+        }, [tenderData?.tenderId])
-);
+    );
 
     return (
         <View style={{ flex: 1, backgroundColor: colors.white }}>
@@ -256,14 +256,12 @@ useFocusEffect(
                 <View style={styles.footerSpace} />
             </ScrollView>
 
-
-
             <View style={styles.footer}>
                 {
                     tenderData?.proceedtoBid && !tenderData?.viewBid && tenderData?.biddingStatus && tenderData?.bidWithdrawStatus === false ? (
 
                         <TouchableOpacity style={styles.proceedButton} onPress={handleStartBidding}>
-                            <Text style={styles.proceedButtonText}>{loading ? <ActivityIndicator size={'small'} color={'#ffff'}/> : 'Start Bidding'}</Text>
+                            <Text style={styles.proceedButtonText}>{loading ? <ActivityIndicator size={'small'} color={'#ffff'} /> : 'Start Bidding'}</Text>
                         </TouchableOpacity>
 
                     ) : <Text style={styles.footerText}>One time bidding is completed</Text>

src/Screens/Tender/tenderBidding/TenderBidding.tsx

@@ -333,6 +333,7 @@ const TenderBidding = () => {
                 try {
                     const res = await apiCall('post', SUBMIT_ENVELOPE_A, payload) as any
 
+                    console.log("res a without file : ", res)
                     if (res?.statusCode === 200) {
                         navigation.goBack()
                         ToastAndroid.show(res.message, ToastAndroid.SHORT)
@@ -346,6 +347,20 @@ const TenderBidding = () => {
                 setLoading(false)
                 Alert.alert('Error', 'File upload failed. Please try again.')
             }
+        } else {
+            try {
+                const res = await apiCall('post', SUBMIT_ENVELOPE_A, payload) as any
+
+                console.log("res a without file : ", res)
+                if (res?.statusCode === 200) {
+                    navigation.goBack()
+                    ToastAndroid.show(res.message, ToastAndroid.SHORT)
+                }
+            } catch (error) {
+                console.log("error A envelop submit : ", error)
+            } finally {
+                setLoading(false)
+            }
         }
     };
     const handleSubmitEnvelopeB = async () => {
@@ -375,6 +390,19 @@ const TenderBidding = () => {
                 setLoading(false)
                 Alert.alert('Error', 'File upload failed. Please try again.')
             }
+        } else {
+            try {
+                const res = await apiCall('post', SUBMIT_ENVELOPE_B, payload) as any
+
+                if (res?.statusCode === 200) {
+                    navigation.goBack()
+                    ToastAndroid.show(res.message, ToastAndroid.SHORT)
+                }
+            } catch (error) {
+                console.log("error B envelop submit : ", error)
+            } finally {
+                setLoading(false)
+            }
         }
     }
     const handleSubmitEnvelopeFile = async (url: string) => {
@@ -395,7 +423,8 @@ const TenderBidding = () => {
         return res;
 
     }
-
+    console.log("bidData : ", bidData)
+    console.log("tender data : ", tenderData)
     return (
         <View style={styles.container}>
             <InsideHeader title="Tender Bidding Start" showArrow />
@@ -420,7 +449,7 @@ const TenderBidding = () => {
                 <View style={styles.card}>
                     <Text style={styles.sectionTitle}>Bid Envelopes</Text>
                     <View style={styles.envelopeRow}>
-                        {tenderData?.showEA && (
+                        {tenderData?.showEA &&  (
                             <EnvelopeButton
                                 title="Envelope A"
                                 envelopeType="A"
@@ -456,7 +485,7 @@ const TenderBidding = () => {
                     </View>
                 </View>
                 {/* Envelope A List */}
-                {tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 && (
+                {tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 &&  bidData?.envelopeB_Logs !== null && (
                     <View style={styles.card}>
                         <Text style={styles.sectionTitle}>Envelope {activeEnvelope} Details</Text>
                         <FlatList
@@ -519,7 +548,7 @@ const TenderBidding = () => {
                                     handleSubmitEnvelopeB();
                                 }
                             }}
-                            // disabled={loading}
+                        // disabled={loading}
                         >
                             <Text style={styles.primaryButtonText}>
                                 {loading ? <ActivityIndicator size={'small'} color={'#fff'} /> : `Submit Bid (${activeEnvelope})`}