master's earlier compat-revert (e533923) deleted these paths; since pending/
post-fix-release never touched them again afterward, git's merge saw
'deleted on one side, untouched on the other' and silently kept them deleted
instead of conflicting. Restored verbatim from pending/post-fix-release:
test fixtures (tests/, pezkuwi-overlay/tests/), the pezkuwi-overlay TRX icon
copy, TAOapp dapp icon, and 7 preConfigured chain detail JSON files.
The live Play Store release (wallet-android 85bde7e, published 2026-06-15)
was built against whatever was on this branch's HEAD at the time - which,
since master had received no commits between 2026-03-02 and this week, was
commit 7a087cf. This week's changes (nova-base sync, Tron config/icons,
balance test fixtures, etc.) are real and wanted, but they've made master
incompatible with that still-live app version, and live users installing
fresh right now get a completely empty tokens list because of it (the app's
chain sync silently fails whole-hog on any single malformed/incompatible
chain entry, leaving new installs with zero locally-cached chains).
This makes master's served content match 7a087cf exactly, stopping the
bleeding for current live users without needing an emergency app release.
None of this week's work is lost - it's all preserved on
pending/post-fix-release and will come back once wallet-android's Tron
send feature is complete and both repos can ship together in one
coordinated release.
pezkuwichain
SatoshiQaziMuhammed