@rabbitio/ui-kit 1.0.0-beta.80 → 1.0.0-beta.82

package/package.json

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

package/src/common-apis/adapters/analyticsAdapters/googleAnalyticsAdapter.js

@@ -0,0 +1,21 @@
+import { Logger } from "../../utils/logging/logger.js";
+import { safeStringify } from "../../utils/safeStringify.js";
+
+export class GoogleAnalyticsAdapter {
+    static sendEvent(eventName, parameters) {
+        console.log("Sending ga event: ", parameters, ["event", eventName, parameters]);
+        this.doActionOnGTag(["event", eventName, parameters]);
+    }
+
+    static doActionOnGTag(parameters) {
+        try {
+            if (window.gtag) {
+                window.gtag(...parameters);
+            } else {
+                Logger.logError(null, "doActionOnGTag", "No gtag found");
+            }
+        } catch (e) {
+            Logger.logError(e, "doActionOnGTag", "Failed to do gtag action: " + safeStringify(parameters));
+        }
+    }
+}

package/src/common-apis/adapters/analyticsAdapters/mixpanelAdapter.js

@@ -0,0 +1,38 @@
+import { Logger } from "../../utils/logging/logger.js";
+import { safeStringify } from "../../utils/safeStringify.js";
+
+export class MixpanelAdapter {
+    static sendEvent(eventName, parameters) {
+        try {
+            if (window.mixpanel) {
+                const result = window.mixpanel.track(eventName, parameters);
+                // eslint-disable-next-line no-console
+                console.log("Mixpanel sendEvent result: " + result);
+            } else {
+                Logger.logError(null, "sendEvent", "No mixpanel found");
+            }
+        } catch (e) {
+            Logger.logError(
+                e,
+                "sendEvent",
+                "Failed to do mixpanel action: " + eventName + " - " + safeStringify(parameters)
+            );
+        }
+    }
+
+    static identify(uniqueId) {
+        try {
+            if (window.mixpanel) {
+                if (uniqueId) {
+                    const result = window.mixpanel.identify(uniqueId);
+                    // eslint-disable-next-line no-console
+                    console.log("Mixpanel identify result: " + result);
+                }
+            } else {
+                Logger.logError(null, "identify", "No mixpanel found");
+            }
+        } catch (e) {
+            Logger.logError(e, "identify", "Failed to identify.");
+        }
+    }
+}

package/src/index.js

@@ -63,6 +63,9 @@ export { AxiosAdapter } from "./common-apis/adapters/axiosAdapter.js";
 export { EmailsApi } from "./common-apis/utils/emailAPI.js";
 export { IpAddressProvider } from "./common-apis/external-apis/ipAddressProviders.js";
 
+export { GoogleAnalyticsAdapter } from "./common-apis/adapters/analyticsAdapters/googleAnalyticsAdapter.js";
+export { MixpanelAdapter } from "./common-apis/adapters/analyticsAdapters/mixpanelAdapter.js";
+
 // Robust data retriever service and related APIs (to be extracted later to dedicated lib)
 export { CacheAndConcurrentRequestsResolver } from "./robust-api-caller/cacheAndConcurrentRequestsResolver.js";
 export { CachedRobustExternalApiCallerService } from "./robust-api-caller/cachedRobustExternalApiCallerService.js";

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

@@ -9,6 +9,7 @@ import { Protocol } from "../../common-apis/models/protocol.js";
 import { safeStringify } from "../../common-apis/utils/safeStringify.js";
 import { Logger } from "../../common-apis/utils/logging/logger.js";
 import { DEFAULT_CRYPTO_DECIMAL_COUNT, FALLBACK_ASSET_ICON_URL } from "../../common-apis/globalConstants.jsx";
+import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo.js";
 
 export class LetsExchangeSwapProvider extends SwapProvider {
     constructor(apiKeysProxyUrl, cache, customCoinBuilder = (coin, network) => null, useRestrictedCoinsSet = true) {
@@ -73,23 +74,21 @@ export class LetsExchangeSwapProvider extends SwapProvider {
                                 );
                             }
                             if (coin) {
-                                return {
-                                    coin: coin,
-                                    code: item.code,
-                                    network: networkDetails.code,
-                                    hasExtraId: !!networkDetails.has_extra,
-                                    extraIdName: networkDetails.extra_name ?? null,
-                                    isPopular: item.rating || 0,
-                                    iconURL: item.icon ? item.icon : FALLBACK_ASSET_ICON_URL,
-                                    deposit: true, // Letsexchange provide no such details
-                                    withdrawal: true, // Letsexchange provide no such details
-                                    validationRegexp: networkDetails.validation_address_regex ?? null,
-                                    isAvailable:
-                                        (typeof item.is_active !== "number" || item.is_active === 1) &&
+                                return new SwapProviderCoinInfo(
+                                    coin,
+                                    item.code,
+                                    networkDetails.code,
+                                    !!networkDetails.has_extra,
+                                    networkDetails.extra_name ?? null,
+                                    item.rating || 0,
+                                    item.icon ? item.icon : FALLBACK_ASSET_ICON_URL,
+                                    true, // Letsexchange provide no such details
+                                    true, // Letsexchange provide no such details
+                                    networkDetails.validation_address_regex ?? null,
+                                    (typeof item.is_active !== "number" || item.is_active === 1) &&
                                         (typeof item.disabled !== "number" || item.disabled === 0) &&
-                                        (typeof networkDetails.is_active !== "number" ||
-                                            networkDetails.is_active === 1),
-                                };
+                                        (typeof networkDetails.is_active !== "number" || networkDetails.is_active === 1)
+                                );
                             }
                             return [];
                         });
