@depay/widgets 10.2.11 → 10.2.13

package/dist/umd/index.js

@@ -4797,14 +4797,24 @@
 
   var findMaxRoute = (function (routes) {
     var sortedLowToHigh = _toConsumableArray(routes).sort(function (a, b) {
+      if (a.fromBalance == '0' || a.fromAmount == '0') {
+        return -1; // b
+      }
+
+      if (b.fromBalance == '0' || b.fromAmount == '0') {
+        return 1; // a
+      }
+
       var aAmountsAvailable = ethers.ethers.BigNumber.from(a.fromBalance).div(ethers.ethers.BigNumber.from(a.fromAmount));
       var bAmountsAvailable = ethers.ethers.BigNumber.from(b.fromBalance).div(ethers.ethers.BigNumber.from(b.fromAmount));
       if (aAmountsAvailable.lt(bAmountsAvailable)) {
-        return -1;
+        return -1; // b
       }
+
       if (bAmountsAvailable.lt(aAmountsAvailable)) {
-        return 1;
+        return 1; // a
       }
+
       return 0; // equal
     });
 
@@ -22389,8 +22399,8 @@
       recover = _useContext2.recover,
       before = _useContext2.before;
     var _useContext3 = React.useContext(PaymentRoutingContext),
-      selectedRoute = _useContext3.selectedRoute;
-      _useContext3.getPaymentRoutes;
+      selectedRoute = _useContext3.selectedRoute,
+      refreshPaymentRoutes = _useContext3.refreshPaymentRoutes;
     var _useContext4 = React.useContext(ClosableContext),
       open = _useContext4.open,
       close = _useContext4.close,
@@ -22523,13 +22533,15 @@
     }();
     var approve = function approve() {
       setClosable(false);
+      setUpdatable(false);
       setPaymentState('approving');
       wallet.sendTransaction(Object.assign({}, payment.route.approvalTransaction, {
         succeeded: function succeeded() {
-          payment.route.approvalRequired = false;
-          setPayment(payment);
+          setUpdatable(true);
           setClosable(true);
-          setPaymentState('initialized');
+          refreshPaymentRoutes().then(function () {
+            setPaymentState('initialized');
+          });
         }
       })).then(function (sentTransaction) {
         setApprovalTransaction(sentTransaction);
@@ -22731,7 +22743,7 @@
               } else {
                 roundAmounts(routes).then( /*#__PURE__*/function () {
                   var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee(roundedRoutes) {
-                    var selectRoute, newSelectRoute;
+                    var selectRoute, updatedSelectedRoute;
                     return regenerator.wrap(function _callee$(_context) {
                       while (1) switch (_context.prev = _context.next) {
                         case 0:
@@ -22739,13 +22751,19 @@
                             selectRoute = roundedRoutes[0];
                             setSelectedRoute(selectRoute);
                           } else {
-                            newSelectRoute = roundedRoutes[roundedRoutes.findIndex(function (route) {
+                            updatedSelectedRoute = roundedRoutes[roundedRoutes.findIndex(function (route) {
                               return route.fromToken.address == selectedRoute.fromToken.address && route.blockchain == selectedRoute.blockchain;
                             })];
-                            if (newSelectRoute) {
-                              if (selectedRoute.fromAmount != newSelectRoute.fromAmount) {
-                                setUpdatedRouteWithNewPrice(newSelectRoute);
+                            if (updatedSelectedRoute) {
+                              if (selectedRoute.fromAmount != updatedSelectedRoute.fromAmount) {
+                                setUpdatedRouteWithNewPrice(updatedSelectedRoute);
+                              } else if (
+                              // other reasons but price to update selected route
+                              selectedRoute.approvalRequired != updatedSelectedRoute.approvalRequired) {
+                                setSelectedRoute(updatedSelectedRoute);
                               }
+                            } else {
+                              setSelectedRoute(roundedRoutes[0]);
                             }
                           }
                           setAllRoutes(roundedRoutes);
@@ -22773,23 +22791,41 @@
         return _ref.apply(this, arguments);
       };
     }();
-    var getPaymentRoutes = function getPaymentRoutes(_ref3) {
-      _ref3.allRoutes;
-        _ref3.selectedRoute;
-        var updatable = _ref3.updatable;
-      if (updatable == false || !props.accept || !account) {
-        return;
-      }
-      var slowRoutingTimeout = setTimeout(function () {
-        setSlowRouting(true);
-      }, 4000);
-      routePayments(Object.assign({}, props, {
-        account: account
-      })).then(function (routes) {
-        clearInterval(slowRoutingTimeout);
-        onRoutesUpdate(routes);
-      });
-    };
+    var getPaymentRoutes = /*#__PURE__*/function () {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3(_ref3) {
+        var updatable, slowRoutingTimeout;
+        return regenerator.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _ref3.allRoutes, _ref3.selectedRoute, updatable = _ref3.updatable;
+              if (!(updatable == false || !props.accept || !account)) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 3:
+              slowRoutingTimeout = setTimeout(function () {
+                setSlowRouting(true);
+              }, 4000);
+              _context3.next = 6;
+              return routePayments(Object.assign({}, props, {
+                account: account
+              })).then(function (routes) {
+                clearInterval(slowRoutingTimeout);
+                onRoutesUpdate(routes);
+              });
+            case 6:
+              return _context3.abrupt("return", _context3.sent);
+            case 7:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      return function getPaymentRoutes(_x3) {
+        return _ref4.apply(this, arguments);
+      };
+    }();
     var updateRouteAmount = function updateRouteAmount(route, amountBN) {
       route.fromAmount = amountBN.toString();
       route.transaction.params.amounts[0] = amountBN.toString();
@@ -22798,72 +22834,79 @@
       }
     };
     var roundAmount = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3(route, amountBN) {
+      var _ref5 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4(route, amountBN) {
         var readableAmount, roundedAmountBN;
-        return regenerator.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return regenerator.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!route.directTransfer) {
-                _context3.next = 2;
+                _context4.next = 2;
                 break;
               }
-              return _context3.abrupt("return", route);
+              return _context4.abrupt("return", route);
             case 2:
-              _context3.next = 4;
+              _context4.next = 4;
               return route.fromToken.readable(amountBN || route.transaction.params.amounts[0]);
             case 4:
-              readableAmount = _context3.sent;
-              _context3.next = 7;
+              readableAmount = _context4.sent;
+              _context4.next = 7;
               return route.fromToken.BigNumber(round(readableAmount));
             case 7:
-              roundedAmountBN = _context3.sent;
+              roundedAmountBN = _context4.sent;
               updateRouteAmount(route, roundedAmountBN);
-              return _context3.abrupt("return", route);
+              return _context4.abrupt("return", route);
             case 10:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
-      return function roundAmount(_x3, _x4) {
-        return _ref4.apply(this, arguments);
+      return function roundAmount(_x4, _x5) {
+        return _ref5.apply(this, arguments);
       };
     }();
     var roundAmounts = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4(routes) {
-        return regenerator.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5(routes) {
+        return regenerator.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              return _context4.abrupt("return", Promise.all(routes.map(function (route) {
+              return _context5.abrupt("return", Promise.all(routes.map(function (route) {
                 return roundAmount(route);
               })));
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
-      return function roundAmounts(_x5) {
-        return _ref5.apply(this, arguments);
+      return function roundAmounts(_x6) {
+        return _ref6.apply(this, arguments);
       };
     }();
     var updateRouteWithNewPrice = /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5() {
-        return regenerator.wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _ref7 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee6() {
+        return regenerator.wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               setSelectedRoute(_objectSpread$2({}, updatedRouteWithNewPrice));
               setUpdatedRouteWithNewPrice(null);
             case 2:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5);
+        }, _callee6);
       }));
       return function updateRouteWithNewPrice() {
-        return _ref6.apply(this, arguments);
+        return _ref7.apply(this, arguments);
       };
     }();
+    var refreshPaymentRoutes = function refreshPaymentRoutes() {
+      return getPaymentRoutes({
+        allRoutes: allRoutes,
+        selectedRoute: selectedRoute,
+        updatable: updatable
+      });
+    };
     React.useEffect(function () {
       var timeout = setTimeout(function () {
         setReloadCount(reloadCount + 1);
@@ -22886,7 +22929,7 @@
       value: {
         selectedRoute: selectedRoute,
         setSelectedRoute: setSelectedRoute,
-        getPaymentRoutes: getPaymentRoutes,
+        refreshPaymentRoutes: refreshPaymentRoutes,
         allRoutes: allRoutes,
         setAllRoutes: setAllRoutes,
         slowRouting: slowRouting,
@@ -23602,7 +23645,7 @@
       }
     };
     var approvalButton = function approvalButton() {
-      if (payment.route == undefined || !payment.route.approvalRequired || payment.route.directTransfer) {
+      if (payment.route == undefined || !payment.route.approvalRequired || payment.route.directTransfer || updatedRouteWithNewPrice) {
         return null;
       } else if (paymentState == 'initialized') {
         return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -24936,6 +24979,8 @@
     }());
   };
 
+  var SUPPORTED_CURRENCIES = ["all", "xcd", "eur", "bbd", "btn", "bnd", "xaf", "cup", "usd", "fkp", "gip", "huf", "irr", "jmd", "aud", "lak", "lyd", "mkd", "xof", "nzd", "omr", "pgk", "rwf", "wst", "rsd", "sek", "tzs", "amd", "bsd", "bam", "cve", "cny", "crc", "czk", "ern", "gel", "htg", "inr", "jod", "krw", "lbp", "mwk", "mru", "mzn", "ang", "pen", "qar", "std", "sll", "sos", "sdg", "syp", "aoa", "awg", "bhd", "bzd", "bwp", "bif", "kyd", "cop", "dkk", "gtq", "hnl", "idr", "ils", "kzt", "kwd", "lsl", "myr", "mur", "mnt", "mmk", "ngn", "pab", "php", "ron", "sar", "sgd", "zar", "srd", "twd", "top", "vef", "dzd", "ars", "azn", "bob", "bgn", "cad", "clp", "cdf", "dop", "fjd", "gmd", "gyd", "isk", "iqd", "jpy", "kpw", "chf", "mga", "mdl", "mad", "npr", "nio", "pkr", "pyg", "shp", "scr", "sbd", "lkr", "thb", "try", "aed", "vuv", "yer", "afn", "bdt", "brl", "khr", "kmf", "hrk", "djf", "egp", "etb", "xpf", "ghs", "gnf", "hkd", "xdr", "kes", "kgs", "lrd", "mop", "mvr", "mxn", "nad", "nok", "pln", "rub", "szl", "tjs", "ttd", "ugx", "uyu", "vnd", "tnd", "uah", "uzs", "tmt", "gbp", "zmw", "byn", "bmd", "ggp", "clf", "cuc", "imp", "jep", "svc", "xag", "zwl"];
+
   var PaymentAmountRoutingContext = /*#__PURE__*/React__default["default"].createContext();
 
   var PaymentAmountRoutingProvider = (function (props) {
@@ -25011,7 +25056,8 @@
     var _useContext = React.useContext(ConfigurationContext),
       currencyCode = _useContext.currencyCode,
       recover = _useContext.recover,
-      amountConfiguration = _useContext.amount;
+      amountConfiguration = _useContext.amount,
+      currency = _useContext.currency;
     var _useContext2 = React.useContext(PaymentContext),
       payment = _useContext2.payment,
       paymentState = _useContext2.paymentState;
@@ -25125,7 +25171,7 @@
         className: "TokenSymbolCell"
       }, payment.symbol), /*#__PURE__*/React__default["default"].createElement("span", null, "\xA0"), /*#__PURE__*/React__default["default"].createElement("span", {
         className: "TokenAmountCell"
-      }, format(payment.amount))), displayedPaymentValue != "".concat(payment.symbol, " ").concat(format(payment.amount)) && !(amountsMissing && !fixedCurrency) && /*#__PURE__*/React__default["default"].createElement("div", {
+      }, format(payment.amount))), displayedPaymentValue != "".concat(payment.symbol, " ").concat(format(payment.amount)) && !(amountsMissing && !fixedCurrency) && currency !== false && /*#__PURE__*/React__default["default"].createElement("div", {
         className: "TokenAmountRow small grey"
       }, /*#__PURE__*/React__default["default"].createElement("span", {
         className: "TokenAmountCell"
@@ -25290,13 +25336,16 @@
           case 0:
             accept = _ref3.accept, amount = _ref3.amount, sent = _ref3.sent, succeeded = _ref3.succeeded, 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, wallet = _ref3.wallet, document = _ref3.document;
             requireReactVersion();
-            _context2.prev = 2;
-            _context2.next = 5;
+            if (currency && !SUPPORTED_CURRENCIES.includes(currency.toLowerCase())) {
+              currency = false;
+            }
+            _context2.prev = 3;
+            _context2.next = 6;
             return preflight$1({
               accept: accept,
               recover: recover
             });
-          case 5:
+          case 6:
             if (typeof window._depayUnmountLoading == 'function') {
               window._depayUnmountLoading();
             }
@@ -25363,18 +25412,18 @@
             return _context2.abrupt("return", {
               unmount: unmount
             });
-          case 10:
-            _context2.prev = 10;
-            _context2.t0 = _context2["catch"](2);
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
             console.log('critical error', _context2.t0);
             if (critical != undefined) {
               critical(_context2.t0);
             }
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 10]]);
+      }, _callee2, null, [[3, 11]]);
     }));
     return function Payment(_x2) {
       return _ref4.apply(this, arguments);

package/package.json

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