@depay/widgets 12.3.16 → 12.3.18

package/dist/umd/index.js

@@ -25724,7 +25724,7 @@
     var pay = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
         var _transaction$params;
-        var transaction, stop, currentBlock;
+        var transaction, stop, currentBlock, deadline;
         return regenerator.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -25763,8 +25763,9 @@
               });
             case 18:
               currentBlock = _context2.sent;
-              _context2.next = 21;
-              return trace(currentBlock, payment.route, transaction, transaction === null || transaction === void 0 || (_transaction$params = transaction.params) === null || _transaction$params === void 0 || (_transaction$params = _transaction$params.payment) === null || _transaction$params === void 0 ? void 0 : _transaction$params.deadline).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+              deadline = transaction.deadline || (transaction === null || transaction === void 0 || (_transaction$params = transaction.params) === null || _transaction$params === void 0 || (_transaction$params = _transaction$params.payment) === null || _transaction$params === void 0 ? void 0 : _transaction$params.deadline);
+              _context2.next = 22;
+              return trace(currentBlock, payment.route, transaction, deadline).then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
                 return regenerator.wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -25772,8 +25773,7 @@
                       _context.next = 3;
                       return wallet.sendTransaction(Object.assign({}, transaction, {
                         sent: function sent(sentTransaction) {
-                          var _transaction$params2;
-                          initializeTransactionTracking(sentTransaction, currentBlock, transaction === null || transaction === void 0 || (_transaction$params2 = transaction.params) === null || _transaction$params2 === void 0 || (_transaction$params2 = _transaction$params2.payment) === null || _transaction$params2 === void 0 ? void 0 : _transaction$params2.deadline);
+                          initializeTransactionTracking(sentTransaction, currentBlock, deadline);
                           if (_sent) {
                             _sent(sentTransaction);
                           }
@@ -25781,9 +25781,8 @@
                         succeeded: paymentSucceeded,
                         failed: paymentFailed
                       })).then(function (sentTransaction) {
-                        var _transaction$params3;
                         setTransaction(sentTransaction);
-                        initializePaymentTracking(sentTransaction, currentBlock, payment.route, transaction === null || transaction === void 0 || (_transaction$params3 = transaction.params) === null || _transaction$params3 === void 0 || (_transaction$params3 = _transaction$params3.payment) === null || _transaction$params3 === void 0 ? void 0 : _transaction$params3.deadline);
+                        initializePaymentTracking(sentTransaction, currentBlock, payment.route, deadline);
                       })["catch"](function (error) {
                         console.log('error', error);
                         setPaymentState('initialized');
@@ -25805,7 +25804,7 @@
                 setUpdatable(true);
                 navigate('TracingFailed');
               });
-            case 21:
+            case 22:
             case "end":
               return _context2.stop();
           }
@@ -27211,7 +27210,7 @@
   }();
   var getNonce = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3(_ref5) {
-      var blockchain, transaction, account, wallet, _transaction$nonce, paymentsAccountData;
+      var blockchain, transaction, account, wallet, _transaction$nonce, _transaction$nonce2, paymentsAccountData;
       return regenerator.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -27241,27 +27240,33 @@
           case 10:
             return _context3.abrupt("return", _context3.sent.toString());
           case 11:
-            _context3.next = 22;
+            _context3.next = 24;
             break;
           case 13:
             if (!supported.solana.includes(blockchain)) {
-              _context3.next = 22;
+              _context3.next = 24;
+              break;
+            }
+            if (!(transaction && transaction !== null && transaction !== void 0 && transaction.nonce)) {
+              _context3.next = 16;
               break;
             }
-            _context3.next = 16;
+            return _context3.abrupt("return", transaction === null || transaction === void 0 || (_transaction$nonce2 = transaction.nonce) === null || _transaction$nonce2 === void 0 ? void 0 : _transaction$nonce2.toString());
+          case 16:
+            _context3.next = 18;
             return getPaymentsAccountData({
               account: account
             });
-          case 16:
+          case 18:
             paymentsAccountData = _context3.sent;
             if (!paymentsAccountData) {
-              _context3.next = 21;
+              _context3.next = 23;
               break;
             }
             return _context3.abrupt("return", paymentsAccountData.nonce.toString());
-          case 21:
+          case 23:
             return _context3.abrupt("return", '0');
-          case 22:
+          case 24:
           case "end":
             return _context3.stop();
         }