Completely agree with the confusion especially around the State portion of the tax prep.
To answer your question, my understanding is yes, you will report the amount next year.
If you get a refund from the State of OK for this tax season, you should get a second 1099-G stating that amount. It will also have 2024 on as the year because--confusingly-- you would get it for the 2024 return, but report it on your 2025 taxes. This is why TurboTax will always ask you about whatever State refund you got from the previous year when doing your current year's taxes.
