@rabbitio/ui-kit 1.0.0-beta.16 → 1.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rabbitio/ui-kit",
-    "version": "1.0.0-beta.16",
+    "version": "1.0.0-beta.17",
     "description": "Rabbit.io react.js components kit",
     "type": "module",
     "main": "./dist/index.cjs",

package/src/common/utils/logging/logger.js

@@ -39,7 +39,7 @@ export class Logger {
 
         const finalErrorText = message + ". " + safeStringify(e);
         // eslint-disable-next-line no-console
-        console.error(finalErrorText);
+        console.error(finalErrorText, e);
 
         if (!onlyToConsole) {
             this.log(finalErrorText, "logError");

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

@@ -597,9 +597,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
             Logger.log(errorMessage, loggerSource);
             throw new Error(errorMessage);
         } catch (e) {
-            Logger.log(
-                `Failed to create swap. Error is: ${safeStringify(e)}`,
-                loggerSource
+            Logger.logError(
+                e,
+                loggerSource,
+                `Failed to create swap. Error is: ${safeStringify(e)}`
             );
             const composeFailResult = (reason) => ({
                 result: false,
@@ -752,9 +753,10 @@ export class SwapspaceSwapProvider extends SwapProvider {
             );
             return { result: true, swaps: swaps };
         } catch (e) {
-            Logger.log(
-                `Failed to get swap details. Error is: ${safeStringify(e)}`,
-                loggerSource
+            Logger.logError(
+                e,
+                loggerSource,
+                `Failed to get swap details. Error is: ${safeStringify(e)}`
             );
             const composeFailResult = (reason) => ({
                 result: false,

package/src/swaps-lib/services/publicSwapService.js

@@ -1,4 +1,5 @@
 import { BigNumber } from "bignumber.js";
+import EventBusInstance from "eventbusjs";
 
 import { FiatCurrenciesService } from "../../common/fiatCurrenciesService.js";
 import { improveAndRethrow } from "../../common/errorUtils.js";
@@ -39,7 +40,6 @@ export class PublicSwapService {
     async initialize() {
         try {
             await this._swapProvider.initialize();
-            SwapUtils.safeHandleRequestsLimitExceeding();
         } catch (e) {
             Logger.logError(e, "PublicSwapService.initialize");
         }
@@ -61,7 +61,7 @@ export class PublicSwapService {
                 SwapUtils.safeHandleRequestsLimitExceeding();
                 return {
                     result: false,
-                    reason: this.PUBLIC_SWAPS_COMMON_ERRORS
+                    reason: PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS
                         .REQUESTS_LIMIT_EXCEEDED,
                 };
             }
@@ -115,7 +115,7 @@ export class PublicSwapService {
                     SwapUtils.safeHandleRequestsLimitExceeding();
                     return {
                         result: false,
-                        reason: this.PUBLIC_SWAPS_COMMON_ERRORS
+                        reason: PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS
                             .REQUESTS_LIMIT_EXCEEDED,
                     };
                 }
@@ -125,7 +125,8 @@ export class PublicSwapService {
                 ) {
                     return {
                         result: false,
-                        reason: this.PUBLIC_SWAP_DETAILS_FAIL_REASONS
+                        reason: PublicSwapService
+                            .PUBLIC_SWAP_DETAILS_FAIL_REASONS
                             .PAIR_NOT_SUPPORTED,
                     };
                 }
@@ -175,12 +176,12 @@ export class PublicSwapService {
                 if (min != null) {
                     fiatMin = BigNumber(min)
                         .times(coinUsdtRate)
-                        .toFixed(this._fiatDecimalsCount);
+                        .toFixed(PublicSwapService._fiatDecimalsCount);
                 }
                 if (max != null) {
                     fiatMax = BigNumber(max)
                         .times(coinUsdtRate)
-                        .toFixed(this._fiatDecimalsCount);
+                        .toFixed(PublicSwapService._fiatDecimalsCount);
                 }
             }
 
@@ -200,7 +201,8 @@ export class PublicSwapService {
                     SwapProvider.NO_SWAPS_REASONS.NOT_SUPPORTED
                 )
                     return composeFailResult(
-                        this.PUBLIC_SWAP_DETAILS_FAIL_REASONS.PAIR_NOT_SUPPORTED
+                        PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS
+                            .PAIR_NOT_SUPPORTED
                     );
                 else if (
                     details?.reason ===
@@ -208,7 +210,8 @@ export class PublicSwapService {
                 ) {
                     SwapUtils.safeHandleRequestsLimitExceeding();
                     return composeFailResult(
-                        this.PUBLIC_SWAPS_COMMON_ERRORS.REQUESTS_LIMIT_EXCEEDED
+                        PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS
+                            .REQUESTS_LIMIT_EXCEEDED
                     );
                 }
             }
@@ -216,12 +219,12 @@ export class PublicSwapService {
             const fromAmountBigNumber = BigNumber(fromAmountCoins);
             if (typeof min === "string" && fromAmountBigNumber.lt(min)) {
                 return composeFailResult(
-                    this.PUBLIC_SWAP_DETAILS_FAIL_REASONS
+                    PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS
                         .AMOUNT_LESS_THAN_MIN_SWAPPABLE
                 );
             } else if (typeof max === "string" && fromAmountBigNumber.gt(max)) {
                 return composeFailResult(
-                    this.PUBLIC_SWAP_DETAILS_FAIL_REASONS
+                    PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS
                         .AMOUNT_HIGHER_THAN_MAX_SWAPPABLE
                 );
             }
@@ -273,6 +276,7 @@ export class PublicSwapService {
      * @param swapCreationInfo {BaseSwapCreationInfo}
      * @param toAddress {string}
      * @param refundAddress {string}
+     * @param clientIp {string}
      * @return {Promise<{
      *             result: true,
      *             fiatCurrencyCode: string,
@@ -351,7 +355,7 @@ export class PublicSwapService {
                     SwapUtils.safeHandleRequestsLimitExceeding();
                     return {
                         result: false,
-                        reason: this.PUBLIC_SWAPS_COMMON_ERRORS
+                        reason: PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS
                             .REQUESTS_LIMIT_EXCEEDED,
                     };
                 }
@@ -362,7 +366,7 @@ export class PublicSwapService {
                     // TODO: [feature, high] implement retrying if one partner fail and we have another partners task_id=a07e367e488f4a4899613ac9056fa359
                     // return {
                     //     result: false,
-                    //     reason: this.SWAP_CREATION_FAIL_REASONS.RETRIABLE_FAIL,
+                    //     reason: PublicSwapService.SWAP_CREATION_FAIL_REASONS.RETRIABLE_FAIL,
                     // };
                 }
             }
@@ -379,12 +383,12 @@ export class PublicSwapService {
                     if (fromCoinUsdtRate != null && result.fromAmount != null) {
                         fromAmountFiat = BigNumber(result.fromAmount)
                             .times(fromCoinUsdtRate)
-                            .toFixed(this._fiatDecimalsCount);
+                            .toFixed(PublicSwapService._fiatDecimalsCount);
                     }
                     if (toCoinUsdtRate != null && result.toAmount != null) {
                         toAmountFiat = BigNumber(result.toAmount)
                             .times(toCoinUsdtRate)
-                            .toFixed(this._fiatDecimalsCount);
+                            .toFixed(PublicSwapService._fiatDecimalsCount);
                     }
                 } catch (e) {
                     Logger.logError(
@@ -395,7 +399,7 @@ export class PublicSwapService {
                 }
 
                 EventBusInstance.dispatch(
-                    this.PUBLIC_SWAP_CREATED_EVENT,
+                    PublicSwapService.PUBLIC_SWAP_CREATED_EVENT,
                     null,
                     fromCoin.ticker,
                     toCoin.ticker,
@@ -412,7 +416,7 @@ export class PublicSwapService {
                     fromAmountFiat: fromAmountFiat,
                     toAmountFiat: toAmountFiat,
                     fiatCurrencyCode: "USD",
-                    fiatCurrencyDecimals: this._fiatDecimalsCount,
+                    fiatCurrencyDecimals: PublicSwapService._fiatDecimalsCount,
                     rate: result.rate,
                     durationMinutesRange: swapCreationInfo.durationMinutesRange,
                     address: result.fromAddress, // CRITICAL: this is the address to send coins to swaps provider
@@ -468,7 +472,7 @@ export class PublicSwapService {
                     SwapUtils.safeHandleRequestsLimitExceeding();
                     return {
                         result: false,
-                        reason: this.PUBLIC_SWAPS_COMMON_ERRORS
+                        reason: PublicSwapService.PUBLIC_SWAPS_COMMON_ERRORS
                             .REQUESTS_LIMIT_EXCEEDED,
                     };
                 }

package/src/swaps-lib/utils/swapUtils.js

@@ -103,9 +103,10 @@ export class SwapUtils {
             Logger.log(`Returning: ${safeStringify(result)}`, loggerSource);
             return result;
         } catch (e) {
-            Logger.log(
-                `Failed to init swap: ${safeStringify(e)}`,
-                loggerSource
+            Logger.logError(
+                e,
+                loggerSource,
+                `Failed to init swap: ${safeStringify(e)}`
             );
             improveAndRethrow(e, loggerSource);
         }