Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge staging into wsx #2183

Merged
merged 129 commits into from
Jan 16, 2024
Merged

Merge staging into wsx #2183

merged 129 commits into from
Jan 16, 2024

Conversation

yornaath
Copy link
Contributor

This will merge latest staging into wsx.

  • Amm2 and asset changes.
  • Market CMS data should be editable through sanity for wsx markets.

yornaath and others added 30 commits November 28, 2023 13:58
@yornaath
first go at market images
b6429c3
@yornaath
handle marketid as strings in notion query
7074008
@yornaath
remove unnecessary referendum map from env and constants
41e09f3
@yornaath
fetch referendum index from cms
6f50ad7
@yornaath
make env be multi select
1254483
@yornaath
added utilities for a pseudo random selection that is deterministic b…
17d62cf 
…ased on seed
@yornaath
implement random but deterministic selection of fallback market image…
8fe2d62 
…s, TODO: need more imaged pr category
@yornaath
transition image loading
7935498
@yornaath
caching
7e43368
@yornaath
Merge branch 'staging' into tr-cms-maret-metadata
ccfbfe2
@yornaath
try using api route for market images
931d590
@yornaath
work
cbcc520
@yornaath
Update index.tsx
23f20fa
@yornaath
Update [marketId].tsx
2f17fa8
@yornaath
Update [marketId].tsx
43d60bb
@yornaath
cache tests
62d8ae7
@yornaath
prioruty
4988ca0
@yornaath
Update next.config.js
909de4b
@yornaath
try edge
d5329dc
@yornaath
Update [marketId].tsx
f8df122
@yornaath
Update index.tsx
566bdc0
@yornaath
Update index.tsx
2f2a501
@yornaath
try query cache approach to market images
d3a167e
@yornaath
handle initial rendering of market cms images on index page
2ff9835
@yornaath
Merge branch 'staging' into tr-cms-maret-metadata
9a80c75
@yornaath
prevent market images from falling back to old base 64 data in indexer
88c1317
@Robiquet
fix fee paying asset bug
80d931b
@Robiquet
Fix buy/sell full set form errors and disabled status
abbc4d9
@Robiquet
catch tx generation errors
0afa888
@yornaath
simpler deterministic image selected
604ec42
Robiquet and others added 24 commits January 9, 2024 14:50
@Robiquet
Merge pull request #2138 from zeitgeistpm/tr-dispute-box-styling
b11e45b 
Add dispute box spacing
@Robiquet
Merge pull request #2141 from zeitgeistpm/tr-dot-market-fixes
448b59b 
DOT market fixes
@Robiquet
Merge pull request #2150 from zeitgeistpm/tr-initial-prices-math
13f8299 
Add math for initial price setting
@yornaath
put sanity config in ENV
7bc8c6a
@yornaath
Merge branch 'staging' into tr-cms-maret-metadata
ad2881d
@Robiquet
Support og images for amm2
549e03e
@Robiquet
include neopools in total volume calcs
5576d65
@Robiquet
amm2 support for trending markets
bb2c1de
@Robiquet
display asset cost symbol
e034e00
@yornaath
Update index.ts
c393a46
@yornaath
Merge pull request #2126 from zeitgeistpm/tr-court-work-4
8468d2d 
Court fixes
@yornaath
Merge branch 'staging' into tr-cms-maret-metadata
6d4e8c2
@yornaath
Merge pull request #2020 from zeitgeistpm/tr-cms-maret-metadata
3720d82 
Dynamic CMS based market metadata
@Robiquet
Merge pull request #2159 from zeitgeistpm/tr-og-image-fix
902bd5e 
Support og images for amm2
@Robiquet
Merge pull request #2160 from zeitgeistpm/tr-amm2-volume-issues
2d1c030 
Amm2 visual issues
@Robiquet
start refactoring
23827a7
@Robiquet
Support new subquid version
1bce02d
@Robiquet
more fixes
c8064c4
@yornaath
Compress category images
bf9f12e
@Robiquet
removed commented code
58c8301
@Robiquet
Merge pull request #2174 from zeitgeistpm/tr-fix-volume-sorting
eb1a097 
Support new subsquid version
@yornaath
Merge branch 'staging' into tr-compress-category-images
41f0cd8
@yornaath
Merge pull request #2175 from zeitgeistpm/tr-compress-category-images
ccb6317 
Compress category images
@yornaath
Merge branch 'staging' into pr-staging-to-wsx2
82fa50e
@vercel Vercel
Copy link

vercel bot commented Jan 16, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 16, 2024 10:19am

@yornaath yornaath requested a review from robhyrk January 16, 2024 18:23
@robhyrk robhyrk merged commit 3834243 into wsx2 Jan 16, 2024
1 of 2 checks passed
@robhyrk robhyrk deleted the pr-staging-to-wsx2 branch January 16, 2024 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robhyrk robhyrk robhyrk approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yornaath @robhyrk @Robiquet