Stick around, it's rare for someone to pop in off the Internet who actually attempts to do research first!  Most folks just want free advice.

For the repayments of qualified 2020 COVID distributions you have 3 years so well beyond 6/25/21.  If repaid in full you would end up amending the 2020 return to reduce the income accordingly.  If partially repaid, there are some complex yet comprehensive instructions in the 8915-F instructions (ProSeries is expected to have the form programmed by 3/31/22 but they're definitely slower than just about every other tax software!)

Rick