Fatal error enabling Surcharge feature

Following up on the fatal error I reported earlier today (wcs_order_contains_renewal / wcs_order_contains_subscription undefined function errors) — after working around those, checkout now completes, but the Surcharge feature has two more issues:

1. Incorrect calculation base. The 3% surcharge is being calculated on the product subtotal only, not the full order total. Example from a test order: product subtotal $42.50, shipping $15.00, tax $3.45. Surcharge charged was $1.28 (3% of $42.50 only). It should be $1.83 (3% of the full $60.95 pre-surcharge total — product + shipping + tax).

2. No live display at checkout. The surcharge amount never appears as a line item on the checkout page, and the order total shown to the customer before they submit payment doesn’t update to include it. Only a static text note appears (“a 3% surcharge will be added to your order”). The actual surcharge amount only shows up afterward, on the generated invoice. This is a problem for both customer transparency and card network surcharge disclosure requirements, which require the surcharge to be shown as a separate line item with the total updated before the customer submits payment.

Is there a fix planned for either of these, or a setting I’m missing that controls the calculation base?

Thanks,
Ben