@depay/widgets 7.10.0 → 7.13.0

package/dist/umd/index.js

@@ -19227,8 +19227,8 @@
         before = _useContext2.before;
 
     var _useContext3 = React.useContext(PaymentRoutingContext),
-        selectedRoute = _useContext3.selectedRoute,
-        getPaymentRoutes = _useContext3.getPaymentRoutes;
+        selectedRoute = _useContext3.selectedRoute;
+        _useContext3.getPaymentRoutes;
 
     var _useContext4 = React.useContext(ClosableContext),
         open = _useContext4.open,
@@ -19293,10 +19293,7 @@
         failed(transaction, error);
       }
 
-      setPaymentState('initialized');
       setClosable(true);
-      setUpdatable(true);
-      getPaymentRoutes({});
       navigate('PaymentError');
     };
 
@@ -19596,7 +19593,8 @@
 
     var calculateAmountInWithSlippage = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(route) {
-        var currentBlock, blocks, i, exchangeRoute, lastAmountsIn, difference1, difference2, slippage, newAmountBN, readableAmount, roundedAmountBN;
+        var currentBlock, blocks, i, exchangeRoute, lastAmountsIn, difference1, difference2, slippage, newAmountBN, readableAmount, roundedAmountBN, _difference, _difference2, _slippage, highestAmountBN, _newAmountBN, _readableAmount, _roundedAmountBN;
+
         return regenerator.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -19677,10 +19675,11 @@
 
               case 15:
                 if (!(lastAmountsIn[0].gt(lastAmountsIn[1]) && lastAmountsIn[1].gt(lastAmountsIn[2]))) {
-                  _context2.next = 29;
+                  _context2.next = 31;
                   break;
                 }
 
+                // directional slippage
                 difference1 = lastAmountsIn[0].sub(lastAmountsIn[1]);
                 difference2 = lastAmountsIn[1].sub(lastAmountsIn[2]);
 
@@ -19712,7 +19711,53 @@
               case 28:
                 return _context2.abrupt("return", newAmountBN);
 
-              case 29:
+              case 31:
+                if (lastAmountsIn[0].eq(lastAmountsIn[1]) && lastAmountsIn[1].eq(lastAmountsIn[2])) {
+                  _context2.next = 46;
+                  break;
+                }
+
+                // base slippage
+                _difference = lastAmountsIn[0].sub(lastAmountsIn[1]).abs();
+                _difference2 = lastAmountsIn[1].sub(lastAmountsIn[2]).abs();
+
+                if (_difference.lt(_difference2)) {
+                  _slippage = _difference;
+                } else {
+                  _slippage = _difference2;
+                }
+
+                if (lastAmountsIn[0].gt(lastAmountsIn[1]) && lastAmountsIn[0].gt(lastAmountsIn[2])) {
+                  highestAmountBN = lastAmountsIn[0];
+                } else if (lastAmountsIn[1].gt(lastAmountsIn[2]) && lastAmountsIn[1].gt(lastAmountsIn[0])) {
+                  highestAmountBN = lastAmountsIn[1];
+                } else {
+                  highestAmountBN = lastAmountsIn[2];
+                }
+
+                _newAmountBN = highestAmountBN.add(_slippage);
+                _context2.next = 39;
+                return route.fromToken.readable(_newAmountBN);
+
+              case 39:
+                _readableAmount = _context2.sent;
+                _context2.next = 42;
+                return route.fromToken.BigNumber(round(_readableAmount));
+
+              case 42:
+                _roundedAmountBN = _context2.sent;
+
+                if (!(route.fromAmount == _roundedAmountBN.toString())) {
+                  _context2.next = 45;
+                  break;
+                }
+
+                return _context2.abrupt("return");
+
+              case 45:
+                return _context2.abrupt("return", _newAmountBN);
+
+              case 46:
               case "end":
                 return _context2.stop();
             }
@@ -20941,8 +20986,8 @@
   });
 
   var PaymentErrorDialog = (function () {
-    var _useContext = React.useContext(reactDialogStack.NavigateStackContext),
-        navigate = _useContext.navigate;
+    var _useContext = React.useContext(ClosableContext),
+        close = _useContext.close;
 
     var _useContext2 = React.useContext(PaymentContext),
         transaction = _useContext2.transaction;
@@ -20951,7 +20996,7 @@
         recover = _useContext3.recover;
 
     return /*#__PURE__*/React__default["default"].createElement(Dialog$1, {
-      stacked: recover ? false : true,
+      stacked: false,
       header: /*#__PURE__*/React__default["default"].createElement("div", {
         className: "PaddingTopS PaddingLeftM PaddingRightM"
       }),
@@ -20982,7 +21027,7 @@
       }, recover == undefined && /*#__PURE__*/React__default["default"].createElement("button", {
         className: "ButtonPrimary",
         onClick: function onClick() {
-          return navigate('back');
+          return close();
         }
       }, "Try again"))
     });
@@ -21082,6 +21127,7 @@
 
     var _useContext2 = React.useContext(ConfigurationContext),
         track = _useContext2.track,
+        validated = _useContext2.validated,
         integration = _useContext2.integration,
         link = _useContext2.link,
         type = _useContext2.type;
@@ -21127,6 +21173,9 @@
     var _useContext3 = React.useContext(ClosableContext),
         setClosable = _useContext3.setClosable;
 
