@depay/widgets 7.15.3 → 7.16.2

package/dist/umd/index.js

@@ -1622,15 +1622,11 @@
 
     var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'up';
     var inputAsFloat = parseFloat(input);
-    var digitsAfterDecimal = inputAsFloat.toString().match(/\d+\.0*(\d{3})/);
+    var digitsAfterDecimal = inputAsFloat.toString().match(/\d+\.0*(\d{5})/);
 
     if ((_digitsAfterDecimal = digitsAfterDecimal) !== null && _digitsAfterDecimal !== void 0 && _digitsAfterDecimal.length) {
       digitsAfterDecimal = digitsAfterDecimal[0];
-      var focus = digitsAfterDecimal.match(/\d{3}$/)[0];
-
-      if (focus.match(/^00/)) {
-        return inputAsFloat;
-      }
+      var focus = digitsAfterDecimal.match(/\d{5}$/)[0];
 
       var _float;
 
@@ -1638,35 +1634,35 @@
 
       if (focus.match(/^0/)) {
         if (direction == 'up') {
-          _float = parseFloat("".concat(focus[1], ".").concat(focus[2]));
+          _float = parseFloat("".concat(focus[1], ".").concat(focus[2]).concat(focus[3]).concat(focus[4]));
         } else {
-          _float = parseFloat("".concat(focus[1], ".").concat(focus[2]));
+          _float = parseFloat("".concat(focus[1], ".").concat(focus[2]).concat(focus[3]).concat(focus[4]));
         }
 
-        focusToFixed = parseFloat(_float).toFixed(1);
+        focusToFixed = parseFloat(_float).toFixed(3);
         focusToFixed = "0".concat(focusToFixed).replace('.', '');
       } else {
         if (direction == 'up') {
-          _float = parseFloat("".concat(focus[0], ".").concat(focus[1], "9"));
+          _float = parseFloat("".concat(focus[0], ".").concat(focus[1]).concat(focus[2]).concat(focus[3], "9"));
         } else {
-          _float = parseFloat("".concat(focus[0], ".").concat(focus[1], "1"));
+          _float = parseFloat("".concat(focus[0], ".").concat(focus[1]).concat(focus[2]).concat(focus[3], "1"));
         }
 
-        focusToFixed = parseFloat(_float).toFixed(1).replace('.', '');
+        focusToFixed = parseFloat(_float).toFixed(3).replace('.', '');
       }
 
-      if (focusToFixed == '099' && parseInt(inputAsFloat.toFixed(0)) == 0) {
-        focusToFixed = direction == 'up' ? '100' : '990';
-        return parseFloat(digitsAfterDecimal.replace(/\d{3}$/, focusToFixed));
-      } else if (focusToFixed == '100' && parseInt(inputAsFloat.toFixed(0)) == 0) {
-        return parseFloat(digitsAfterDecimal.replace(/\d{4}$/, focusToFixed));
-      } else if (focusToFixed.toString()[0] != "0" && focusToFixed.toString().length > 2) {
+      if (focusToFixed == '09999' && parseInt(inputAsFloat.toFixed(0)) == 0) {
+        focusToFixed = direction == 'up' ? '10000' : '09999';
+        return parseFloat(digitsAfterDecimal.replace(/\d{5}$/, focusToFixed));
+      } else if (focusToFixed == '10000' && parseInt(inputAsFloat.toFixed(0)) == 0) {
+        return parseFloat(digitsAfterDecimal.replace(/\d{6}$/, focusToFixed));
+      } else if (focusToFixed.toString()[0] != "0" && focusToFixed.toString().length > 4) {
         return parseInt(inputAsFloat.toFixed(0));
       } else {
-        return parseFloat(digitsAfterDecimal.replace(/\d{3}$/, focusToFixed));
+        return parseFloat(digitsAfterDecimal.replace(/\d{5}$/, focusToFixed));
       }
     } else {
-      return parseFloat(inputAsFloat.toFixed(2));
+      return parseFloat(inputAsFloat.toFixed(4));
     }
   });
 
