NextMerce · mining016 · Sep 27, 2025 · Sep 27, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Cart/index.tsx b/src/components/Cart/index.tsx
@@ -80,20 +80,20 @@ const Cart = () => {
               >
                 <circle cx="50" cy="50" r="50" fill="#F3F4F6" />
                 <path
-                  fill-rule="evenodd"
-                  clip-rule="evenodd"
+                  fillRule="evenodd"
+                  clipRule="evenodd"
                   d="M36.1693 36.2421C35.6126 36.0565 35.0109 36.3574 34.8253 36.9141C34.6398 37.4707 34.9406 38.0725 35.4973 38.258L35.8726 38.3831C36.8308 38.7025 37.4644 38.9154 37.9311 39.1325C38.373 39.3381 38.5641 39.5036 38.6865 39.6734C38.809 39.8433 38.9055 40.0769 38.9608 40.5612C39.0192 41.0726 39.0208 41.7409 39.0208 42.751L39.0208 46.5361C39.0208 48.4735 39.0207 50.0352 39.1859 51.2634C39.3573 52.5385 39.7241 53.6122 40.5768 54.4649C41.4295 55.3176 42.5032 55.6844 43.7783 55.8558C45.0065 56.0209 46.5681 56.0209 48.5055 56.0209H59.9166C60.5034 56.0209 60.9791 55.5452 60.9791 54.9584C60.9791 54.3716 60.5034 53.8959 59.9166 53.8959H48.5833C46.5498 53.8959 45.1315 53.8936 44.0615 53.7498C43.022 53.61 42.4715 53.3544 42.0794 52.9623C41.9424 52.8253 41.8221 52.669 41.7175 52.4792H55.7495C56.3846 52.4792 56.9433 52.4793 57.4072 52.4292C57.9093 52.375 58.3957 52.2546 58.8534 51.9528C59.3111 51.651 59.6135 51.2513 59.8611 50.8111C60.0898 50.4045 60.3099 49.891 60.56 49.3072L61.2214 47.7641C61.766 46.4933 62.2217 45.4302 62.4498 44.5655C62.6878 43.6634 62.7497 42.7216 62.1884 41.8704C61.627 41.0191 60.737 40.705 59.8141 40.5684C58.9295 40.4374 57.7729 40.4375 56.3903 40.4375L41.0845 40.4375C41.0806 40.3979 41.0765 40.3588 41.0721 40.3201C40.9937 39.6333 40.8228 39.0031 40.4104 38.4309C39.998 37.8588 39.4542 37.4974 38.8274 37.2058C38.2377 36.9315 37.4879 36.6816 36.6005 36.3858L36.1693 36.2421ZM41.1458 42.5625C41.1458 42.6054 41.1458 42.6485 41.1458 42.692L41.1458 46.4584C41.1458 48.1187 41.1473 49.3688 41.2262 50.3542H55.6975C56.4 50.3542 56.8429 50.3528 57.1791 50.3165C57.4896 50.2829 57.6091 50.2279 57.6836 50.1787C57.7582 50.1296 57.8559 50.0415 58.009 49.7692C58.1748 49.4745 58.3506 49.068 58.6273 48.4223L59.2344 47.0057C59.8217 45.6355 60.2119 44.7177 60.3951 44.0235C60.5731 43.3488 60.4829 43.1441 60.4143 43.0401C60.3458 42.9362 60.1931 42.7727 59.5029 42.6705C58.7927 42.5653 57.7954 42.5625 56.3047 42.5625H41.1458Z"
                   fill="#8D93A5"
                 />
                 <path
-                  fill-rule="evenodd"
-                  clip-rule="evenodd"
+                  fillRule="evenodd"
+                  clipRule="evenodd"
                   d="M40.4375 60.625C40.4375 62.3855 41.8646 63.8125 43.625 63.8125C45.3854 63.8125 46.8125 62.3855 46.8125 60.625C46.8125 58.8646 45.3854 57.4375 43.625 57.4375C41.8646 57.4375 40.4375 58.8646 40.4375 60.625ZM43.625 61.6875C43.0382 61.6875 42.5625 61.2118 42.5625 60.625C42.5625 60.0382 43.0382 59.5625 43.625 59.5625C44.2118 59.5625 44.6875 60.0382 44.6875 60.625C44.6875 61.2118 44.2118 61.6875 43.625 61.6875Z"
                   fill="#8D93A5"
                 />
                 <path
-                  fill-rule="evenodd"
-                  clip-rule="evenodd"
+                  fillRule="evenodd"
+                  clipRule="evenodd"
                   d="M56.375 63.8126C54.6146 63.8126 53.1875 62.3856 53.1875 60.6251C53.1875 58.8647 54.6146 57.4376 56.375 57.4376C58.1354 57.4376 59.5625 58.8647 59.5625 60.6251C59.5625 62.3856 58.1354 63.8126 56.375 63.8126ZM55.3125 60.6251C55.3125 61.212 55.7882 61.6876 56.375 61.6876C56.9618 61.6876 57.4375 61.212 57.4375 60.6251C57.4375 60.0383 56.9618 59.5626 56.375 59.5626C55.7882 59.5626 55.3125 60.0383 55.3125 60.6251Z"
                   fill="#8D93A5"
                 />

diff --git a/src/components/Checkout/Billing.tsx b/src/components/Checkout/Billing.tsx
@@ -77,7 +77,7 @@ const Billing = () => {
                   d="M2.41469 5.03569L2.41467 5.03571L2.41749 5.03846L7.76749 10.2635L8.0015 10.492L8.23442 10.2623L13.5844 4.98735L13.5844 4.98735L13.5861 4.98569C13.6809 4.89086 13.8199 4.89087 13.9147 4.98569C14.0092 5.08024 14.0095 5.21864 13.9155 5.31345C13.9152 5.31373 13.915 5.31401 13.9147 5.31429L8.16676 10.9622L8.16676 10.9622L8.16469 10.9643C8.06838 11.0606 8.02352 11.0667 8.00039 11.0667C7.94147 11.0667 7.89042 11.0522 7.82064 10.9991L2.08526 5.36345C1.99127 5.26865 1.99154 5.13024 2.08609 5.03569C2.18092 4.94086 2.31986 4.94086 2.41469 5.03569Z"
                   fill=""
                   stroke=""
-                  stroke-width="0.666667"
+                  strokeWidth="0.666667"
                 />
               </svg>
             </span>

diff --git a/src/components/Common/CartSidebarModal/EmptyCart.tsx b/src/components/Common/CartSidebarModal/EmptyCart.tsx
@@ -18,20 +18,20 @@ const EmptyCart = () => {
         >
           <circle cx="50" cy="50" r="50" fill="#F3F4F6" />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M36.1693 36.2421C35.6126 36.0565 35.0109 36.3574 34.8253 36.9141C34.6398 37.4707 34.9406 38.0725 35.4973 38.258L35.8726 38.3831C36.8308 38.7025 37.4644 38.9154 37.9311 39.1325C38.373 39.3381 38.5641 39.5036 38.6865 39.6734C38.809 39.8433 38.9055 40.0769 38.9608 40.5612C39.0192 41.0726 39.0208 41.7409 39.0208 42.751L39.0208 46.5361C39.0208 48.4735 39.0207 50.0352 39.1859 51.2634C39.3573 52.5385 39.7241 53.6122 40.5768 54.4649C41.4295 55.3176 42.5032 55.6844 43.7783 55.8558C45.0065 56.0209 46.5681 56.0209 48.5055 56.0209H59.9166C60.5034 56.0209 60.9791 55.5452 60.9791 54.9584C60.9791 54.3716 60.5034 53.8959 59.9166 53.8959H48.5833C46.5498 53.8959 45.1315 53.8936 44.0615 53.7498C43.022 53.61 42.4715 53.3544 42.0794 52.9623C41.9424 52.8253 41.8221 52.669 41.7175 52.4792H55.7495C56.3846 52.4792 56.9433 52.4793 57.4072 52.4292C57.9093 52.375 58.3957 52.2546 58.8534 51.9528C59.3111 51.651 59.6135 51.2513 59.8611 50.8111C60.0898 50.4045 60.3099 49.891 60.56 49.3072L61.2214 47.7641C61.766 46.4933 62.2217 45.4302 62.4498 44.5655C62.6878 43.6634 62.7497 42.7216 62.1884 41.8704C61.627 41.0191 60.737 40.705 59.8141 40.5684C58.9295 40.4374 57.7729 40.4375 56.3903 40.4375L41.0845 40.4375C41.0806 40.3979 41.0765 40.3588 41.0721 40.3201C40.9937 39.6333 40.8228 39.0031 40.4104 38.4309C39.998 37.8588 39.4542 37.4974 38.8274 37.2058C38.2377 36.9315 37.4879 36.6816 36.6005 36.3858L36.1693 36.2421ZM41.1458 42.5625C41.1458 42.6054 41.1458 42.6485 41.1458 42.692L41.1458 46.4584C41.1458 48.1187 41.1473 49.3688 41.2262 50.3542H55.6975C56.4 50.3542 56.8429 50.3528 57.1791 50.3165C57.4896 50.2829 57.6091 50.2279 57.6836 50.1787C57.7582 50.1296 57.8559 50.0415 58.009 49.7692C58.1748 49.4745 58.3506 49.068 58.6273 48.4223L59.2344 47.0057C59.8217 45.6355 60.2119 44.7177 60.3951 44.0235C60.5731 43.3488 60.4829 43.1441 60.4143 43.0401C60.3458 42.9362 60.1931 42.7727 59.5029 42.6705C58.7927 42.5653 57.7954 42.5625 56.3047 42.5625H41.1458Z"
             fill="#8D93A5"
           />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M40.4375 60.625C40.4375 62.3855 41.8646 63.8125 43.625 63.8125C45.3854 63.8125 46.8125 62.3855 46.8125 60.625C46.8125 58.8646 45.3854 57.4375 43.625 57.4375C41.8646 57.4375 40.4375 58.8646 40.4375 60.625ZM43.625 61.6875C43.0382 61.6875 42.5625 61.2118 42.5625 60.625C42.5625 60.0382 43.0382 59.5625 43.625 59.5625C44.2118 59.5625 44.6875 60.0382 44.6875 60.625C44.6875 61.2118 44.2118 61.6875 43.625 61.6875Z"
             fill="#8D93A5"
           />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M56.375 63.8126C54.6146 63.8126 53.1875 62.3856 53.1875 60.6251C53.1875 58.8647 54.6146 57.4376 56.375 57.4376C58.1354 57.4376 59.5625 58.8647 59.5625 60.6251C59.5625 62.3856 58.1354 63.8126 56.375 63.8126ZM55.3125 60.6251C55.3125 61.212 55.7882 61.6876 56.375 61.6876C56.9618 61.6876 57.4375 61.212 57.4375 60.6251C57.4375 60.0383 56.9618 59.5626 56.375 59.5626C55.7882 59.5626 55.3125 60.0383 55.3125 60.6251Z"
             fill="#8D93A5"
           />

diff --git a/src/components/Common/PreviewSlider.tsx b/src/components/Common/PreviewSlider.tsx
@@ -66,8 +66,8 @@ const PreviewSliderModal = () => {
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
+              fillRule="evenodd"
+              clipRule="evenodd"
               d="M14.5918 5.92548C14.9091 5.60817 15.4236 5.60817 15.7409 5.92548L22.2409 12.4255C22.5582 12.7428 22.5582 13.2572 22.2409 13.5745L15.7409 20.0745C15.4236 20.3918 14.9091 20.3918 14.5918 20.0745C14.2745 19.7572 14.2745 19.2428 14.5918 18.9255L19.7048 13.8125H4.33301C3.88428 13.8125 3.52051 13.4487 3.52051 13C3.52051 12.5513 3.88428 12.1875 4.33301 12.1875H19.7048L14.5918 7.07452C14.2745 6.75722 14.2745 6.24278 14.5918 5.92548Z"
               fill="#FDFDFD"
             />
@@ -86,8 +86,8 @@ const PreviewSliderModal = () => {
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
+              fillRule="evenodd"
+              clipRule="evenodd"
               d="M14.5918 5.92548C14.9091 5.60817 15.4236 5.60817 15.7409 5.92548L22.2409 12.4255C22.5582 12.7428 22.5582 13.2572 22.2409 13.5745L15.7409 20.0745C15.4236 20.3918 14.9091 20.3918 14.5918 20.0745C14.2745 19.7572 14.2745 19.2428 14.5918 18.9255L19.7048 13.8125H4.33301C3.88428 13.8125 3.52051 13.4487 3.52051 13C3.52051 12.5513 3.88428 12.1875 4.33301 12.1875H19.7048L14.5918 7.07452C14.2745 6.75722 14.2745 6.24278 14.5918 5.92548Z"
               fill="#FDFDFD"
             />

diff --git a/src/components/Common/QuickViewModal.tsx b/src/components/Common/QuickViewModal.tsx
@@ -137,12 +137,14 @@ const QuickViewModal = () => {
                       </svg>
                     </button>
 
-                    <Image
-                      src={product?.imgs?.previews?.[activePreview]}
-                      alt="products-details"
-                      width={400}
-                      height={400}
-                    />
+                    {product?.imgs?.previews?.[activePreview] ? (
+                      <Image
+                        src={product.imgs.previews[activePreview]}
+                        alt="products-details"
+                        width={400}
+                        height={400}
+                      />
+                    ) : null}
                   </div>
                 </div>
               </div>

diff --git a/src/components/MyAccount/AddressModal.tsx b/src/components/MyAccount/AddressModal.tsx
@@ -43,8 +43,8 @@ const AddressModal = ({ isOpen, closeModal }) => {
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
+                fillRule="evenodd"
+                clipRule="evenodd"
                 d="M14.3108 13L19.2291 8.08167C19.5866 7.72417 19.5866 7.12833 19.2291 6.77083C19.0543 6.59895 18.8189 6.50262 18.5737 6.50262C18.3285 6.50262 18.0932 6.59895 17.9183 6.77083L13 11.6892L8.08164 6.77083C7.90679 6.59895 7.67142 6.50262 7.42623 6.50262C7.18104 6.50262 6.94566 6.59895 6.77081 6.77083C6.41331 7.12833 6.41331 7.72417 6.77081 8.08167L11.6891 13L6.77081 17.9183C6.41331 18.2758 6.41331 18.8717 6.77081 19.2292C7.12831 19.5867 7.72414 19.5867 8.08164 19.2292L13 14.3108L17.9183 19.2292C18.2758 19.5867 18.8716 19.5867 19.2291 19.2292C19.5866 18.8717 19.5866 18.2758 19.2291 17.9183L14.3108 13Z"
                 fill=""
               />

diff --git a/src/components/MyAccount/index.tsx b/src/components/MyAccount/index.tsx
@@ -590,7 +590,7 @@ const MyAccount = () => {
                         name="firstName"
                         id="firstName"
                         placeholder="Jhon"
-                        value="Jhon"
+                        defaultValue="Jhon"
                         className="rounded-md border border-gray-3 bg-gray-1 placeholder:text-dark-5 w-full py-2.5 px-5 outline-none duration-200 focus:border-transparent focus:shadow-input focus:ring-2 focus:ring-blue/20"
                       />
                     </div>

diff --git a/src/components/Orders/OrderActions.tsx b/src/components/Orders/OrderActions.tsx
@@ -15,14 +15,14 @@ const OrderActions = ({ toggleEdit, toggleDetails }: any) => {
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M8.99935 4.87504C7.27346 4.87504 5.87435 6.27415 5.87435 8.00004C5.87435 9.72593 7.27346 11.125 8.99935 11.125C10.7252 11.125 12.1243 9.72593 12.1243 8.00004C12.1243 6.27415 10.7252 4.87504 8.99935 4.87504ZM7.12435 8.00004C7.12435 6.96451 7.96382 6.12504 8.99935 6.12504C10.0349 6.12504 10.8743 6.96451 10.8743 8.00004C10.8743 9.03557 10.0349 9.87504 8.99935 9.87504C7.96382 9.87504 7.12435 9.03557 7.12435 8.00004Z"
             fill="#495270"
           />
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M8.99935 0.708374C5.23757 0.708374 2.70376 2.96187 1.23315 4.87243L1.20663 4.90687C0.874048 5.33882 0.567732 5.73664 0.359922 6.20704C0.137386 6.71077 0.0410156 7.25978 0.0410156 8.00004C0.0410156 8.7403 0.137386 9.28932 0.359922 9.79304C0.567734 10.2634 0.87405 10.6613 1.20664 11.0932L1.23316 11.1277C2.70376 13.0382 5.23757 15.2917 8.99935 15.2917C12.7611 15.2917 15.2949 13.0382 16.7655 11.1277L16.792 11.0932C17.1246 10.6613 17.431 10.2634 17.6388 9.79304C17.8613 9.28932 17.9577 8.7403 17.9577 8.00004C17.9577 7.25978 17.8613 6.71077 17.6388 6.20704C17.431 5.73663 17.1246 5.33881 16.792 4.90685L16.7655 4.87243C15.2949 2.96187 12.7611 0.708374 8.99935 0.708374ZM2.2237 5.63487C3.58155 3.87081 5.79132 1.95837 8.99935 1.95837C12.2074 1.95837 14.4172 3.87081 15.775 5.63487C16.1405 6.1097 16.3546 6.39342 16.4954 6.71216C16.627 7.01005 16.7077 7.37415 16.7077 8.00004C16.7077 8.62593 16.627 8.99003 16.4954 9.28792C16.3546 9.60666 16.1405 9.89038 15.775 10.3652C14.4172 12.1293 12.2074 14.0417 8.99935 14.0417C5.79132 14.0417 3.58155 12.1293 2.2237 10.3652C1.85821 9.89038 1.64413 9.60666 1.50332 9.28792C1.37171 8.99003 1.29102 8.62593 1.29102 8.00004C1.29102 7.37415 1.37171 7.01005 1.50332 6.71216C1.64413 6.39342 1.85821 6.1097 2.2237 5.63487Z"
             fill="#495270"
           />
@@ -37,8 +37,8 @@ const OrderActions = ({ toggleEdit, toggleDetails }: any) => {
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            fill-rule="evenodd"
-            clip-rule="evenodd"
+            fillRule="evenodd"
+            clipRule="evenodd"
             d="M9.75002 0.992536C11.0179 -0.275344 13.0735 -0.275344 14.3414 0.992536C15.6093 2.26042 15.6093 4.31606 14.3414 5.58394L8.01308 11.9123C7.65642 12.269 7.4386 12.4868 7.19583 12.6762C6.90981 12.8993 6.60033 13.0905 6.27287 13.2466C5.99494 13.3791 5.70269 13.4765 5.22413 13.6359L2.99692 14.3783L2.4622 14.5566C1.98358 14.7161 1.45589 14.5916 1.09915 14.2348C0.7424 13.8781 0.617832 13.3504 0.777373 12.8718L1.69801 10.1098C1.8575 9.63128 1.9549 9.33902 2.08736 9.06109C2.24342 8.73363 2.43469 8.42415 2.65778 8.13813C2.84714 7.89536 3.06498 7.67754 3.42169 7.32087L9.75002 0.992536ZM2.96809 13.0703L2.26362 12.3659L2.87064 10.5448C3.04737 10.0146 3.12037 9.79903 3.21577 9.59886C3.33276 9.35336 3.47616 9.12134 3.64342 8.9069C3.77979 8.73206 3.93997 8.57036 4.33516 8.17517L9.24431 3.26602C9.44694 3.77435 9.78979 4.38786 10.3679 4.96602C10.9461 5.54417 11.5596 5.88702 12.0679 6.08966L7.15879 10.9988C6.7636 11.394 6.6019 11.5542 6.42706 11.6905C6.21262 11.8578 5.9806 12.0012 5.7351 12.1182C5.53493 12.2136 5.31935 12.2866 4.78915 12.4633L2.96809 13.0703ZM13.064 5.09363C12.9608 5.07098 12.8318 5.03689 12.6851 4.986C12.2817 4.84606 11.7511 4.58145 11.2518 4.08213C10.7525 3.58282 10.4879 3.05226 10.348 2.6489C10.2971 2.50221 10.263 2.37319 10.2403 2.27L10.6339 1.87642C11.4136 1.09669 12.6778 1.09669 13.4575 1.87642C14.2373 2.65615 14.2373 3.92033 13.4575 4.70005L13.064 5.09363ZM0.709001 17.3333C0.709001 16.9881 0.988823 16.7083 1.334 16.7083H14.6673V17.9583H1.334C0.988823 17.9583 0.709001 17.6785 0.709001 17.3333Z"
             fill="#495270"
           />