+    var _useContext4 = React.useContext(NavigateContext),
+        navigate = _useContext4.navigate;
+
     var openSocket = function openSocket(transaction) {
       var socket = new WebSocket('wss://integrate.depay.fi/cable');
 
@@ -21148,14 +21197,23 @@
       socket.onmessage = function (event) {
         var item = JSON.parse(event.data);
 
-        if (item.type === "ping") {
+        if (item.type === "ping" || !item.message) {
           return;
         }
 
-        if (item.message && item.message.release) {
+        if (item.message.status == 'failed') {
+          setClosable(true);
+          navigate('PaymentError');
+        }
+
+        if (validated) {
+          validated(item.message.status == 'success');
+        }
+
+        if (item.message.release) {
+          setRelease(true);
           setClosable(!item.message.forward_to);
           setForwardTo(item.message.forward_to);
-          setRelease(item.message.release);
           socket.close();
 
           if (!!item.message.forward_to) {
@@ -21217,8 +21275,10 @@
         after_block: afterBlock,
         from_token: paymentRoute.fromToken.address,
         from_amount: paymentRoute.fromAmount.toString(),
+        from_decimals: paymentRoute.fromDecimals,
         to_token: paymentRoute.toToken.address,
         to_amount: paymentRoute.toAmount.toString(),
+        to_decimals: paymentRoute.toDecimals,
         fee_amount: paymentRoute === null || paymentRoute === void 0 ? void 0 : (_paymentRoute$feeAmou = paymentRoute.feeAmount) === null || _paymentRoute$feeAmou === void 0 ? void 0 : _paymentRoute$feeAmou.toString()
       }).then(function (response) {
         if (response.status != 200) {
@@ -21614,12 +21674,12 @@
 
   var Donation = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(_ref3) {
-      var amount, accept, event, sent, confirmed, failed, error, critical, style, blacklist, providers, currency, connected, closed, track, fee, closable, integration, link, container, document, unmount;
+      var amount, accept, event, sent, confirmed, validated, failed, error, critical, style, blacklist, providers, currency, connected, closed, track, fee, closable, integration, link, container, document, unmount;
       return regenerator.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              amount = _ref3.amount, accept = _ref3.accept, event = _ref3.event, sent = _ref3.sent, confirmed = _ref3.confirmed, failed = _ref3.failed, error = _ref3.error, critical = _ref3.critical, style = _ref3.style, blacklist = _ref3.blacklist, providers = _ref3.providers, currency = _ref3.currency, connected = _ref3.connected, closed = _ref3.closed, track = _ref3.track, fee = _ref3.fee, closable = _ref3.closable, integration = _ref3.integration, link = _ref3.link, container = _ref3.container, document = _ref3.document;
+              amount = _ref3.amount, accept = _ref3.accept, event = _ref3.event, sent = _ref3.sent, confirmed = _ref3.confirmed, validated = _ref3.validated, failed = _ref3.failed, error = _ref3.error, critical = _ref3.critical, style = _ref3.style, blacklist = _ref3.blacklist, providers = _ref3.providers, currency = _ref3.currency, connected = _ref3.connected, closed = _ref3.closed, track = _ref3.track, fee = _ref3.fee, closable = _ref3.closable, integration = _ref3.integration, link = _ref3.link, container = _ref3.container, document = _ref3.document;
               requireReactVersion();
               _context2.prev = 2;
               _context2.next = 5;
@@ -21650,6 +21710,7 @@
                       fee: fee,
                       sent: sent,
                       confirmed: confirmed,
+                      validated: validated,
                       failed: failed,
                       blacklist: blacklist,
                       providers: providers,
@@ -22133,12 +22194,12 @@
 
   var Payment = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2(_ref3) {
-      var accept, amount, event, sent, confirmed, failed, error, critical, style, whitelist, blacklist, providers, currency, connected, closed, track, fee, recover, closable, integration, link, container, before, document, unmount;
+      var accept, amount, event, sent, confirmed, validated, failed, error, critical, style, whitelist, blacklist, providers, currency, connected, closed, track, fee, recover, closable, integration, link, container, before, document, unmount;
       return regenerator.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              accept = _ref3.accept, amount = _ref3.amount, event = _ref3.event, sent = _ref3.sent, confirmed = _ref3.confirmed, failed = _ref3.failed, error = _ref3.error, critical = _ref3.critical, style = _ref3.style, whitelist = _ref3.whitelist, blacklist = _ref3.blacklist, providers = _ref3.providers, currency = _ref3.currency, connected = _ref3.connected, closed = _ref3.closed, track = _ref3.track, fee = _ref3.fee, recover = _ref3.recover, closable = _ref3.closable, integration = _ref3.integration, link = _ref3.link, container = _ref3.container, before = _ref3.before, document = _ref3.document;
+              accept = _ref3.accept, amount = _ref3.amount, event = _ref3.event, sent = _ref3.sent, confirmed = _ref3.confirmed, validated = _ref3.validated, failed = _ref3.failed, error = _ref3.error, critical = _ref3.critical, style = _ref3.style, whitelist = _ref3.whitelist, blacklist = _ref3.blacklist, providers = _ref3.providers, currency = _ref3.currency, connected = _ref3.connected, closed = _ref3.closed, track = _ref3.track, fee = _ref3.fee, recover = _ref3.recover, closable = _ref3.closable, integration = _ref3.integration, link = _ref3.link, container = _ref3.container, before = _ref3.before, document = _ref3.document;
               requireReactVersion();
               _context2.prev = 2;
               _context2.next = 5;
@@ -22169,6 +22230,7 @@
                       event: event,
                       sent: sent,
                       confirmed: confirmed,
+                      validated: validated,
                       failed: failed,
                       whitelist: whitelist,
                       blacklist: blacklist,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "7.10.0",
+  "version": "7.13.0",
   "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",