@@ -19318,30 +19314,34 @@
             switch (_context.prev = _context.next) {
               case 0:
                 if (!before) {
-                  _context.next = 4;
+                  _context.next = 6;
                   break;
                 }
 
-                stop = before(payment.route.transaction);
+                _context.next = 3;
+                return before(payment.route.transaction);
+
+              case 3:
+                stop = _context.sent;
 
                 if (!(stop === false)) {
-                  _context.next = 4;
+                  _context.next = 6;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 4:
+              case 6:
                 setClosable(false);
                 setPaymentState('paying');
                 setUpdatable(false);
-                _context.next = 9;
+                _context.next = 11;
                 return web3Client.request({
                   blockchain: payment.route.transaction.blockchain,
                   method: 'latestBlockNumber'
                 });
 
-              case 9:
+              case 11:
                 currentBlock = _context.sent;
                 wallet.sendTransaction(Object.assign({}, payment.route.transaction, {
                   sent: function sent(transaction) {
@@ -19367,7 +19367,7 @@
                   }
                 });
 
-              case 11:
+              case 13:
               case "end":
                 return _context.stop();
             }
@@ -20615,19 +20615,6 @@
     });
   });
 
-  var AlertIcon = (function (props) {
-    return /*#__PURE__*/React__default["default"].createElement("svg", {
-      className: "AlertIcon Icon " + props.className,
-      version: "1.1",
-      xmlns: "http://www.w3.org/2000/svg",
-      x: "0px",
-      y: "0px",
-      viewBox: "0 0 20 20"
-    }, /*#__PURE__*/React__default["default"].createElement("path", {
-      d: "M19.64 16.36L11.53 2.3A1.85 1.85 0 0 0 10 1.21 1.85 1.85 0 0 0 8.48 2.3L.36 16.36C-.48 17.81.21 19 1.88 19h16.24c1.67 0 2.36-1.19 1.52-2.64zM11 16H9v-2h2zm0-4H9V6h2z"
-    }));
-  });
-
   var Checkmark = (function (props) {
     return /*#__PURE__*/React__default["default"].createElement("svg", {
       className: "Checkmark Icon " + props.className,
@@ -20702,8 +20689,7 @@
     var _useContext2 = React.useContext(PaymentTrackingContext),
         tracking = _useContext2.tracking,
         release = _useContext2.release,
-        forwardTo = _useContext2.forwardTo,
-        trackingFailed = _useContext2.trackingFailed;
+        forwardTo = _useContext2.forwardTo;
 
     var _useContext3 = React.useContext(PaymentContext),
         payment = _useContext3.payment,
@@ -20750,37 +20736,21 @@
           className: "Opacity05"
         }, "Payment validated")))));
       } else {
-        if (trackingFailed) {
-          return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "Card transparent small"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardImage"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "TextCenter"
-          }, /*#__PURE__*/React__default["default"].createElement(AlertIcon, {
-            className: "small"
-          }))), /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardBody"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardBodyWrapper"
-          }, /*#__PURE__*/React__default["default"].createElement("div", null, "Tracking payment failed!")))));
-        } else {
-          return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "Card transparent small disabled"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardImage"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "TextCenter"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "Loading Icon"
-          }))), /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardBody"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "CardBodyWrapper"
-          }, /*#__PURE__*/React__default["default"].createElement("div", {
-            className: "Opacity05"
-          }, "Validating payment")))));
-        }
+        return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "Card transparent small disabled"
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "CardImage"
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "TextCenter"
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "Loading Icon"
+        }))), /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "CardBody"
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "CardBodyWrapper"
+        }, /*#__PURE__*/React__default["default"].createElement("div", {
+          className: "Opacity05"
+        }, "Validating payment")))));
       }
     };
 