@@ -97,6 +96,7 @@ export class LetsExchangeSwapProvider extends SwapProvider {
                     .flat();
                 this.coinsLastUpdateTimestamp = Date.now();
                 this._putPopularCoinsFirst();
+                await super._fetchSupportedCurrenciesIfNeeded();
             }
         } catch (e) {
             improveAndRethrow(e, loggerSource);

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

@@ -3,6 +3,41 @@ import { improveAndRethrow } from "../../common-apis/errorUtils.js";
 import { Coin } from "../../common-apis/models/coin.js";
 import { FALLBACK_ASSET_ICON_URL } from "../../common-apis/globalConstants.jsx";
 import { BigNumber } from "bignumber.js";
+import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo.js";
+import { Protocol } from "../../common-apis/models/protocol.js";
+
+export const PRE_LISTED_COINS = [
+    new SwapProviderCoinInfo(
+        new Coin(
+            "Hamster Kombat",
+            "HMSTRTON",
+            "HMSTR",
+            18,
+            null,
+            "",
+            null,
+            null,
+            1,
+            null,
+            [],
+            60000,
+            null,
+            new Protocol("TON"),
+            null,
+            false
+        ),
+        "HMSTR",
+        "TON",
+        true,
+        "MEMO",
+        100,
+        "https://rabbit.io/asset-icons/HMSTR.png", // "https://hamsterkombat.io/images/icons/hamster-coin.png"
+        true,
+        true,
+        "^(EQ|UQ)[A-Za-z0-9-_]{46}$",
+        false
+    ),
+];
 
 // TODO: [refactoring, moderate] extract structure of _supportedCoins into model class
 export class SwapProvider {
@@ -63,6 +98,7 @@ export class SwapProvider {
      */
     _putPopularCoinsFirst() {
         const popularCoinsList = [
+            "HMSTRTON",
             "BTC",
             "ETH",
             "USDTERC20",
@@ -119,17 +155,16 @@ export class SwapProvider {
 
     /**
      * Should fill _supportedCoins with array of coins.
-     * Coin construction rules:
-     * 1. ticker should be CODEPROTOCOL_CODE e.g. USDTERC20
-     * 2. name should not contain (PROTOCOL_CODE) or just PROTOCOL_CODe
-     * 3. protocol should be null for coins major for their blockchains like BTC, ETH
-     * 4. isPopular should be a number
      *
      * @return {Promise<void>}
      * @private
      */
     async _fetchSupportedCurrenciesIfNeeded() {
-        throw new Error("Not implemented in base - _fetchSupportedCurrenciesIfNeeded");
+        PRE_LISTED_COINS.forEach(preListedCoin => {
+            if (!this._supportedCoins.find(existingCoin => preListedCoin.coin.ticker === existingCoin.coin.ticker)) {
+                this._supportedCoins.push(preListedCoin);
+            }
+        });
     }
 
     /**

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

@@ -10,6 +10,7 @@ import { Protocol } from "../../common-apis/models/protocol.js";
 import { safeStringify } from "../../common-apis/utils/safeStringify.js";
 import { Logger } from "../../common-apis/utils/logging/logger.js";
 import { FALLBACK_ASSET_ICON_URL } from "../../common-apis/globalConstants.jsx";
+import { SwapProviderCoinInfo } from "../models/swapProviderCoinInfo.js";
 
 export const BANNED_PARTNERS = ["stealthex", "changee", "coincraddle"];
 
@@ -77,27 +78,26 @@ export class SwapspaceSwapProvider extends SwapProvider {
                             );
                         }
                         if (coin) {
-                            return {
-                                coin: coin,
-                                code: item.code,
-                                network: item.network,
-                                hasExtraId: item.hasExtraId,
-                                extraIdName: item.extraIdName,
-                                isPopular: item.popular ? 1 : 0,
-                                iconURL: item.icon
-                                    ? `https://storage.swapspace.co${item.icon}`
-                                    : FALLBACK_ASSET_ICON_URL,
-                                deposit: item.deposit ?? false,
-                                withdrawal: item.withdrawal ?? false,
-                                validationRegexp: item.validationRegexp ?? null,
-                                isAvailable: true,
-                            };
+                            return new SwapProviderCoinInfo(
+                                coin,
+                                item.code,
+                                item.network,
+                                item.hasExtraId,
+                                item.extraIdName,
+                                item.popular ? 1 : 0,
+                                item.icon ? `https://storage.swapspace.co${item.icon}` : FALLBACK_ASSET_ICON_URL,
+                                item.deposit ?? false,
+                                item.withdrawal ?? false,
+                                item.validationRegexp ?? null,
+                                true
+                            );
                         }
 
                         return [];
                     })
                     .flat();
                 this._putPopularCoinsFirst();
+                await super._fetchSupportedCurrenciesIfNeeded();
             }
         } catch (e) {
             improveAndRethrow(e, loggerSource);
@@ -149,7 +149,12 @@ export class SwapspaceSwapProvider extends SwapProvider {
                     "Failed to find swapspace coin details for: " + fromCoin.ticker + " -> " + toCoin.ticker
                 );
             }
-            if (!fromCoinSwapspaceDetails.deposit || !toCoinSwapspaceDetails.withdrawal) {
+            if (
+                !fromCoinSwapspaceDetails.deposit ||
+                !toCoinSwapspaceDetails.withdrawal ||
+                !fromCoinSwapspaceDetails.isAvailable ||
+                !toCoinSwapspaceDetails.isAvailable
+            ) {
                 return {
                     result: false,
                     reason: SwapProvider.NO_SWAPS_REASONS.NOT_SUPPORTED,
@@ -417,6 +422,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
             const texts422 = [
                 "Pair cannot be processed by",
                 "Currency not found",
+                "Currencies not found",
                 "Amount maximum is",
                 "Amount minimum is",
             ];

package/src/swaps-lib/models/swapProviderCoinInfo.js

@@ -0,0 +1,36 @@
+import { FALLBACK_ASSET_ICON_URL } from "../../common-apis/globalConstants.jsx";
+
+/**
+ * Coin construction rules:
+ * 1. ticker should be CODEPROTOCOL_CODE e.g. USDTERC20
+ * 2. name should not contain (PROTOCOL_CODE) or just PROTOCOL_CODe
+ * 3. protocol should be null for coins major for their blockchains like BTC, ETH
+ * 4. isPopular should be a number - the higher -> the more popular
+ */
+export class SwapProviderCoinInfo {
+    constructor(
+        coin,
+        code,
+        network,
+        hasExtraId,
+        extraIdName,
+        popularity,
+        iconURL,
+        deposit,
+        withdrawal,
+        validationRegexp,
+        isAvailable
+    ) {
+        this.coin = coin;
+        this.code = code;
+        this.network = network;
+        this.hasExtraId = hasExtraId;
+        this.extraIdName = extraIdName;
+        this.isPopular = popularity;
+        this.iconURL = iconURL ?? FALLBACK_ASSET_ICON_URL;
+        this.deposit = deposit ?? false;
+        this.withdrawal = withdrawal ?? false;
+        this.validationRegexp = validationRegexp ?? null;
+        this.isAvailable = isAvailable ?? true;
+    }
+}

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

@@ -1,5 +1,4 @@
 import { BigNumber } from "bignumber.js";
-import EventBusInstance from "eventbusjs";
 
 import { FiatCurrenciesService } from "../../common-apis/fiatCurrenciesService.js";
 import { improveAndRethrow } from "../../common-apis/errorUtils.js";
@@ -12,9 +11,11 @@ import { SwapUtils } from "../utils/swapUtils.js";
 import { SwapspaceSwapProvider } from "../external-apis/swapspaceSwapProvider.js";
 import { SwapProvider } from "../external-apis/swapProvider.js";
 import { LetsExchangeSwapProvider } from "../external-apis/letsExchangeSwapProvider.js";
+import { GoogleAnalyticsAdapter } from "../../common-apis/adapters/analyticsAdapters/googleAnalyticsAdapter.js";
 
 export class PublicSwapService {
-    static PUBLIC_SWAP_CREATED_EVENT = "publicSwapCreatedEvent";
+    static PUBLIC_SWAP_CREATED_ANALYTICS_EVENT = "public_swap_created_event";
+    static PUBLIC_SWAP_SUCCEED_ANALYTICS_EVENT = "public_swap_succeed_event";
 
     static PUBLIC_SWAPS_COMMON_ERRORS = {
         REQUESTS_LIMIT_EXCEEDED: "requestsLimitExceeded",
@@ -441,14 +442,12 @@ export class PublicSwapService {
                     Logger.logError(e, loggerSource, "Failed to calculate fiat amounts for result");
                 }
 
-                // TODO: feature, cirtical] add GA event. task_id=091004f1b6b748b29ddece6a130df904
-                EventBusInstance.dispatch(
-                    PublicSwapService.PUBLIC_SWAP_CREATED_EVENT,
-                    null,
-                    fromCoin.ticker,
-                    toCoin.ticker,
-                    fromAmountFiat
-                );
+                await GoogleAnalyticsAdapter.sendEvent(PublicSwapService.PUBLIC_SWAP_CREATED_ANALYTICS_EVENT, {
+                    coin_amount: result.fromAmount,
+                    usd_amount: fromAmountFiat,
+                    fromCoin: fromCoin.ticker,
+                    toCoin: toCoin.ticker,
+                });
 
                 const toReturn = {
                     result: true,