merge markdown files

PLAN.md

@@ -1,6 +1,6 @@
 # Project Template: Native Betting Study App
 
-This is the canonical working plan for the project. Use this file for progress notes, next steps, and status updates.
+This is the canonical working plan and progress log for the project. Use this file for progress notes, next steps, and status updates.
 
 ## Current Status
 

PROGRESS.md

@@ -1,23 +0,0 @@
-# Hermes Progress
-
-## Done
-
-- Android: switched the app to the Hermes package/name, backed the UI with the backend, added server clock sync, and buffered analytics flushing.
-- Android: localized the remaining language labels so the locale toggle and session language row no longer show hardcoded `EN`/`SV`.
-- Backend: added `server_time` to `/health`, added audit logging, and added smoke coverage.
-- iOS: switched the source to the backend-backed flow, added clock sync, analytics flushing, and localized the remaining language labels.
-- Verified Android with `./gradlew :app:assembleDebug`.
-- Verified backend earlier with `cargo test`.
-
-## Next
-
-1. Continue from the current plan phase and keep closing out the remaining localization and polish items.
-2. Keep Android and iOS behavior aligned with the backend contract.
-3. Add or verify iOS build coverage if an Xcode project becomes available.
-4. Continue expanding tests around session, odds, settlement, and analytics flow as the app grows.
-
-## Notes
-
-- English and Swedish are required from day one.
-- The server remains authoritative for lock time, odds acceptance, and settlement.
-- iOS build validation is still unavailable here because there is no Xcode project in `mobile/ios-app`.