Skip to content

feat(market): sort trending contracts by score - #6593

Open
SeniorZhai wants to merge 5 commits into
masterfrom
feat/contract-trending-score-sort
Open

feat(market): sort trending contracts by score#6593
SeniorZhai wants to merge 5 commits into
masterfrom
feat/contract-trending-score-sort

Conversation

@SeniorZhai

Copy link
Copy Markdown
Member

No description provided.

@SeniorZhai SeniorZhai added the testing Now testing, but you can review label Aug 18, 2026
Match iOS so Volume/Price/Change can return to score ordering on
perpetual trending and the all-markets picker.
@SeniorZhai

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

…ing-score-sort

Co-authored-by: SeniorZhai <5416585+SeniorZhai@users.noreply.github.com>

Copilot AI commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Merge conflicts resolved in commit bcf811d. The two conflict sources were:

  1. PerpsDatabase.kt – Both branches modified MIGRATION_7_8. Combined into a single migration that includes all changes: fee_amount (orders), funding_interval_hours/next_funding_at/open_interest (markets) from master, plus trade_volume_score_1d (markets) from this branch.

  2. 8.json – Schema conflicts in perps_orders and markets tables. Resolved by including all fields from both branches. Note: the identityHash uses master's value as a placeholder — it will be updated to the correct combined hash when Room's annotation processor runs during the next build.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

testing Now testing, but you can review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants