Merge branch 'cancel-btn-bug' of WrenchBoard/Users-Wrench into master

src/components/jobPopout/OfferJobPopout.jsx

@@ -33,10 +33,6 @@ function OfferJobPopout({details, onClose, situation}) {
       setRequestStatus({loading: true, status: false, message: '', trigger: 'reject'})
       reqData.offer_result = 333
     }
-    if(name == 'cancel'){
-      setRequestStatus({loading: true, status: false, message: '', trigger: 'cancel'})
-      reqData.offer_result = 222
-    }
 
     // API CALL
     apiUrl.offersResponse(reqData).then(response => {
@@ -191,19 +187,14 @@ function OfferJobPopout({details, onClose, situation}) {
 
         {/* close button */} 
         <div className="p-6 flex justify-end">
-          {requestStatus.loading && requestStatus.trigger == 'cancel' ?
+          <button
-            <LoadingSpinner size={8} color='sky-blue' />
+              onClick={onClose}
-            :
-            <button
-              onClick={handleOffer}
               disabled={requestStatus.loading}
               type="button"
-              name='cancel'
+              className=" border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
-              className="border border-red-500 text-red-500 text-18 tracking-wide px-2 py-2 rounded-full"
             >
-              Cancel
+              <span className="text-gradient">Close</span>
             </button>
-          }
         </div>
         {/* end of close button */}
     </div>