Yes, you should be able to receive both of your stimulus payments with your tax refund. Those payments are for 2020 and your status in 2019 shouldn't affect the payments. You'll need to file your tax return even if your income is above the filing requirements and claim the Recovery Rebate credit there.
You can learn more about that here:
What is a Recovery Rebate Tax Credit?
