-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6ef50eb
commit 2d05578
Showing
7 changed files
with
74 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1895,10 +1895,17 @@ | |
dependencies: | ||
merge-options "^3.0.4" | ||
|
||
<<<<<<< Updated upstream | ||
"@reservoir0x/reservoir-kit-ui@^2.5.17": | ||
version "2.5.17" | ||
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.17.tgz#736f4cf14070f990d82e3f28de27f1c8ef68673b" | ||
integrity sha512-1IsjYlBt4Ej0LUSEWIQhT+cyDMt0Dc3ZpnZ4bMfc/eMigIyXW230ysbfHv2K4aWxVBuRt+UbThLf48JmYdKP3g== | ||
======= | ||
"@reservoir0x/reservoir-kit-ui@^2.5.18": | ||
version "2.5.18" | ||
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-kit-ui/-/reservoir-kit-ui-2.5.18.tgz#bbf22b1f76822180cb4c6ab8eb05c7b73b61c90c" | ||
integrity sha512-Zp5u396m3rJjXe5gddxYXx/jPJRTq1pWQPJAGwIjexvOxXofED7vQEmea1GBOSB5YdJP471XFSMBO3QobPEFSw== | ||
>>>>>>> Stashed changes | ||
dependencies: | ||
"@fortawesome/fontawesome-svg-core" "^6.1.1" | ||
"@fortawesome/free-solid-svg-icons" "^6.1.1" | ||
|
@@ -1914,18 +1921,29 @@ | |
"@radix-ui/react-toggle-group" "1.0.4" | ||
"@radix-ui/react-tooltip" "1.0.6" | ||
"@react-hookz/web" "^19.2.0" | ||
<<<<<<< Updated upstream | ||
"@reservoir0x/reservoir-sdk" "2.2.7" | ||
======= | ||
"@reservoir0x/reservoir-sdk" "2.2.8" | ||
>>>>>>> Stashed changes | ||
"@stitches/react" "1.3.1-1" | ||
dayjs "^1.11.4" | ||
flatpickr "^4.6.13" | ||
framer-motion "^6.4.2" | ||
react-flatpickr "^3.10.13" | ||
swr "2.0.1" | ||
|
||
<<<<<<< Updated upstream | ||
"@reservoir0x/[email protected]": | ||
version "2.2.7" | ||
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.7.tgz#b0e31343d16874594a5c47c92a58f6936043f521" | ||
integrity sha512-xSreQz9jkITqeQv42MyZIhQ4971r70YiLUO1UMNBxZBbIPRxnBkEd5fJKm/RfHkllH+zGdbSTcYZKuhSWipKgw== | ||
======= | ||
"@reservoir0x/[email protected]": | ||
version "2.2.8" | ||
resolved "https://registry.yarnpkg.com/@reservoir0x/reservoir-sdk/-/reservoir-sdk-2.2.8.tgz#54cd5c370c4dbd1335c7f6f50b234f88e2847be8" | ||
integrity sha512-8Gjae9cr20VJbNGoRi/nx5JwrR/iGRMtt9ElU8LyDxsyQ1m7HtxMOfdaa81OmZbUA5w8jEGWN5YpH9fLBYfDjg== | ||
>>>>>>> Stashed changes | ||
dependencies: | ||
axios "^1.6.7" | ||
|
||
|