Skip to content

Feature/trading perpetual#6177

Open
SeniorZhai wants to merge 136 commits intomasterfrom
feature/trading_perpetual
Open

Feature/trading perpetual#6177
SeniorZhai wants to merge 136 commits intomasterfrom
feature/trading_perpetual

Conversation

@SeniorZhai
Copy link
Member

No description provided.

@SeniorZhai SeniorZhai force-pushed the feature/trading_perpetual branch from 1500e1e to 00893f2 Compare March 20, 2026 05:41
…petual

# Conflicts:
#	app/src/main/java/one/mixin/android/ui/wallet/MarketShareActivity.kt
@SeniorZhai SeniorZhai force-pushed the feature/trading_perpetual branch from 18f2dcf to 80134e5 Compare March 20, 2026 08:35
@SeniorZhai SeniorZhai force-pushed the feature/trading_perpetual branch from eb54b83 to 6a21c2e Compare March 20, 2026 15:10
@crossle
Copy link
Member

crossle commented Mar 20, 2026

@claude[agent] review

@Claude
Copy link
Contributor

Claude AI commented Mar 20, 2026

@crossle I've opened a new pull request, #6242, to work on those changes. Once the pull request is ready, I'll request review from you.

* Initial plan

* Address code review feedback on perps feature

- Remove invalid android:orientation from RelativeLayout in XML
- Fix error_waiting_other_orders string to match semantic meaning
- Fix unqualified PageScaffold imports in AllPerpsMarketsFragment and TradePage
- Fix incorrect SQL predicate in getTotalUnrealizedPnl (was comparing state to boolean expression)
- Update PerpsMarketListAdapter to use displaySymbol instead of tokenSymbol for market list display
- Migrate PerpsMarketListAdapter to ListAdapter with DiffUtil for better performance

Co-authored-by: crossle <1675131+crossle@users.noreply.github.com>
Agent-Logs-Url: https://github.com/MixinNetwork/android-app/sessions/cebbbbc8-dbf8-4107-b0c8-2514fffb2c9d

* fix package name

* fix typo

---------

Co-authored-by: anthropic-code-agent[bot] <242468646+Claude@users.noreply.github.com>
Co-authored-by: crossle <1675131+crossle@users.noreply.github.com>
Co-authored-by: Crossle Song <crosslesong@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants