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

package/dist/index.modern.js

@@ -2695,7 +2695,10 @@ class SwapspaceSwapProvider extends SwapProvider {
       Logger.log(`We have ${(_this$_supportedCoins2 = this._supportedCoins) == null ? void 0 : _this$_supportedCoins2.length} supported coins, getting withdrawable`, loggerSource);
       return {
         result: true,
-        coins: this._supportedCoins.filter(item => item.withdrawal && (!exceptCurrency || item.coin !== exceptCurrency)).map(item => item.coin)
+        coins: this._supportedCoins.filter(item => {
+          var _item$coin;
+          return item.withdrawal && (!exceptCurrency || ((_item$coin = item.coin) == null ? void 0 : _item$coin.ticker) !== (exceptCurrency == null ? void 0 : exceptCurrency.ticker));
+        }).map(item => item.coin)
       };
     } catch (e) {
       var _e$response2;
@@ -2751,7 +2754,7 @@ class SwapspaceSwapProvider extends SwapProvider {
             const 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);
           }
@@ -2794,10 +2797,11 @@ class SwapspaceSwapProvider extends SwapProvider {
     const loggerSource = "getCoinToUSDTRate";
     try {
       var _this$_supportedCoins7;
+      if (!coin) return null;
       await this._fetchSupportedCurrenciesIfNeeded();
 
       // Using USDT TRC20 as usually fee in this network is smaller than ERC20 and this network is widely used for USDT
-      const usdtTrc20 = (_this$_supportedCoins7 = this._supportedCoins.find(i => i.code === "usdt" && i.network === "trc20")) == null ? void 0 : _this$_supportedCoins7.coin;
+      const usdtTrc20 = (_this$_supportedCoins7 = this._supportedCoins.find(i => i.coin.ticker === "USDTTRC20")) == null ? void 0 : _this$_supportedCoins7.coin;
       if (!usdtTrc20) {
         return {
           result: false
@@ -2810,7 +2814,7 @@ class SwapspaceSwapProvider extends 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);
       const result = await this.getSwapInfo(usdtTrc20, coin, "5000");
       if (!result.result) {
         return {
@@ -2821,7 +2825,8 @@ class SwapspaceSwapProvider extends SwapProvider {
       // This calculation is not precise as we cannot recognize the actual fee and network fee. Just approximate.
       const standardSwapspaceFeeMultiplier = 1.002; // usually 0.2%
       const rate = BigNumber(1).div(BigNumber(result.rate).times(standardSwapspaceFeeMultiplier)).toString();
-      this._cache.put("swapspace_usdt_rate_" + coin.ticker, rate, 15 * 60000);
+      this._cache.put("swapspace_usdt_rate_" + coin.ticker, rate, 15 * 60000 // 15 minutes
+      );
       return {
         result: true,
         rate: rate
@@ -2832,9 +2837,9 @@ class SwapspaceSwapProvider extends SwapProvider {
   }
   getCoinByTickerIfPresent(ticker) {
     try {
-      var _item$coin;
+      var _item$coin2;
       const item = this._supportedCoins.find(i => 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");
     }
@@ -2846,8 +2851,14 @@ class SwapspaceSwapProvider extends SwapProvider {
       if (!(fromCoin instanceof Coin) || !(toCoin instanceof Coin) || typeof amountCoins !== "string" || BigNumber(amountCoins).lt("0")) {
         throw new Error(`Wrong input params: ${amountCoins} ${fromCoin.ticker} -> ${toCoin.ticker}` + (fromCoin instanceof Coin) + (toCoin instanceof Coin));
       }
-      const fromCoinSwapspaceDetails = this._supportedCoins.find(i => i.coin === fromCoin);
-      const toCoinSwapspaceDetails = this._supportedCoins.find(i => i.coin === toCoin);
+      const fromCoinSwapspaceDetails = this._supportedCoins.find(i => {
+        var _i$coin;
+        return ((_i$coin = i.coin) == null ? void 0 : _i$coin.ticker) === (fromCoin == null ? void 0 : fromCoin.ticker);
+      });
+      const toCoinSwapspaceDetails = this._supportedCoins.find(i => {
+        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);
       }
@@ -2959,7 +2970,10 @@ class SwapspaceSwapProvider extends SwapProvider {
         throw new Error(`Invalid raw swap data: ${safeStringify(rawSwapData)}`);
       }
       await this._fetchSupportedCurrenciesIfNeeded();
-      const toCurrencyExtraId = (_this$_supportedCoins8 = (_this$_supportedCoins9 = this._supportedCoins.find(item => item.coin === toCoin)) == null ? void 0 : _this$_supportedCoins9.extraId) != null ? _this$_supportedCoins8 : "";
+      const toCurrencyExtraId = (_this$_supportedCoins8 = (_this$_supportedCoins9 = this._supportedCoins.find(item => {
+        var _item$coin3;
+        return ((_item$coin3 = item.coin) == null ? void 0 : _item$coin3.ticker) === (toCoin == null ? void 0 : toCoin.ticker);
+      })) == null ? void 0 : _this$_supportedCoins9.extraId) != null ? _this$_supportedCoins8 : "";
       const requestData = {
         partner: partner,
         fromCurrency: rawSwapData == null ? void 0 : rawSwapData.fromCurrency,
@@ -3029,9 +3043,12 @@ class SwapspaceSwapProvider extends SwapProvider {
       improveAndRethrow(e, loggerSource);
     }
   }
-  _mapSwapspaceStatusToRabbitStatus(status) {
+  _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;
@@ -3078,11 +3095,13 @@ class SwapspaceSwapProvider extends SwapProvider {
         if (!fromCoin || !toCoin) {
           return []; // We skip swaps with not supported coins for now
         }
-        const status = this._mapSwapspaceStatusToRabbitStatus(swap.status);
+        const toUtcTimestamp = timeStr => Date.parse(timeStr.match(/.+[Zz]$/) ? timeStr : `${timeStr}Z`);
+        const expiresAt = toUtcTimestamp(swap.timestamps.expiresAt);
+        const isExpiredByTime = expiresAt > Date.now();
+        const status = this._mapSwapspaceStatusToRabbitStatus(swap.status, isExpiredByTime);
         const toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
         const addressToSendCoinsToSwapspace = swap.from.address;
-        const toUtcTimestamp = timeStr => 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, this._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);
+        return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, this._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 {
@@ -3107,7 +3126,10 @@ class SwapspaceSwapProvider extends SwapProvider {
   }
   isAddressValidForAsset(asset, address) {
     try {
-      const assetData = this._supportedCoins.find(i => i.coin === asset);
+      const assetData = this._supportedCoins.find(i => {
+        var _i$coin3;
+        return ((_i$coin3 = i.coin) == null ? void 0 : _i$coin3.ticker) === (asset == null ? void 0 : asset.ticker);
+      });
       if (assetData) {
         let corrected = assetData.validationRegexp.trim();
         corrected = corrected[0] === "/" ? corrected.slice(1) : corrected;