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

2025-03-27 16:16:31 +05:30
parent 49ea1b1ff2 c9d3287ad6
commit a906d9a60b
37 changed files with 1640 additions and 758 deletions
--- a/app/src/modules/market/AssetPreview.tsx
+++ b/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">