Merge master into family_banner_reload

src/components/Referral/ReferralDisplay.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { toast } from "react-toastify";
+// import { toast } from "react-toastify";
 import usersService from "../../services/UsersService";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
@@ -84,11 +84,16 @@ function ReferralDisplay() {
             loading: false,
             status: false,
           });
-          return;
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: false });
+          },3000)
         } else {
-          toast.success(res.data.status | "Message Sent!");
-          setError({ message: "", loading: false, status: true });
+          // toast.success(res.data.status | "Message Sent!");
+          setError({ message: res.data.status, loading: false, status: true });
           setRefHistoryReload((prev) => !prev);
+          setTimeout(()=>{
+            setError({ message: '', loading: false, status: true });
+          },3000)
         }
       })
       .catch((error) => {
@@ -97,6 +102,9 @@ function ReferralDisplay() {
           loading: false,
           status: false,
         });
+        setTimeout(()=>{
+          setError({ message: '', loading: false, status: false });
+        },3000)
       });
   };
 
@@ -228,7 +236,7 @@ function ReferralDisplay() {
 
                       <hr />
                       {error.message != "" && (
-                        <p className="text-base text-red-500 py-2">{error.message}</p>
+                        <p className={`text-base py-2 ${error.status ? 'text-emerald-500' : 'text-red-500'}`}>{error.message}</p>
                       )}
                       <div className="referral-btn flex justify-end items-center py-4">
                         {error.loading ? (
@@ -237,6 +245,7 @@ function ReferralDisplay() {
                           <button
                             type="submit"
                             className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            disabled={error.loading || error.status}
                           >
                             Send Message
                           </button>
@@ -251,9 +260,12 @@ function ReferralDisplay() {
             {selectedTab == 'Referral List' &&
               <>
                 <div className="w-full p-4">
-                  <h2 className="mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                    Referral List
-                  </h2>
+                  <div className='mb-2 flex flex-wrap gap-4 items-center'>
+                    <h2 className="text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
+                      Referral List
+                    </h2>
+                    <p className='text-slate-900 dark:text-white text-sm lg:text-base'>Uncompleted signup will be removed automatically after 7 days</p>
+                  </div>
                   {referralList.loading ? (
                     <LoadingSpinner size="22" color="sky-blue" />
                   ) : (