Merge pull request #75 from iranpsc/fix/package

fix some bugs in url

Author: theAwmin

src/layouts/menu/BtnsMenu.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect,useContext } from "react";
+import React, { useState, useEffect, useContext } from "react";
 import styled from "styled-components";
 import { getFieldTranslationByNames } from "../../services/Utility";
 import AccountSecurityIcon from "../../assets/svg/accountSecurity.svg";
@@ -18,10 +18,9 @@ import Tippy from "@tippyjs/react";
 import "tippy.js/animations/scale.css";
 import { useTranslation } from "react-i18next";
 import { UserContext } from "../../services/reducers/UserContext";
-const Container=styled.div`
-height: 100vh;
-`
-;
+const Container = styled.div`
+  height: 100vh;
+`;
 const Btn = styled.button`
   display: flex;
   width: 100%;
@@ -162,27 +161,29 @@ const BtnsMenu = () => {
   const { isOpen } = useMenuContext();
   const navigate = useNavigate();
   const location = useLocation();
-  const [selectedItem, setSelectedItem] = useState(null); 
+  const [selectedItem, setSelectedItem] = useState(null);
   const lang = useTranslation();
-  const [user] = useContext(UserContext); 
+  const [user] = useContext(UserContext);
   useEffect(() => {
     const currentItem = menuItems.find(
-      (item) => `/metaverse/${item.navigate}` === location.pathname
+      (item) => `/metaverse/${item.navigate}` === location.pathname,
     );
     if (currentItem) {
       setSelectedItem(currentItem.translationId);
     } else {
-      setSelectedItem(null); 
+      setSelectedItem(null);
     }
   }, [location.pathname]);
-
- const handleClick = (item) => {
+  const handleClick = (item) => {
     if (!item.navigate) return;
 
     const targetPath = `/metaverse/${item.navigate}`;
 
+    if (location.pathname.startsWith(targetPath)) {
+      return;
+    }
 
-    setSelectedItem(item.translationId); 
+    setSelectedItem(item.translationId);
     navigate(targetPath);
   };
 
@@ -232,7 +233,7 @@ const BtnsMenu = () => {
           </Btn>
         </Tippy>
       ))}
-      </Container>
+    </Container>
   );
 };
 

src/pages/Verification/Tabs/identity-tab/UploadCards.jsx

@@ -2,7 +2,6 @@ import { HiOutlineTrash } from "react-icons/hi";
 import styled from "styled-components";
 import { useState, useEffect } from "react";
 import { getFieldTranslationByNames } from "../../../../services/Utility";
-import DOMPurify from "dompurify";
 
 const Container = styled.div`
   display: flex;
@@ -22,18 +21,6 @@ const NationCard = styled.div`
   }
 `;
 
-const BankCard = styled.div`
-  width: 240px;
-  @media (min-width: 1500px) {
-    width: 185px;
-  }
-  @media (min-width: 1920px) {
-    width: 240px;
-  }
-  input {
-    opacity: 0;
-  }
-`;
 
 const Image = styled.div`
   position: relative;
@@ -107,7 +94,7 @@ const UploadCards = ({ setImageError, setNationImageURL }) => {
   const [nationImage, setNationImage] = useState(null);
   const [imageError, setImageErrorState] = useState(false); // State for image upload error
   const [previewUrl, setPreviewUrl] = useState(null);
-  useEffect(() => {
+ useEffect(() => {
     if (!nationImage) {
       setPreviewUrl(null);
       return;
@@ -120,21 +107,23 @@ const UploadCards = ({ setImageError, setNationImageURL }) => {
       URL.revokeObjectURL(url);
     };
   }, [nationImage]);
+
   const handleNationImageChange = (e) => {
     const file = e.target.files && e.target.files[0];
-    if (file) {
+    
+    if (file && file.type.startsWith("image/")) {
       setNationImage(file);
       setNationImageURL(file);
-      setImageErrorState(false); // Clear the error when a file is selected
+      setImageErrorState(false);
     } else {
-      setImageErrorState(true); // Set the error if no file is selected
+      setImageErrorState(true);
+      if (file) alert("Please upload a valid image file.");
     }
   };
-
   const handleDeleteClick = () => {
     setNationImage(null);
     setNationImageURL(null);
-    setImageErrorState(true); // Set the error when the image is deleted
+    setImageErrorState(true); 
   };
 
   return (
@@ -161,7 +150,7 @@ const UploadCards = ({ setImageError, setNationImageURL }) => {
                 // codeql[js/xss-through-dom]: previewUrl is safe (from File API / trusted source)
               }
 
-              <img src={previewUrl} alt="nation card" />
+              <img src={previewUrl || ""} alt="nation card" />
             </Image>
           )}
         </UploadWrapper>