[ECP-8486][ECP-8595] Grand total without tax reported to GPay, Apple Pay

[brain-effect]

Describe the bug
Magento 2.4.4-p4 + Adyen Express Checkout 1.1.2 + Adyen Payment 8.19.0. Adyen in Test mode.
The grand total without the tax included is reported to GPay and Apple Pay as the final amount. The final amount reported to Adyen, however, will be the grand total with tax, which will (most likely?) cause errors in live system.

To Reproduce
Steps to reproduce the behavior:

1. Enable express method buttons, for example in minicart.
2. Add any taxable product to cart.
3. Click on GPay or Apple Pay express buttons.
4. The grand total without tax is reported to GPay and Apple Pay as the final amount.

Expected behavior
The grand total with tax included should be reported to GPay and Apple Pay as the final amount.

Screenshots

Desktop (please complete the following information):

• Any OS
• Any browser

Smartphone (please complete the following information):

• Any Device
• Any OS
• Any Browser
• Any Version

Additional context
Probably related to magento/magento2#34649

[candemiralp]

Hello @brain-effect,

Thank you for raising this issue. We've created a PR for Apple Pay tax calculation on express payment here. We are currently working on Google Pay fix.

Best Regards,
Can

[smiroshnyk]

Hello.
It still doesn't work even for Apple Pay.

You changed it in one place, but you set grant_total in 4 places.

The steps to reproduce are the same as in this issue description.

[joselopr]

@candemiralp

[candemiralp]

Hello @joselopr,

Thank you mentioning the consequent issues related to Apple Pay express and apologies for the late response. We will test Apple Pay tax issue once again. Let me update you soon.

Best Regards,
Can

[dimitriBouteille]

Hi @candemiralp @raoulritter Why in version 1.2.0 the fix is not visible ?

In 1.1.3 :

applePayShippingContactUpdate.newTotal = {
    label: $t('Grand Total'),
    amount: (response.grand_total + response.tax_amount).toString()
};

In 1.2.0 :

applePayShippingContactUpdate.newTotal = {
    label: this.getMerchantName(),
    amount: (response.grand_total).toString()
};

I have this error when I try to place order with version 1.2.0

{
   "status" : 422,
   "errorCode" : "5_001",
   "message" : "ApplePay token amount-mismatch",
   "errorType" : "validation",
   "pspReference" : "R3TB5Q4HKJHKGK82"
}

It's possible to fix this issue quickly ? ❤️