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

package/package.json

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

package/src/components/hooks/useCallHandlingErrors.js

@@ -0,0 +1,26 @@
+import { useCallback, useState } from "react";
+
+import { Logger } from "../../common/utils/logging/logger.js";
+
+export function useCallHandlingErrors() {
+    const [, setState] = useState();
+    return useCallback(
+        async (functionToBeCalled, event) => {
+            try {
+                await functionToBeCalled(event);
+            } catch (error) {
+                Logger.logError(
+                    error,
+                    functionToBeCalled?.name || "errorBoundaryTrigger",
+                    "Caught by ErrorBoundary"
+                );
+                // Triggering ErrorBoundary
+                setState(() => {
+                    throw error;
+                });
+            }
+        },
+
+        []
+    );
+}

package/src/components/hooks/useReferredState.js

@@ -0,0 +1,24 @@
+import React from "react";
+
+/**
+ * Adds reference to standard state variable. It is helpful to be able to use state variable value inside
+ * event handlers and other callbacks without the need to call setState(prev => { value = prev; return prev; }).
+ *
+ * @param initialValue {any} to be passed to useState
+ * @return {[React.Ref, function]} reference to state variable and its setter
+ */
+export function useReferredState(initialValue) {
+    const [state, setState] = React.useState(initialValue);
+    const reference = React.useRef(state);
+
+    const setReferredState = (value) => {
+        if (value && {}.toString.call(value) === "[object Function]") {
+            value = value(reference.current);
+        }
+
+        reference.current = value;
+        setState(value);
+    };
+
+    return [reference, setReferredState];
+}

package/src/index.js

@@ -4,6 +4,9 @@ export { LoadingDots } from "./components/atoms/LoadingDots/LoadingDots.jsx";
 export { SupportChat } from "./components/atoms/SupportChat/SupportChat.jsx";
 export { AssetIcon } from "./components/atoms/AssetIcon/AssetIcon.jsx";
 
+export { useCallHandlingErrors } from "./components/hooks/useCallHandlingErrors.js";
+export { useReferredState } from "./components/hooks/useReferredState.js";
+
 // Common code lib (to be extracted later to dedicated lib)
 export { improveAndRethrow } from "./common/errorUtils.js";
 export { FiatCurrenciesService } from "./common/fiatCurrenciesService.js";
@@ -23,7 +26,7 @@ export { EmailsApi } from "./common/utils/emailAPI.js";
 // Swaps lib (to be extracted later to dedicated lib)
 export { ExistingSwap } from "./swaps-lib/models/existingSwap.js";
 export { ExistingSwapWithFiatData } from "./swaps-lib/models/existingSwapWithFiatData.js";
-export { PublicSwapCreationInfo } from "./swaps-lib/models/publicSwapCreationInfo.js";
+export { BaseSwapCreationInfo } from "./swaps-lib/models/baseSwapCreationInfo.js";
 export { SwapProvider } from "./swaps-lib/external-apis/swapProvider.js";
 export { SwapspaceSwapProvider } from "./swaps-lib/external-apis/swapspaceSwapProvider.js";
 export { SwapUtils } from "./swaps-lib/utils/swapUtils.js";

package/src/swaps-lib/models/{publicSwapCreationInfo.js → baseSwapCreationInfo.js}

