Get your taxes done using TurboTax

Don't know about your state refund entry on the amended return except it is probably taxable on your 2019 return.  But be sure to add the interest as a 1099 INT and put the amount in box 1.