@rabbitio/ui-kit 1.0.0-beta.19 → 1.0.0-beta.20

package/dist/index.module.js

@@ -2993,7 +2993,8 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
           return {
             result: true,
             coins: _this3._supportedCoins.filter(function (item) {
-              return item.withdrawal && (!exceptCurrency || item.coin !== exceptCurrency);
+              var _item$coin, _exceptCurrency;
+              return item.withdrawal && (!exceptCurrency || ((_item$coin = item.coin) == null ? void 0 : _item$coin.ticker) !== ((_exceptCurrency = exceptCurrency) == null ? void 0 : _exceptCurrency.ticker));
             }).map(function (item) {
               return item.coin;
             })
@@ -3067,7 +3068,7 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
                   var defaultMinConfirmationsForCoinNotSupportedOOB = 1;
                   coin = new Coin(item.name, ticker, code, defaultDecimalPlacesForCoinNotSupportedOOB, null, "", null, null, defaultMinConfirmationsForCoinNotSupportedOOB, null, [], 60000, null,
                   // We cannot recognize blockchain from swapspace data
-                  new Protocol(network),
+                  code !== network ? new Protocol(network) : null,
                   // TODO: [dev] maybe we should recognize standard protocols?
                   item.contractAddress || null, false);
                 }
@@ -3117,11 +3118,11 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
       var _this6 = this;
       var loggerSource = "getCoinToUSDTRate";
       return Promise.resolve(_catch$2(function () {
-        return Promise.resolve(_this6._fetchSupportedCurrenciesIfNeeded()).then(function () {
+        return coin ? Promise.resolve(_this6._fetchSupportedCurrenciesIfNeeded()).then(function () {
           var _this6$_supportedCoin;
           // Using USDT TRC20 as usually fee in this network is smaller than ERC20 and this network is widely used for USDT
           var usdtTrc20 = (_this6$_supportedCoin = _this6._supportedCoins.find(function (i) {
-            return i.code === "usdt" && i.network === "trc20";
+            return i.coin.ticker === "USDTTRC20";
           })) == null ? void 0 : _this6$_supportedCoin.coin;
           if (!usdtTrc20) {
             return {
@@ -3135,7 +3136,7 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
               rate: cached
             };
           }
-          Logger.log("Loading USDT -> coin rate as not found in cache:", coin == null ? void 0 : coin.ticker);
+          Logger.log("Loading USDT->coin rate as not found in cache:", coin == null ? void 0 : coin.ticker);
           return Promise.resolve(_this6.getSwapInfo(usdtTrc20, coin, "5000")).then(function (result) {
             if (!result.result) {
               return {
@@ -3146,13 +3147,14 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
             // This calculation is not precise as we cannot recognize the actual fee and network fee. Just approximate.
             var standardSwapspaceFeeMultiplier = 1.002; // usually 0.2%
             var rate = BigNumber(1).div(BigNumber(result.rate).times(standardSwapspaceFeeMultiplier)).toString();
-            _this6._cache.put("swapspace_usdt_rate_" + coin.ticker, rate, 15 * 60000);
+            _this6._cache.put("swapspace_usdt_rate_" + coin.ticker, rate, 15 * 60000 // 15 minutes
+            );
             return {
               result: true,
               rate: rate
             };
           });
-        });
+        }) : null;
       }, function (e) {
         improveAndRethrow(e, loggerSource);
       }));
@@ -3162,11 +3164,11 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
   };
   _proto.getCoinByTickerIfPresent = function getCoinByTickerIfPresent(ticker) {
     try {
-      var _item$coin;
+      var _item$coin2;
       var item = this._supportedCoins.find(function (i) {
         return i.coin.ticker === ticker;
       });
-      return (_item$coin = item == null ? void 0 : item.coin) != null ? _item$coin : null;
+      return (_item$coin2 = item == null ? void 0 : item.coin) != null ? _item$coin2 : null;
     } catch (e) {
       improveAndRethrow(e, "getCoinByTickerIfPresent");
     }
@@ -3183,10 +3185,12 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
           throw new Error("Wrong input params: " + amountCoins + " " + fromCoin.ticker + " -> " + toCoin.ticker + (fromCoin instanceof Coin) + (toCoin instanceof Coin));
         }
         var fromCoinSwapspaceDetails = _this7._supportedCoins.find(function (i) {
-          return i.coin === fromCoin;
+          var _i$coin;
+          return ((_i$coin = i.coin) == null ? void 0 : _i$coin.ticker) === (fromCoin == null ? void 0 : fromCoin.ticker);
         });
         var toCoinSwapspaceDetails = _this7._supportedCoins.find(function (i) {
-          return i.coin === toCoin;
+          var _i$coin2;
+          return ((_i$coin2 = i.coin) == null ? void 0 : _i$coin2.ticker) === (toCoin == null ? void 0 : toCoin.ticker);
         });
         if (!fromCoinSwapspaceDetails || !toCoinSwapspaceDetails) {
           throw new Error("Failed to find swapspace coin details for: " + fromCoin.ticker + " -> " + toCoin.ticker);
@@ -3319,7 +3323,8 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
         return Promise.resolve(_this8._fetchSupportedCurrenciesIfNeeded()).then(function () {
           var _this8$_supportedCoin, _this8$_supportedCoin2;
           var toCurrencyExtraId = (_this8$_supportedCoin = (_this8$_supportedCoin2 = _this8._supportedCoins.find(function (item) {
-            return item.coin === toCoin;
+            var _item$coin3;
+            return ((_item$coin3 = item.coin) == null ? void 0 : _item$coin3.ticker) === (toCoin == null ? void 0 : toCoin.ticker);
           })) == null ? void 0 : _this8$_supportedCoin2.extraId) != null ? _this8$_supportedCoin : "";
           var requestData = {
             partner: partner,
@@ -3399,9 +3404,12 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
       return Promise.reject(e);
     }
   };
-  _proto._mapSwapspaceStatusToRabbitStatus = function _mapSwapspaceStatusToRabbitStatus(status) {
+  _proto._mapSwapspaceStatusToRabbitStatus = function _mapSwapspaceStatusToRabbitStatus(status, isExpiredByTime) {
     switch (status) {
       case "waiting":
+        if (isExpiredByTime) {
+          return SwapProvider.SWAP_STATUSES.EXPIRED;
+        }
         return SwapProvider.SWAP_STATUSES.WAITING_FOR_PAYMENT;
       case "confirming":
         return SwapProvider.SWAP_STATUSES.CONFIRMING;
@@ -3463,13 +3471,15 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
             if (!fromCoin || !toCoin) {
               return []; // We skip swaps with not supported coins for now
             }
-            var status = _this9._mapSwapspaceStatusToRabbitStatus(swap.status);
-            var toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
-            var addressToSendCoinsToSwapspace = swap.from.address;
             var toUtcTimestamp = function toUtcTimestamp(timeStr) {
               return Date.parse(timeStr.match(/.+[Zz]$/) ? timeStr : timeStr + "Z");
             };
-            return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), toUtcTimestamp(swap.timestamps.expiresAt), swap.confirmations, AmountUtils.trim(swap.rate, _this9._maxRateDigits), swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, swap.blockExplorerTransactionUrl.to, swap.to.address, swap.partner);
+            var expiresAt = toUtcTimestamp(swap.timestamps.expiresAt);
+            var isExpiredByTime = expiresAt > Date.now();
+            var status = _this9._mapSwapspaceStatusToRabbitStatus(swap.status, isExpiredByTime);
+            var toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
+            var addressToSendCoinsToSwapspace = swap.from.address;
+            return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, _this9._maxRateDigits), swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, swap.blockExplorerTransactionUrl.to, swap.to.address, swap.partner);
           }).flat();
           Logger.log("Swap details result " + safeStringify(swaps), loggerSource);
           return {
@@ -3501,7 +3511,8 @@ var SwapspaceSwapProvider = /*#__PURE__*/function (_SwapProvider) {
   _proto.isAddressValidForAsset = function isAddressValidForAsset(asset, address) {
     try {
       var assetData = this._supportedCoins.find(function (i) {
-        return i.coin === asset;
+        var _i$coin3;
+        return ((_i$coin3 = i.coin) == null ? void 0 : _i$coin3.ticker) === (asset == null ? void 0 : asset.ticker);
       });
       if (assetData) {
         var corrected = assetData.validationRegexp.trim();