Fix conflicts

reservoirprotocol · May 10, 2024 · fd47ffd · fd47ffd
2 parents 3de0da8 + 90614c7
commit fd47ffd
Show file tree

Hide file tree

Showing 9 changed files with 1,195 additions and 1,213 deletions.
diff --git a/.changeset/fair-needles-learn.md b/.changeset/fair-needles-learn.md
@@ -0,0 +1,6 @@
+---
+'@reservoir0x/reservoir-sdk': patch
+'@reservoir0x/reservoir-kit-ui': patch
+---
+
+BidModal & ListModal: Include exchange fee in feesBps calculation
diff --git a/.changeset/many-games-dream.md b/.changeset/many-games-dream.md
@@ -0,0 +1,5 @@
+---
+'@reservoir0x/reservoir-kit-ui': patch
+---
+
+Remove useSearchActivities hook