Starting Jan 1, 2025, the per-wallet cost basis goes into effect. The time to do the Safe Harbor thing, if you’re going to, I think is right now. But you may practically have until your first spend of 2025.
I’m really not sure. The Bitcoin.tax guidance is what I’m going off of.