diff --git a/src/Screens/Tender/ProceedToBidDetail.tsx b/src/Screens/Tender/ProceedToBidDetail.tsx index db9d7a4..7da6081 100644 --- a/src/Screens/Tender/ProceedToBidDetail.tsx +++ b/src/Screens/Tender/ProceedToBidDetail.tsx @@ -122,11 +122,11 @@ const ProceedToBidDetail = () => { } }; -useFocusEffect( - useCallback(() => { - tenderRefetch(); - }, [tenderData?.tenderId]) -); + useFocusEffect( + useCallback(() => { + tenderRefetch(); + }, [tenderData?.tenderId]) + ); return ( @@ -256,14 +256,12 @@ useFocusEffect( - - { tenderData?.proceedtoBid && !tenderData?.viewBid && tenderData?.biddingStatus && tenderData?.bidWithdrawStatus === false ? ( - {loading ? : 'Start Bidding'} + {loading ? : 'Start Bidding'} ) : One time bidding is completed diff --git a/src/Screens/Tender/tenderBidding/TenderBidding.tsx b/src/Screens/Tender/tenderBidding/TenderBidding.tsx index 4778bf9..c7678da 100644 --- a/src/Screens/Tender/tenderBidding/TenderBidding.tsx +++ b/src/Screens/Tender/tenderBidding/TenderBidding.tsx @@ -329,6 +329,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) @@ -342,6 +343,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 () => { @@ -371,6 +386,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) => { @@ -391,7 +419,8 @@ const TenderBidding = () => { return res; } - + console.log("bidData : ", bidData) + console.log("tender data : ", tenderData) return ( @@ -416,7 +445,7 @@ const TenderBidding = () => { Bid Envelopes - {tenderData?.showEA && ( + {tenderData?.showEA && ( { {/* Envelope A List */} - {tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 && ( + {tenderData?.[`tenderEnvelope${activeEnvelope}List`]?.length > 0 && bidData?.envelopeB_Logs !== null && ( Envelope {activeEnvelope} Details { handleSubmitEnvelopeB(); } }} - // disabled={loading} + // disabled={loading} > {loading ? : `Submit Bid (${activeEnvelope})`}