DEV-74767 - fixed composing of payment types when no payment type is set