From 7ceae43de4bd76a19ec017ff3ba70c6f520dde9a Mon Sep 17 00:00:00 2001 From: Drew Blaisdell Date: Mon, 27 Feb 2017 11:24:55 -0800 Subject: [PATCH] Checkout: Only set selected site once the sites have been fetched in `CartStore` --- client/lib/cart/store/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/lib/cart/store/index.js b/client/lib/cart/store/index.js index d38ae5359aa4..99584e2d90ff 100644 --- a/client/lib/cart/store/index.js +++ b/client/lib/cart/store/index.js @@ -134,6 +134,9 @@ CartStore.dispatchToken = Dispatcher.register( ( payload ) => { } ); sites.on( 'change', setSelectedSite ); -setSelectedSite(); + +if ( sites.fetched ) { + setSelectedSite(); +} module.exports = CartStore;