Retirement tax questions

I have a similar situation as the string starter Saverhino. I withdrew my excess Roth contribution of 2023 in early Apr 2024. My question is: if I choose to deal with the 2024 form 1099-R next year when it is issued, 1)Do I need to enter the Rothcontribution in TurboTax? 2) Can I report the capital gain in my 2024 tax filing or I have to amend my 2023 tax filing?

 

Thank you very much!