Merge pull request #85 from atlp-rwanda/ft-become-seller

after test
atlp-rwanda · Aug 26, 2024 · 3274889 · 3274889
2 parents 85a82b1 + 8fc5c30
commit 3274889
Show file tree

Hide file tree

Showing 8 changed files with 261 additions and 202 deletions.
diff --git a/src/assets/styles/HomePage.scss b/src/assets/styles/HomePage.scss
@@ -14,7 +14,7 @@
         padding: 1rem 2rem;
         border-radius: 5px;
         cursor: pointer;
-        color: $white;
+        color: $secondary-color;
         transition: all 0.5s ease-in-out;
 
         &:hover {

diff --git a/src/components/FullScreenPdfView/FullScreenPdfView.tsx b/src/components/FullScreenPdfView/FullScreenPdfView.tsx
@@ -31,7 +31,7 @@ export const FullScreenPdfView = ({ pdfUrl, open, onClose }) => {
   const adjustScale = () => {
     if (pdfContainerRef.current) {
       const containerWidth = pdfContainerRef.current.clientWidth;
-      setScale(containerWidth / 245);
+      setScale(containerWidth / 300);
     }
   };
 

diff --git a/src/components/ResendEmail.tsx b/src/components/ResendEmail.tsx
@@ -14,7 +14,7 @@ const validationSchema = yup.object({
 })
 export const ResendEmail = () => {
   const dispatch = useAppDispatch();
-  const { isSuccess, isEmailResend, isLoading, message } = useAppSelector((state) => state?.auth)
+  const { isEmailSuccess, isEmailResend, isLoading, message } = useAppSelector((state) => state?.auth)
   const initialValues = {
     email: "",
   };
@@ -27,13 +27,13 @@ export const ResendEmail = () => {
   })
   useEffect(() => {
      dispatch(resetAuth());
-    if(isSuccess) {
+    if(isEmailSuccess) {
       toast.success(message);
       }
       if (isEmailResend) {
         toast.error(message)
       }
-  }, [dispatch,isSuccess,isEmailResend,message]);
+  }, [dispatch,isEmailSuccess,isEmailResend,message]);
   return (
     <>
       <Meta title="Resend Email - E-Commerce Ninjas" />

diff --git a/src/components/TermsAndCondition/TermsAndCondition.tsx b/src/components/TermsAndCondition/TermsAndCondition.tsx
@@ -116,7 +116,7 @@ const TermsAndConditionsForm: React.FC<TermsProps> = ({ onNext }) => {
         <FullScreenPdfView
           pdfUrl={fileUrl}
           open={open}
-          onClose={setOpen(false)}
+          onClose={handleClose}
         />
       )}
 

diff --git a/src/components/UserDetails.tsx b/src/components/UserDetails.tsx
@@ -37,6 +37,7 @@ const UserDetails: React.FC<any> = ({ Request }) => {
     const requestStatus = action === "Cancel" ? "Rejected" : "Accepted";
     dispatch(acceptOrRejectRequest({ userRequestId, requestStatus }));
   };
+  console.log(UserRequest?.user)
   return (
     <div className="user-details">
       <div className="user-image">