Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release branch for 8.8.0 #10135

Merged
merged 35 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
49b6961
Add TS type assertion for disputes CSV export API response to fix typ…
Jinksi Dec 23, 2024
9637247
Upgrade `@woocommerce/csv-export` to v1.10.0 – fixes unnecessary esca…
Jinksi Dec 23, 2024
952e431
Prevent WooPay opt-in checks from running when WooPayments is not ava…
leonardola Dec 23, 2024
504a42c
Remove unused useEffect import to fix GH linter warning (#10035)
Jinksi Dec 24, 2024
21d5cf8
Add TS type assertion for payout CSV export code for type safety and …
nagpai Dec 24, 2024
889ae36
Consistently format the order notes for refunds and charges (#10036)
deepakpathania Dec 24, 2024
f2c2d52
Merge trunk v8.7.0 into develop
botwoo Dec 25, 2024
442ba90
Update currency conversion method for booking products (#10042)
rafaelzaleski Dec 27, 2024
cd3e288
Reporting: Fix transaction list sort by payout currency (#10041)
nagpai Dec 30, 2024
bacc8ed
Reporting: Overview - improve mobile view of Balances card (#10040)
nagpai Dec 30, 2024
85865e8
Remove payouts rename notice overlay. (#10039)
shendy-a8c Jan 1, 2025
573a5b3
Fix incompatibility with other booking plugins (#10031)
alefesouza Jan 1, 2025
8670a4e
Changed the term "VAT" on Documents Listing Page to "Tax" to be appli…
jessy-p Jan 3, 2025
e4445f9
Add Payment Method to Transactions advanced filters (#10017)
htdat Jan 3, 2025
75b102d
Upgrade spatie/phpunit-watcher to 1.23.6 (#10054)
tpaksu Jan 3, 2025
6846918
Fix ECE exception when payment fails (#10048)
cesarcosta99 Jan 3, 2025
5460f00
Bump stable and tested up to tags (#10078)
tpaksu Jan 6, 2025
bbe2c67
Clean Up Codebase and Remove Obsolete "wallets" Feature Flags and Imp…
gpressutto5 Jan 6, 2025
16c30f6
Checkout: Make sure the font size for PMME is smaller than the labels…
danielmx-dev Jan 7, 2025
0368896
Improve BNPL PMME and icon placement in shortcode checkout (#9993)
gpressutto5 Jan 7, 2025
5098c26
MCCY: Round to lowest denomination before applying price rounding fro…
reykjalin Jan 7, 2025
d7d840b
Revert "Clean Up Codebase and Remove Obsolete "wallets" Feature Flags…
gpressutto5 Jan 8, 2025
01149f2
E2E Playwright Migration: convert Payment Gateways Confirmation spec …
allie500 Jan 8, 2025
ee8a000
refactor: ECE refreshes blocks UI in all scenarios (#10024)
frosso Jan 8, 2025
ec18d58
Update WordPress.org readme.txt file (#10096)
aheckler Jan 9, 2025
c3a7f1b
Convert the Payment Settings Manual Capture spec to Playwright (#10118)
ismaeldcom Jan 9, 2025
f00666f
fix: ECE add-to-cart race condition (#10119)
frosso Jan 9, 2025
700b287
Update PHP and Xdebug in E2E Dockerfile (#10114)
allie500 Jan 9, 2025
82ac1b9
Convert the Shopper Pay for Order spec to Playwright (#10104)
eduardoumpierre Jan 10, 2025
3b79188
Use terms text from the blocks/shortcode page as a fallback (#9887)
leonardola Jan 11, 2025
4e21571
Broaden billing field queries from form-scoped to document-scoped (#1…
timur27 Jan 11, 2025
470bbf7
Update version and add changelog entries for release 8.8.0
github-actions[bot] Jan 12, 2025
33f28a3
Fixes to multiple failing E2E tests (#10057)
alopezari Jan 14, 2025
9368b56
Normalize changelog
ricardo Jan 14, 2025
12e9aad
Merge branch 'trunk' of github.com:Automattic/woocommerce-payments in…
ricardo Jan 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: ECE add-to-cart race condition (#10119)
  • Loading branch information
frosso authored Jan 9, 2025
commit f00666ff70b94d5fc6a3c7075895c47a0ab3de45
5 changes: 5 additions & 0 deletions changelog/fix-tokenized-ece-applepay-delay
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: fix: ensure the "add to cart" ECE call is completed before other calls are made.


17 changes: 13 additions & 4 deletions client/express-checkout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ jQuery( ( $ ) => {
return;
}

let addToCartPromise = Promise.resolve();
const stripe = await api.getStripe();

const elements = stripe.elements( {
Expand Down Expand Up @@ -301,7 +302,14 @@ jQuery( ( $ ) => {
}

// Add products to the cart if everything is right.
wcpayECE.addToCart();
// we are storing the promise to ensure that the "add to cart" call is completed,
// before the `shippingaddresschange` is triggered when the dialog is opened.
// Otherwise, it might happen that the `shippingaddresschange` is triggered before the "add to cart" call is done,
// which can cause errors.
addToCartPromise = wcpayECE.addToCart();
addToCartPromise.finally( () => {
addToCartPromise = Promise.resolve();
} );
}

const clickOptions = {
Expand All @@ -319,9 +327,10 @@ jQuery( ( $ ) => {
event.resolve( clickOptions );
} );

eceButton.on( 'shippingaddresschange', async ( event ) =>
shippingAddressChangeHandler( api, event, elements )
);
eceButton.on( 'shippingaddresschange', async ( event ) => {
await addToCartPromise;
return shippingAddressChangeHandler( api, event, elements );
} );

eceButton.on( 'shippingratechange', async ( event ) =>
shippingRateChangeHandler( api, event, elements )
Expand Down
17 changes: 13 additions & 4 deletions client/tokenized-express-checkout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ jQuery( ( $ ) => {
* @param {Object} options ECE options.
*/
startExpressCheckoutElement: async ( options ) => {
let addToCartPromise = Promise.resolve();
const stripe = await api.getStripe();
const elements = stripe.elements( {
mode: 'payment',
Expand Down Expand Up @@ -247,7 +248,14 @@ jQuery( ( $ ) => {
}

// Add products to the cart if everything is right.
getCartApiHandler().addProductToCart();
// we are storing the promise to ensure that the "add to cart" call is completed,
// before the `shippingaddresschange` is triggered when the dialog is opened.
// Otherwise, it might happen that the `shippingaddresschange` is triggered before the "add to cart" call is done,
// which can cause errors.
addToCartPromise = getCartApiHandler().addProductToCart();
addToCartPromise.finally( () => {
addToCartPromise = Promise.resolve();
} );
}

const clickOptions = {
Expand All @@ -270,9 +278,10 @@ jQuery( ( $ ) => {
event.resolve( clickOptions );
} );

eceButton.on( 'shippingaddresschange', async ( event ) =>
shippingAddressChangeHandler( event, elements )
);
eceButton.on( 'shippingaddresschange', async ( event ) => {
await addToCartPromise;
return shippingAddressChangeHandler( event, elements );
} );

eceButton.on( 'shippingratechange', async ( event ) =>
shippingRateChangeHandler( event, elements )
Expand Down
Loading