shinchan-zhai 0d3b9536d5 merge: resolve conflicts from origin/main into dev ...

All conflicts were in frontend files where main had beginner-mode features
(BeginnerGuideCards, Claw402 balance alerts, mode switcher, actionable error
helpers) that dev intentionally simplified. Kept dev's version in every case.
Removed unused navigate import in SettingsPage after conflict resolution.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

2026-04-26 00:13:31 +08:00

..

agent_preferences.go

feat: port NOFXi agent module onto latest dev base (#1485)

2026-04-21 23:47:55 +08:00

agent_routes.go

feat: port NOFXi agent module onto latest dev base (#1485)

2026-04-21 23:47:55 +08:00

crypto_handler.go

feat: add TRANSPORT_ENCRYPTION toggle for easier deployment

2025-12-09 18:04:42 +08:00

errors.go

fix: improve trader error feedback, stale balance cleanup, and claw402 warnings (#1452)

2026-04-01 22:10:29 +08:00

exchange_account_state.go

feat: add exchange account states and refine beginner trader creation flow (#1450)

2026-04-01 16:26:04 +08:00

handler_ai_cost.go

feat: AI cost tracking, pre-launch balance check, low balance alerts

2026-03-21 12:31:20 +08:00

handler_ai_model.go

merge: resolve conflicts from origin/main into dev

2026-04-26 00:13:31 +08:00

handler_competition.go

refactor: restructure project directories for better modularity

2026-03-11 23:58:13 +08:00

handler_exchange.go

feat: add exchange account states and refine beginner trader creation flow (#1450)

2026-04-01 16:26:04 +08:00

handler_klines.go

refactor: optimize codebase encoding

2026-03-12 16:14:56 +08:00

handler_onboarding.go

feat(claw402): add DeepSeek V4 models and default to Flash (#1491)

2026-04-24 17:35:30 +08:00

handler_order.go

refactor: restructure project directories for better modularity

2026-03-11 23:58:13 +08:00

handler_telegram.go

refactor: restructure project directories for better modularity

2026-03-11 23:58:13 +08:00

handler_trader_config.go

refactor: split large files and clean up project structure

2026-03-12 12:53:57 +08:00

handler_trader_status.go

feat: add exchange account states and refine beginner trader creation flow (#1450)

2026-04-01 16:26:04 +08:00

handler_trader.go

fix: improve trader error feedback, stale balance cleanup, and claw402 warnings (#1452)

2026-04-01 22:10:29 +08:00

handler_user.go

feat: add "forgot account" reset flow with wallet preservation

2026-04-10 18:00:56 +08:00

handler_wallet.go

feat: AI cost tracking, pre-launch balance check, low balance alerts

2026-03-21 12:31:20 +08:00

route_registry.go

feat: Claw402 x402 payment provider + Telegram agent + x402 refactoring (#1409)

2026-03-11 16:01:42 +08:00

server_test.go

refactor: standardize code comments

2025-12-08 01:43:22 +08:00

server.go

feat: port NOFXi agent module onto latest dev base (#1485)

2026-04-21 23:47:55 +08:00

strategy.go

release: merge dev into main (2026-04-17) (#1484)

2026-04-17 19:13:35 +08:00

traderid_test.go

refactor: standardize code comments

2025-12-08 01:43:22 +08:00

utils_test.go

refactor: standardize code comments

2025-12-08 01:43:22 +08:00

utils.go

refactor: standardize code comments

2025-12-08 01:43:22 +08:00