IFRS 15_Accounting for refunds

Hello Sir,
I have a question about IFRS 15 and want to ask you. Below is the question:
Nardone enters into 50 contracts with customers. Each contract includes the sale of one product for $1,000. The cost to Nardone of each product is $400. Cash is received upfront and control of the product transfers on delivery. Customers can return the product within 30 days to receive a full refund. Nardone can sell the returned products at a profit. Nardone has significant experience in estimating returns for this product. It estimates that 48 products will not be returned.

Required:

How should the above transaction be accounted for?

Here is my answer:
1) Dr. Asset (right to recover products) 400×2=800
Dr. Cost of sales 400×48=19,200
Cr. Inventory 20,000
2) Dr. Cash 50,000
Cr. revenue 48,000
Cr.Refund liability 2,000
I want to ask you when the customer returns 2 products within 30 days, whether below entries are correct:
3) Dr. Inventory 2×400 = 800
Cr. Asset (right to recover product) 800
4) Dr. Refund liability 2,000
Cr. Cash 2,000