[ADD][FIX] Add opctionals in refunds

Merge request reports

Loading