Merge conflicts remote-tracking branch 'origin/main' into ui

app/src/modules/market/AssetPreview.tsx

@@ -37,6 +37,7 @@ const AssetPreview: React.FC<AssetPreviewProps> = ({
       <div className="assetPreview">
         <div className="image-preview">
           <img src={assetImage} alt="" />
+          {/* Add canvas here */}
         </div>
 
         <div className="asset-details-preview">

app/src/modules/market/Card.tsx

@@ -1,4 +1,3 @@
-// Card.tsx
 import React from "react";
 import {
   CommentsIcon,

app/src/modules/market/FilterSearch.tsx

@@ -13,12 +13,10 @@ const FilterSearch: React.FC = () => {
   };
   return (
     <div className="filter-search-container">
-      <div className="asset-search-wrapper">
-        <Search onChange={() => {}} />
-      </div>
+      <Search onChange={() => {}} />
       <RegularDropDown
         header={activeOption}
-        options={["Alphabet ascending", "Alphabet descending"]}
+        options={["Alphabet ascending", "Alphabet descending", ""]}
         onSelect={handleSelect}
         search={false}
       />

app/src/modules/market/MarketPlace.tsx

@@ -1,18 +1,18 @@
-import React from "react";
-import FilterSearch from "./FilterSearch";
-import CardsContainer from "./CardsContainer";
-
-const MarketPlace = () => {
-  return (
-    <div className="marketplace-wrapper">
-      <div className="marketplace-container">
-        <div className="marketPlace">
-          <FilterSearch />
-          <CardsContainer />
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MarketPlace;
+import React from "react";
+import FilterSearch from "./FilterSearch";
+import CardsContainer from "./CardsContainer";
+
+const MarketPlace = () => {
+  return (
+    <div className="marketplace-wrapper">
+      <div className="marketplace-container">
+        <div className="marketPlace">
+          <FilterSearch />
+          <CardsContainer />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default MarketPlace;