[#70181548] refactoring PaymentObserver callbacks