[FIX] Refactoring bridgePayment and validating all required fields