@depay/widgets 7.12.0 → 7.13.0

package/dist/esm/index.js

@@ -19232,8 +19232,8 @@ var PaymentProvider = (function (props) {
       before = _useContext2.before;
 
   var _useContext3 = useContext(PaymentRoutingContext),
-      selectedRoute = _useContext3.selectedRoute,
-      getPaymentRoutes = _useContext3.getPaymentRoutes;
+      selectedRoute = _useContext3.selectedRoute;
+      _useContext3.getPaymentRoutes;
 
   var _useContext4 = useContext(ClosableContext),
       open = _useContext4.open,
@@ -19298,10 +19298,7 @@ var PaymentProvider = (function (props) {
       failed(transaction, error);
     }
 
-    setPaymentState('initialized');
     setClosable(true);
-    setUpdatable(true);
-    getPaymentRoutes({});
     navigate('PaymentError');
   };
 
@@ -19601,7 +19598,8 @@ var PaymentRoutingProvider = (function (props) {
 
   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) {
@@ -19682,10 +19680,11 @@ var PaymentRoutingProvider = (function (props) {
 
             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]);
 
@@ -19717,7 +19716,53 @@ var PaymentRoutingProvider = (function (props) {
             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();
           }
@@ -20946,8 +20991,8 @@ var DonationOverviewDialog = (function (props) {
 });
 
 var PaymentErrorDialog = (function () {
-  var _useContext = useContext(NavigateStackContext),
-      navigate = _useContext.navigate;
+  var _useContext = useContext(ClosableContext),
+      close = _useContext.close;
 
   var _useContext2 = useContext(PaymentContext),
       transaction = _useContext2.transaction;
@@ -20956,7 +21001,7 @@ var PaymentErrorDialog = (function () {
       recover = _useContext3.recover;
 
   return /*#__PURE__*/React.createElement(Dialog$1, {
-    stacked: recover ? false : true,
+    stacked: false,
     header: /*#__PURE__*/React.createElement("div", {
       className: "PaddingTopS PaddingLeftM PaddingRightM"
     }),
@@ -20987,7 +21032,7 @@ var PaymentErrorDialog = (function () {
     }, recover == undefined && /*#__PURE__*/React.createElement("button", {
       className: "ButtonPrimary",
       onClick: function onClick() {
-        return navigate('back');
+        return close();
       }
     }, "Try again"))
   });
@@ -21133,6 +21178,9 @@ var PaymentTrackingProvider = (function (props) {
   var _useContext3 = useContext(ClosableContext),
       setClosable = _useContext3.setClosable;
 
+  var _useContext4 = useContext(NavigateContext),
+      navigate = _useContext4.navigate;
+
   var openSocket = function openSocket(transaction) {
     var socket = new WebSocket('wss://integrate.depay.fi/cable');
 
@@ -21154,15 +21202,20 @@ var PaymentTrackingProvider = (function (props) {
     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 (validated) {
-          validated(item.message.status == 'success');
-        }
+      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);