@@ -21163,8 +21133,8 @@
   });
 
   var PaymentTrackingProvider = (function (props) {
-    var _useContext = React.useContext(ErrorContext),
-        errorCallback = _useContext.errorCallback;
+    var _useContext = React.useContext(ErrorContext);
+        _useContext.errorCallback;
 
     var _useContext2 = React.useContext(ConfigurationContext),
         track = _useContext2.track,
@@ -21201,20 +21171,16 @@
         release = _useState12[0],
         setRelease = _useState12[1];
 
-    var _useState13 = React.useState(false),
+    var _useState13 = React.useState(),
         _useState14 = _slicedToArray(_useState13, 2),
-        trackingFailed = _useState14[0],
-        setTrackingFailed = _useState14[1];
-
-    var _useState15 = React.useState(),
-        _useState16 = _slicedToArray(_useState15, 2),
-        forwardTo = _useState16[0],
-        setForwardTo = _useState16[1];
+        forwardTo = _useState14[0],
+        setForwardTo = _useState14[1];
 
     var _useContext3 = React.useContext(ClosableContext),
         setClosable = _useContext3.setClosable;
 
     var _useContext4 = React.useContext(NavigateContext),
+        navigate = _useContext4.navigate,
         set = _useContext4.set;
 
     var openSocket = function openSocket(transaction) {
@@ -21272,23 +21238,23 @@
 
     var retryStartTracking = function retryStartTracking(transaction, afterBlock, paymentRoute, attempt) {
       attempt = parseInt(attempt || 1, 10);
+      console.log('attempt', attempt);
+      console.log('track.attempts', track === null || track === void 0 ? void 0 : track.attempts);
 
-      if (attempt < 3) {
+      if (attempt < ((track === null || track === void 0 ? void 0 : track.attempts) || 40)) {
         setTimeout(function () {
           startTracking(transaction, afterBlock, paymentRoute, attempt + 1);
         }, 3000);
       } else {
-        console.log('PAYMENT TRACKING FAILED AFTER 3 ATTEMPTS!');
-        setTrackingFailed(true);
-
-        if (typeof errorCallback == 'function') {
-          errorCallback({
-            code: 'TRACKING_FAILED'
-          });
-        }
+        console.log('navigate TrackingFailed');
+        navigate('TrackingFailed');
       }
     };
 
+    var continueTryTracking = function continueTryTracking() {
+      retryStartTracking(transaction, afterBlock, paymentRoute, 1);
+    };
+
     var callTracking = function callTracking(payment) {
       if (track.endpoint) {
         return fetch(track.endpoint, {
@@ -21395,10 +21361,6 @@
     }, [polling, transaction, afterBlock, paymentRoute]);
 
     var storePayment = function storePayment(transaction, afterBlock, paymentRoute, attempt) {
-      if (attempt > 3) {
-        return;
-      }
-
       fetch('https://public.depay.com/payments', {
         headers: {
           'Content-Type': 'application/json'
@@ -21429,18 +21391,18 @@
       }).then(function (response) {
         if (response.status == 200 || response.status == 201) ; else {
           setTimeout(function () {
-            storePayment(transaction, afterBlock, paymentRoute, attempt + 1);
+            storePayment(transaction, afterBlock, paymentRoute);
           }, 3000);
         }
       })["catch"](function (error) {
         setTimeout(function () {
-          storePayment(transaction, afterBlock, paymentRoute, attempt + 1);
+          storePayment(transaction, afterBlock, paymentRoute);
         }, 3000);
       });
     };
 
     var initializeTracking = function initializeTracking(transaction, afterBlock, paymentRoute) {
-      storePayment(transaction, afterBlock, paymentRoute, 1);
+      storePayment(transaction, afterBlock, paymentRoute);
 
       if (tracking || track && track.async == true) {
         startTracking(transaction, afterBlock, paymentRoute);
@@ -21460,9 +21422,9 @@
       value: {
         tracking: tracking,
         initializeTracking: initializeTracking,
+        continueTryTracking: continueTryTracking,
         release: release,
-        forwardTo: forwardTo,
-        trackingFailed: trackingFailed
+        forwardTo: forwardTo
       }
     }, props.children);
   });
@@ -22158,6 +22120,54 @@
     });
   });
 
+  var TrackingFailedDialog = (function () {
+    var _useContext = React.useContext(PaymentTrackingContext),
+        continueTryTracking = _useContext.continueTryTracking;
+
+    var _useContext2 = React.useContext(PaymentContext),
+        transaction = _useContext2.transaction;
+
+    var _useContext3 = React.useContext(reactDialogStack.NavigateStackContext),
+        navigate = _useContext3.navigate;
+
+    var tryAgain = function tryAgain() {
+      continueTryTracking();
+      navigate('back');
+    };
+
+    return /*#__PURE__*/React__default["default"].createElement(Dialog$1, {
+      stacked: false,
+      header: /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "PaddingTopS PaddingLeftM PaddingRightM"
+      }),
+      body: /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "TextCenter"
+      }, /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "GraphicWrapper"
+      }, /*#__PURE__*/React__default["default"].createElement("img", {
+        className: "Graphic",
+        src: ErrorGraphic
+      })), /*#__PURE__*/React__default["default"].createElement("h1", {
+        className: "LineHeightL Text FontSizeL PaddingTopS FontWeightBold"
+      }, "Tracking payment failed"), /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "Text PaddingTopS PaddingBottomS PaddingLeftS PaddingRightS"
+      }, /*#__PURE__*/React__default["default"].createElement("strong", {
+        className: "FontSizeM"
+      }, "Please ensure you are connected to the internet, then click \"Try again\"."), /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "PaddingTopS"
+      }, /*#__PURE__*/React__default["default"].createElement("span", null, "If this keeps happening, "), /*#__PURE__*/React__default["default"].createElement("a", {
+        className: "Link",
+        href: "mailto:support@depay.com?subject=Payment%20tracking%20failed&body=Tracking%20my%20payment%20failed%0A%0ATransaction:%20".concat(transaction.url)
+      }, "please report it"), "."))),
+      footer: /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "PaddingTopXS PaddingRightM PaddingLeftM PaddingBottomM"
+      }, /*#__PURE__*/React__default["default"].createElement("button", {
+        className: "ButtonPrimary",
+        onClick: tryAgain
+      }, "Try again"))
+    });
+  });
+
   var PaymentStack = (function (props) {
     var _useContext = React.useContext(ClosableContext),
         open = _useContext.open,
@@ -22178,7 +22188,8 @@
         ChangeAmount: /*#__PURE__*/React__default["default"].createElement(ChangeAmountDialog, null),
         ChangePayment: /*#__PURE__*/React__default["default"].createElement(ChangePaymentDialog, null),
         PaymentError: /*#__PURE__*/React__default["default"].createElement(PaymentErrorDialog, null),
-        WrongNetwork: /*#__PURE__*/React__default["default"].createElement(WrongNetworkDialog, null)
+        WrongNetwork: /*#__PURE__*/React__default["default"].createElement(WrongNetworkDialog, null),
+        TrackingFailed: /*#__PURE__*/React__default["default"].createElement(TrackingFailedDialog, null)
       }
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "7.15.3",
+  "version": "7.16.2",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",
@@ -44,7 +44,7 @@
     "@depay/web3-client": "^8.5.0",
     "@depay/web3-constants": "^6.0.0",
     "@depay/web3-exchanges": "^9.2.0",
-    "@depay/web3-payments": "^10.6.1",
+    "@depay/web3-payments": "^10.6.2",
     "@depay/web3-tokens": "^8.2.0",
     "@depay/web3-wallets": "^11.1.1",
     "decimal.js": "^10.3.1"