Merge "Update what happens when donation is rejected & use correct donation availability check"