Merge branch 'master' into next

gatsbyjs · Jan 10, 2019 · 07051aa · 07051aa
2 parents 91e7ae7 + f2678a4
commit 07051aa
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
@@ -217,12 +217,16 @@ export default class Layout extends React.Component {
     const fetchCheckout = id => this.state.store.client.checkout.fetch(id);
 
     if (existingCheckoutID) {
-      const checkout = await fetchCheckout(existingCheckoutID);
+      try {
+        const checkout = await fetchCheckout(existingCheckoutID);
 
-      // Make sure this cart hasn’t already been purchased.
-      if (!checkout.completedAt) {
-        setCheckoutInState(checkout);
-        return;
+        // Make sure this cart hasn’t already been purchased.
+        if (!checkout.completedAt) {
+          setCheckoutInState(checkout);
+          return;
+        }
+      } catch (e) {
+        localStorage.setItem('shopify_checkout_id', null);
       }
     }