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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rabbitio/ui-kit",
-    "version": "1.0.0-beta.19",
+    "version": "1.0.0-beta.20",
     "description": "Rabbit.io react.js components kit",
     "type": "module",
     "main": "./dist/index.cjs",
@@ -69,6 +69,7 @@
     "prettier": {
         "trailingComma": "es5",
         "tabWidth": 4,
-        "singleQuote": false
+        "singleQuote": false,
+        "printWidth": 80
     }
 }

package/src/swaps-lib/external-apis/swapspaceSwapProvider.js

@@ -74,7 +74,8 @@ export class SwapspaceSwapProvider extends SwapProvider {
                     .filter(
                         (item) =>
                             item.withdrawal &&
-                            (!exceptCurrency || item.coin !== exceptCurrency)
+                            (!exceptCurrency ||
+                                item.coin?.ticker !== exceptCurrency?.ticker)
                     )
                     .map((item) => item.coin),
             };
@@ -158,7 +159,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
                                 [],
                                 60000,
                                 null, // We cannot recognize blockchain from swapspace data
-                                new Protocol(network), // TODO: [dev] maybe we should recognize standard protocols?
+                                code !== network ? new Protocol(network) : null, // TODO: [dev] maybe we should recognize standard protocols?
                                 item.contractAddress || null,
                                 false
                             );
@@ -209,11 +210,13 @@ export class SwapspaceSwapProvider extends SwapProvider {
     async getCoinToUSDTRate(coin) {
         const loggerSource = "getCoinToUSDTRate";
         try {
+            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._supportedCoins.find(
-                (i) => i.code === "usdt" && i.network === "trc20"
+                (i) => i.coin.ticker === "USDTTRC20"
             )?.coin;
             if (!usdtTrc20) {
                 return { result: false };
@@ -227,8 +230,9 @@ export class SwapspaceSwapProvider extends SwapProvider {
                     rate: cached,
                 };
             }
+
             Logger.log(
-                "Loading USDT -> coin rate as not found in cache:",
+                "Loading USDT->coin rate as not found in cache:",
                 coin?.ticker
             );
             const result = await this.getSwapInfo(usdtTrc20, coin, "5000");
@@ -246,7 +250,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
             this._cache.put(
                 "swapspace_usdt_rate_" + coin.ticker,
                 rate,
-                15 * 60000
+                15 * 60000 // 15 minutes
             );
             return {
                 result: true,
@@ -284,10 +288,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
                 );
             }
             const fromCoinSwapspaceDetails = this._supportedCoins.find(
-                (i) => i.coin === fromCoin
+                (i) => i.coin?.ticker === fromCoin?.ticker
             );
             const toCoinSwapspaceDetails = this._supportedCoins.find(
-                (i) => i.coin === toCoin
+                (i) => i.coin?.ticker === toCoin?.ticker
             );
             if (!fromCoinSwapspaceDetails || !toCoinSwapspaceDetails) {
                 throw new Error(
@@ -523,8 +527,9 @@ export class SwapspaceSwapProvider extends SwapProvider {
 
             await this._fetchSupportedCurrenciesIfNeeded();
             const toCurrencyExtraId =
-                this._supportedCoins.find((item) => item.coin === toCoin)
-                    ?.extraId ?? "";
+                this._supportedCoins.find(
+                    (item) => item.coin?.ticker === toCoin?.ticker
+                )?.extraId ?? "";
             const requestData = {
                 partner: partner,
                 fromCurrency: rawSwapData?.fromCurrency,
@@ -649,9 +654,12 @@ export class SwapspaceSwapProvider extends SwapProvider {
         }
     }
 
-    _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;
@@ -713,23 +721,26 @@ export class SwapspaceSwapProvider extends SwapProvider {
                         return []; // We skip swaps with not supported coins for now
                     }
 
+                    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
+                        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),
+                        expiresAt,
                         swap.confirmations,
                         AmountUtils.trim(swap.rate, this._maxRateDigits),
                         swap.refundAddress,
@@ -780,7 +791,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
     isAddressValidForAsset(asset, address) {
         try {
             const assetData = this._supportedCoins.find(
-                (i) => i.coin === asset
+                (i) => i.coin?.ticker === asset?.ticker
             );
             if (assetData) {
                 let corrected = assetData.validationRegexp.trim();