@@ -1,4 +1,4 @@
-export class PublicSwapCreationInfo {
+export class BaseSwapCreationInfo {
     /**
      * @param fromCoin {Coin}
      * @param toCoin {Coin}

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

@@ -1,33 +1,19 @@
 import { BigNumber } from "bignumber.js";
-import EventBusInstance from "eventbusjs";
 
-import { Cache } from "../../common/utils/cache.js";
 import { FiatCurrenciesService } from "../../common/fiatCurrenciesService.js";
 import { improveAndRethrow } from "../../common/errorUtils.js";
 import { safeStringify } from "../../common/utils/safeStringify.js";
 import { Logger } from "../../common/utils/logging/logger.js";
 import { Coin } from "../../common/models/coin.js";
 import { AmountUtils } from "../../common/amountUtils.js";
-import { PublicSwapCreationInfo } from "../models/publicSwapCreationInfo.js";
+import { BaseSwapCreationInfo } from "../models/baseSwapCreationInfo.js";
 import { SwapUtils } from "../utils/swapUtils.js";
 import { SwapspaceSwapProvider } from "../external-apis/swapspaceSwapProvider.js";
 import { SwapProvider } from "../external-apis/swapProvider.js";
 
-const API_KEYS_PROXY_URL = `${
-    window.location.protocol + "//" + window.location.host
-}/api/v1/proxy`;
-const cache = new Cache(EventBusInstance);
-
 export class PublicSwapService {
     static PUBLIC_SWAP_CREATED_EVENT = "publicSwapCreatedEvent";
 
-    static _swapProvider = new SwapspaceSwapProvider(
-        API_KEYS_PROXY_URL,
-        cache,
-        () => null,
-        false
-    );
-
     static PUBLIC_SWAPS_COMMON_ERRORS = {
         REQUESTS_LIMIT_EXCEEDED: "requestsLimitExceeded",
     };
@@ -41,7 +27,16 @@ export class PublicSwapService {
     static _fiatDecimalsCount =
         FiatCurrenciesService.getCurrencyDecimalCountByCode("USD");
 
-    static async initialize() {
+    constructor(API_KEYS_PROXY_URL, cache) {
+        this._swapProvider = new SwapspaceSwapProvider(
+            API_KEYS_PROXY_URL,
+            cache,
+            () => null,
+            false
+        );
+    }
+
+    async initialize() {
         try {
             await this._swapProvider.initialize();
             SwapUtils.safeHandleRequestsLimitExceeding();
@@ -50,9 +45,7 @@ export class PublicSwapService {
         }
     }
 
-    static async getCurrenciesListForPublicSwap(
-        currencyThatShouldNotBeFirst = null
-    ) {
+    async getCurrenciesListForPublicSwap(currencyThatShouldNotBeFirst = null) {
         const loggerSource = "getCurrenciesListForPublicSwap";
         try {
             // TODO: [dev] this is temporary hack, change it to use dedicated lists inside UI and also here
@@ -107,7 +100,7 @@ export class PublicSwapService {
      *             reason: string
      *         }>}
      */
-    static async getInitialPublicSwapData(fromCoin, toCoin) {
+    async getInitialPublicSwapData(fromCoin, toCoin) {
         try {
             const result = await SwapUtils.getInitialSwapData(
                 this._swapProvider,
@@ -159,10 +152,10 @@ export class PublicSwapService {
      *             fiatMax: (number|null)
      *         }|{
      *             result: true,
-     *             swapCreationInfo: PublicSwapCreationInfo
+     *             swapCreationInfo: BaseSwapCreationInfo
      *         }>}
      */
-    static async getPublicSwapDetails(fromCoin, toCoin, fromAmountCoins) {
+    async getPublicSwapDetails(fromCoin, toCoin, fromAmountCoins) {
         const loggerSource = "getPublicSwapDetails";
         try {
             const coinUsdtRate =
@@ -239,7 +232,7 @@ export class PublicSwapService {
             );
             const result = {
                 result: true,
-                swapCreationInfo: new PublicSwapCreationInfo(
+                swapCreationInfo: new BaseSwapCreationInfo(
                     fromCoin,
                     toCoin,
                     fromAmountCoins,
@@ -277,7 +270,7 @@ export class PublicSwapService {
      * @param fromCoin {Coin}
      * @param toCoin {Coin}
      * @param fromAmount {string}
-     * @param swapCreationInfo {PublicSwapCreationInfo}
+     * @param swapCreationInfo {BaseSwapCreationInfo}
      * @param toAddress {string}
      * @param refundAddress {string}
      * @return {Promise<{
@@ -299,7 +292,7 @@ export class PublicSwapService {
      *             reason: string
      *         }>}
      */
-    static async createPublicSwap(
+    async createPublicSwap(
         fromCoin,
         toCoin,
         fromAmount,
@@ -316,7 +309,7 @@ export class PublicSwapService {
                 typeof fromAmount !== "string" ||
                 typeof toAddress !== "string" ||
                 typeof refundAddress !== "string" ||
-                !(swapCreationInfo instanceof PublicSwapCreationInfo)
+                !(swapCreationInfo instanceof BaseSwapCreationInfo)
             ) {
                 throw new Error(
                     `Wrong input: ${fromCoin.ticker} ${toCoin.ticker} ${fromAmount} ${swapCreationInfo}`
@@ -459,7 +452,7 @@ export class PublicSwapService {
      *         }>}
      *         error reason is one of PUBLIC_SWAPS_COMMON_ERRORS
      */
-    static async getPublicExistingSwapDetailsAndStatus(swapIds) {
+    async getPublicExistingSwapDetailsAndStatus(swapIds) {
         const loggerSource = "getPublicExistingSwapDetailsAndStatus";
         try {
             const result =
@@ -499,7 +492,7 @@ export class PublicSwapService {
      *             reason: string
      *         }>}
      */
-    static async getPublicSwapsHistory() {
+    async getPublicSwapsHistory() {
         try {
             const swapIds = this._getPublicSwapIdsSavedLocally();
             if (swapIds.length) {
@@ -517,7 +510,7 @@ export class PublicSwapService {
      * @param swapId {string}
      * @private
      */
-    static _savePublicSwapIdLocally(swapId) {
+    _savePublicSwapIdLocally(swapId) {
         if (typeof window !== "undefined") {
             try {
                 const saved = localStorage.getItem("publicSwapIds");
@@ -537,7 +530,7 @@ export class PublicSwapService {
      * @private
      * @return {string[]}
      */
-    static _getPublicSwapIdsSavedLocally() {
+    _getPublicSwapIdsSavedLocally() {
         if (typeof window !== "undefined") {
             try {
                 const saved = localStorage.getItem("publicSwapIds");
@@ -554,7 +547,7 @@ export class PublicSwapService {
      * @param coinOrTicker {Coin|string}
      * @return {string} icon URL (ready to use)
      */
-    static getAssetIconUrl(coinOrTicker) {
+    getAssetIconUrl(coinOrTicker) {
         return this._swapProvider.getIconUrl(coinOrTicker);
     }
 
@@ -562,7 +555,7 @@ export class PublicSwapService {
      * @param ticker {string}
      * @return {Coin|null}
      */
-    static getCoinByTickerIfPresent(ticker) {
+    getCoinByTickerIfPresent(ticker) {
         return this._swapProvider.getCoinByTickerIfPresent(ticker);
     }
 
@@ -571,7 +564,7 @@ export class PublicSwapService {
      * @param asset {Coin}
      * @return {Promise<string|null>}
      */
-    static async getAssetToUsdtRate(asset) {
+    async getAssetToUsdtRate(asset) {
         try {
             const result = await this._swapProvider.getCoinToUSDTRate(asset);
             return result?.rate ?? null;
@@ -585,49 +578,11 @@ export class PublicSwapService {
      * @param address {string}
      * @return {boolean}
      */
-    static isAddressValidForAsset(asset, address) {
+    isAddressValidForAsset(asset, address) {
         try {
             return this._swapProvider.isAddressValidForAsset(asset, address);
         } catch (e) {
             improveAndRethrow(e, "isAddressValidForAsset");
         }
     }
-
-    // TODO: [dev] Remove if we don't need this inside the public swap steps
-    // /**
-    //  * TODO: [feature, moderate] add other fiat currencies support. task_id=5490e21b8b9c4f89a2247b28db3c9e0a
-    //  * @param asset {Coin}
-    //  * @param amount {string}
-    //  * @return {Promise<string|null>}
-    //  */
-    // static async convertSingleCoinAmountToUsdtOrNull(asset, amount) {
-    //     try {
-    //         const result = await this._swapProvider.getCoinToUSDTRate(asset);
-    //         if (result?.rate != null) {
-    //             const decimals = FiatCurrenciesService.getCurrencyDecimalCountByCode("USD");
-    //             return BigNumber(amount).div(result?.rate).toFixed(decimals);
-    //         }
-    //         return null;
-    //     } catch (e) {
-    //         improveAndRethrow(e, "convertSingleCoinAmountToUsdtOrNull");
-    //     }
-    // }
-    //
-    // /**
-    //  * TODO: [feature, moderate] add other fiat currencies support. task_id=5490e21b8b9c4f89a2247b28db3c9e0a
-    //  * @param asset {Coin}
-    //  * @param amount {string}
-    //  * @return {Promise<string|null>}
-    //  */
-    // static async convertSingleUsdtAmountToCoinOrNull(asset, amount) {
-    //     try {
-    //         const result = await this._swapProvider.getCoinToUSDTRate(asset);
-    //         if (result?.rate != null) {
-    //             return BigNumber(amount).times(result?.rate).toFixed(asset.digits);
-    //         }
-    //         return null;
-    //     } catch (e) {
-    //         improveAndRethrow(e, "convertSingleUsdtAmountToCoinOrNull");
-    //     }
-    // }
 }