Expense Claim - Payment Issue

Hello All, I am facing the below issue.

Create an expense claim with any expense type and add taxes and charges in the Expense Taxes and Charges >> Approve it >> Submit it.
Change Accounts Setting >> Make Payment via Journal Entry =1 (True)
Create Payment

Observed result

Case -1. Payment through Journal Entry (Bank Entry)

Total Sanctioned Amount is the sum of total expenses.
Grand Total is the sum of Expenses Sanctioned amount + Expense Taxes and Charges
Payment is made for Sanctioned Amount Only if made through Journal Entry (Type Bank Entry). In this case expense status is unpaid even after payment.

Case -2. Payment through Payment Entry

Total Sanctioned Amount is the sum of total expenses.
Grand Total is the sum of Expenses Sanctioned amount + Expense Taxes and Charges
Payment is made for Grand Total Amount if made through Payment Entry. In this case expense status is paid after payment is submitted.

Expected result

Total Sanctioned Amount is the sum of total expenses.
Grand Total is the sum of Expenses Sanctioned amount + Expense Taxes and Charges
Payment should be always made for Grand total in any case i.e., payment via payment process or journal entry.

Any suggestions?