fontdue-js 1.12.2 → 1.12.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.12.3
+
+- Fix Stripe integration for Apple Pay
+
 ## 1.12.2
 
 - Fixes an issue completing checkout with a 100% coupon

package/dist/components/FontdueProvider/index.js

@@ -31,7 +31,7 @@ const FontdueProvider = _ref => {
     stripeIntegration
   }));
   const configValue = (0, _ConfigContext.makeConfig)(config);
-  const store = (0, _redux.createStore)(_reducer.default, {
+  const store = (0, _react.useRef)((0, _redux.createStore)(_reducer.default, {
     selectedSkuIds: {},
     // { [skuId]: Boolean }
     licenseOptions: [],
@@ -49,11 +49,11 @@ const FontdueProvider = _ref => {
       }
     },
     storeModalHistory: []
-  });
+  }));
   return /*#__PURE__*/_react.default.createElement(_reactRelay.RelayEnvironmentProvider, {
     environment: environment.current
   }, /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
-    store: store
+    store: store.current
   }, /*#__PURE__*/_react.default.createElement(_Stylesheet.StylesheetContainer, null), /*#__PURE__*/_react.default.createElement(_ThemeConfig.default, null), /*#__PURE__*/_react.default.createElement(_ConfigContext.default.Provider, {
     value: configValue
   }, /*#__PURE__*/_react.default.createElement(_ComponentsContext.default.Provider, {

package/dist/components/StoreModal/StoreModalReview.js

@@ -35,7 +35,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 const submitCompleteMutation = _StoreModalReviewCompleteOrderMutation !== void 0 ? _StoreModalReviewCompleteOrderMutation : (_StoreModalReviewCompleteOrderMutation = require("../../__generated__/StoreModalReviewCompleteOrderMutation.graphql"), _StoreModalReviewCompleteOrderMutation.hash && _StoreModalReviewCompleteOrderMutation.hash !== "de20197df49deb030c473adbd9560e03" && console.error("The definition of 'StoreModalReviewCompleteOrderMutation' appears to have changed. Run `relay-compiler` to update the generated files to receive the expected data."), _StoreModalReviewCompleteOrderMutation);
 const updateOrderMutation = _StoreModalReviewUpdateOrderMutation !== void 0 ? _StoreModalReviewUpdateOrderMutation : (_StoreModalReviewUpdateOrderMutation = require("../../__generated__/StoreModalReviewUpdateOrderMutation.graphql"), _StoreModalReviewUpdateOrderMutation.hash && _StoreModalReviewUpdateOrderMutation.hash !== "5ee297fdd5931c542d2f683651e54643" && console.error("The definition of 'StoreModalReviewUpdateOrderMutation' appears to have changed. Run `relay-compiler` to update the generated files to receive the expected data."), _StoreModalReviewUpdateOrderMutation);
 const StoreModalReview = _ref => {
-  var _order$stripePaymentI, _order$total, _order$orderItems, _viewer$settings;
+  var _order$stripePaymentI, _order$orderItems, _viewer$settings;
   let {
     viewer: viewerKey,
     order: orderKey
@@ -63,8 +63,27 @@ const StoreModalReview = _ref => {
     stripe = (0, _reactStripeJs.useStripe)();
     elements = (0, _reactStripeJs.useElements)();
   }
-  const lastShownTotal = (0, _react.useRef)(order === null || order === void 0 ? void 0 : (_order$total = order.total) === null || _order$total === void 0 ? void 0 : _order$total.amount);
+  (0, _react.useEffect)(() => {
+    // first do an `update` mutation without any inputs, which will make sure
+    // the total has been calculated from the latest coupon data. if the total
+    // doesn't change, submit the payment
+    (0, _relayRuntime.commitMutation)(environment, {
+      mutation: updateOrderMutation,
+      variables: {
+        input: {}
+      },
+      onCompleted: (response, errors) => {
+        if (errors && errors.length > 0) {
+          setCompleting(false);
+          setError(errors[0].message);
+          scrollToTop === null || scrollToTop === void 0 ? void 0 : scrollToTop();
+          return;
+        }
+      }
+    });
+  }, []);
   const handleSubmit = () => {
+    var _stripe, _billingIdentity$stre, _billingIdentity$stre2;
     if (!order) return;
     if (!billingIdentity) {
       console.error('No billing identity, required for payment');
@@ -87,63 +106,35 @@ const StoreModalReview = _ref => {
       });
       return;
     }
-
-    // first do an `update` mutation without any inputs, which will make sure
-    // the total has been calculated from the latest coupon data. if the total
-    // doesn't change, submit the payment
-    (0, _relayRuntime.commitMutation)(environment, {
-      mutation: updateOrderMutation,
-      variables: {
-        input: {}
-      },
-      onCompleted: (response, errors) => {
-        var _response$updateOrder, _response$updateOrder2, _response$updateOrder3, _stripe, _billingIdentity$stre, _billingIdentity$stre2;
-        if (errors && errors.length > 0) {
-          setCompleting(false);
-          setError(errors[0].message);
-          scrollToTop === null || scrollToTop === void 0 ? void 0 : scrollToTop();
-          return;
-        }
-        const newTotal = (_response$updateOrder = response.updateOrder) === null || _response$updateOrder === void 0 ? void 0 : (_response$updateOrder2 = _response$updateOrder.order) === null || _response$updateOrder2 === void 0 ? void 0 : (_response$updateOrder3 = _response$updateOrder2.total) === null || _response$updateOrder3 === void 0 ? void 0 : _response$updateOrder3.amount;
-        if (newTotal !== lastShownTotal.current) {
-          var _response$updateOrder4, _response$updateOrder5, _response$updateOrder6;
-          setCompleting(false);
-          setError('Order total has updated. Please review and confirm again.');
-          scrollToTop === null || scrollToTop === void 0 ? void 0 : scrollToTop();
-          lastShownTotal.current = (_response$updateOrder4 = response.updateOrder) === null || _response$updateOrder4 === void 0 ? void 0 : (_response$updateOrder5 = _response$updateOrder4.order) === null || _response$updateOrder5 === void 0 ? void 0 : (_response$updateOrder6 = _response$updateOrder5.total) === null || _response$updateOrder6 === void 0 ? void 0 : _response$updateOrder6.amount;
-          return;
-        }
-        if (!stripe || !elements) return;
-        (_stripe = stripe) === null || _stripe === void 0 ? void 0 : _stripe.confirmPayment({
-          elements,
-          confirmParams: {
-            return_url: order.completeUrl,
-            payment_method_data: {
-              billing_details: {
-                email: billingIdentity.email,
-                name: billingIdentity.name,
-                address: {
-                  line1: (_billingIdentity$stre = billingIdentity.street) === null || _billingIdentity$stre === void 0 ? void 0 : _billingIdentity$stre.split(/\n/)[0],
-                  line2: ((_billingIdentity$stre2 = billingIdentity.street) === null || _billingIdentity$stre2 === void 0 ? void 0 : _billingIdentity$stre2.split(/\n/)[1]) ?? '',
-                  city: billingIdentity.locality ?? '',
-                  state: billingIdentity.administrativeArea ?? '',
-                  country: billingIdentity.country,
-                  postal_code: billingIdentity.zip ?? undefined
-                }
-              }
+    if (!stripe || !elements) return;
+    (_stripe = stripe) === null || _stripe === void 0 ? void 0 : _stripe.confirmPayment({
+      elements,
+      confirmParams: {
+        return_url: order.completeUrl,
+        payment_method_data: {
+          billing_details: {
+            email: billingIdentity.email,
+            name: billingIdentity.name,
+            address: {
+              line1: (_billingIdentity$stre = billingIdentity.street) === null || _billingIdentity$stre === void 0 ? void 0 : _billingIdentity$stre.split(/\n/)[0],
+              line2: ((_billingIdentity$stre2 = billingIdentity.street) === null || _billingIdentity$stre2 === void 0 ? void 0 : _billingIdentity$stre2.split(/\n/)[1]) ?? '',
+              city: billingIdentity.locality ?? '',
+              state: billingIdentity.administrativeArea ?? '',
+              country: billingIdentity.country,
+              postal_code: billingIdentity.zip ?? undefined
             }
           }
-        }).then(result => {
-          if ('error' in result) {
-            setCompleting(false);
-            setError(result.error.message ?? 'Payment failed. Please try another payment method.');
-            scrollToTop === null || scrollToTop === void 0 ? void 0 : scrollToTop();
-          }
-        }).catch(error => {
-          console.log(error);
-          setCompleting(false);
-        });
+        }
+      }
+    }).then(result => {
+      if ('error' in result) {
+        setCompleting(false);
+        setError(result.error.message ?? 'Payment failed. Please try another payment method.');
+        scrollToTop === null || scrollToTop === void 0 ? void 0 : scrollToTop();
       }
+    }).catch(error => {
+      console.log(error);
+      setCompleting(false);
     });
   };
   const handleClickSection = step => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontdue-js",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "main": "index.js",
   "scripts": {
     "build": "npm run relay && run-p build-js build-css build-ts-declarations",