Merge master into family-balance

This commit was merged in pull request #456.
This commit is contained in:
victorAnumudu
2023-10-24 17:47:13 +01:00
@@ -48,20 +48,14 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
return; return;
} }
toast.success("Message sent", {
autoClose: 2500,
hideProgressBar: true,
});
setMarketMsg({ data: marketMessageRes, state: true }); setMarketMsg({ data: marketMessageRes, state: true });
setTimeout(() => onClose(), 2000);
} catch (error) { } catch (error) {
throw new Error(error); throw new Error(error);
} finally { } finally {
setTimeout(() => { setTimeout(() => {
setTextValue(""); setTextValue("");
setMarketMsg({ loading: false }); setMarketMsg({ loading: false, state: false });
}, 2000); }, 5000);
} }
}; };
@@ -209,25 +203,28 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
onChange={handleInputChange} onChange={handleInputChange}
/> />
</div> </div>
<button <div className="relative flex w-full justify-end">
className="self-end w-[150px] h-[48px] rounded-full text-base bg-yellow-500 text-white" <span className="text-sm text-[#57cd89] absolute left-[8rem] top-4">
name="market-message" {marketMsg.state && "Message Sent!"}
onClick={MarketDetail} </span>
> <button
{marketMsg.loading ? ( className="self-end w-[150px] h-[48px] rounded-full text-base bg-yellow-500 text-white"
<LoadingSpinner size={5} color="white" /> name="market-message"
) : !marketMsg.state ? ( onClick={MarketDetail}
"Send Message" >
) : ( {marketMsg.loading ? (
"Message Sent" <LoadingSpinner size={5} color="white" />
)} ) : (
</button> "Send Message"
)}
</button>
</div>
</div> </div>
</div> </div>
<div className="w-full md:w-[23%] h-full flex flex-col"> <div className="w-full md:w-[23%] h-full flex flex-col">
<div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] p-4 rounded-md md:min-h-[420px] flex flex-col justify-between"> <div className="mx-auto bg-[#f1f8ff] dark:bg-[#C2C8D3] px-4 rounded-md md:min-h-[420px] flex flex-col justify-between">
<div className="w-full flex flex-col justify-center py-4 gap-2"> <div className="w-full flex flex-col justify-center pb-4 gap-2">
<p className="w-full text-slate-900 tracking-wide my-1 font-semibold"> <p className="w-full text-slate-900 tracking-wide my-1 font-semibold">
Interested in the task? Interested in the task?
</p> </p>