@rabbitio/ui-kit 1.0.0-beta.70 → 1.0.0-beta.72

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rabbitio/ui-kit",
-    "version": "1.0.0-beta.70",
+    "version": "1.0.0-beta.72",
     "description": "Rabbit.io react.js components kit",
     "type": "module",
     "main": "./dist/index.cjs",
@@ -50,9 +50,7 @@
         "eventbusjs": "0.2.0",
         "jshashes": "1.0.8",
         "qrcode": "1.4.4",
-        "react": ">=18.2.0",
         "react-animate-height": "3.2.3",
-        "react-dom": ">=18.2.0",
         "react-textarea-autosize": "^8.5.3",
         "react-transition-group": "4.4.5",
         "resize-observer-polyfill": "1.5.1",
@@ -76,6 +74,8 @@
         "microbundle": "^0.15.1",
         "prettier": "^3.1.1",
         "prop-types": "^15.8.1",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.70.0",
         "sass-loader": "^14.1.0",

package/src/{common → common-apis}/external-apis/ipAddressProviders.js

@@ -1,7 +1,7 @@
 import EventBusInstance from "eventbusjs";
-import { ExternalApiProvider } from "../../robustExteranlApiCallerService/externalApiProvider.js";
+import { ExternalApiProvider } from "../../robust-api-caller/externalApiProvider.js";
 import { ApiGroups } from "./apiGroups.js";
-import { CachedRobustExternalApiCallerService } from "../../robustExteranlApiCallerService/cachedRobustExternalApiCallerService.js";
+import { CachedRobustExternalApiCallerService } from "../../robust-api-caller/cachedRobustExternalApiCallerService.js";
 import { Cache } from "../utils/cache.js";
 import { improveAndRethrow } from "../errorUtils.js";
 

package/src/index.js

@@ -1,82 +1,78 @@
 // UI-KIT components
-export { Button } from "./components/atoms/buttons/Button/Button.jsx";
-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 { LinkButton } from "./components/atoms/buttons/LinkButton/LinkButton.jsx";
-export { DialogButtons } from "./components/organisms/Dialog/DialogButtons/DialogButtons.jsx";
-export { BackgroundTitle } from "./components/atoms/BackgroundTitle/BackgroundTitle.jsx";
-export { Close } from "./components/atoms/buttons/Close/Close.jsx";
-export { Validation } from "./components/atoms/Validation/Validation.jsx";
-export { Dialog } from "./components/organisms/Dialog/Dialog.jsx";
-export { DialogStep } from "./components/organisms/Dialog/DialogStep/DialogStep.jsx";
-export { AssetSelection } from "./components/atoms/AssetSelection/AssetSelection.jsx";
-export { Tooltip } from "./components/atoms/Tooltip/Tooltip.jsx";
-export { NoticeIcon } from "./components/atoms/NoticeIcon/NoticeIcon.jsx";
-export { TitleBox } from "./components/atoms/TitleBox/TitleBox.jsx";
-export { AmountInput } from "./components/molecules/AmountInput/AmountInput.jsx";
-export { SwapForm } from "./components/organisms/SwapForm/SwapForm.jsx";
-export { Textarea } from "./components/atoms/Textarea/Textarea.jsx";
-export { QrCode } from "./components/atoms/QrCode/QrCode.jsx";
-export { LinesOfText } from "./components/atoms/TwoLinesOfText/LinesOfText.jsx";
-export { LineWithIconLink } from "./components/molecules/LineWithIconLink/LineWithIconLink.jsx";
-export { DeterminedErrorDialogStep } from "./components/templates/DeterminedErrorDialogStep/DeterminedErrorDialogStep.jsx";
-export { TitledLineWithIconLink } from "./components/molecules/TitledLineWithIconLink/TitledLineWithIconLink.jsx";
-export { RadioButtonWithText } from "./components/atoms/buttons/RadioButtonWithText/RadioButtonWithText.jsx";
-export { InformationMessage } from "./components/atoms/InformationMessage/InformationMessage.jsx";
-export { Input } from "./components/atoms/Input/Input.jsx";
-export { COIN_PICKER_MODES, CoinPicker } from "./components/molecules/CoinPicker/CoinPicker.jsx";
-export { CoinPickerDialogStep } from "./components/organisms/CoinPickerDialogStep/CoinPickerDialogStep.jsx";
+export { Button } from "./ui-kit/components/atoms/buttons/Button/Button.jsx";
+export { LoadingDots } from "./ui-kit/components/atoms/LoadingDots/LoadingDots.jsx";
+export { SupportChat } from "./ui-kit/components/atoms/SupportChat/SupportChat.jsx";
+export { AssetIcon } from "./ui-kit/components/atoms/AssetIcon/AssetIcon.jsx";
+export { LinkButton, ICON_ROTATE_OPTIONS } from "./ui-kit/components/atoms/buttons/LinkButton/LinkButton.jsx";
+export { DialogButtons } from "./ui-kit/components/organisms/Dialog/DialogButtons/DialogButtons.jsx";
+export { BackgroundTitle } from "./ui-kit/components/atoms/BackgroundTitle/BackgroundTitle.jsx";
+export { Close, CLOSE_COLORS } from "./ui-kit/components/atoms/buttons/Close/Close.jsx";
+export { Validation } from "./ui-kit/components/atoms/Validation/Validation.jsx";
+export { Dialog, DIALOG_SIZES, DIALOG_TRANSITION_STEP_DURATION } from "./ui-kit/components/organisms/Dialog/Dialog.jsx";
+export { DialogStep, DIALOG_STEP_CLASS } from "./ui-kit/components/organisms/Dialog/DialogStep/DialogStep.jsx";
+export { AssetSelection } from "./ui-kit/components/atoms/AssetSelection/AssetSelection.jsx";
+export { Tooltip, TOOLTIP_POSITIONS } from "./ui-kit/components/atoms/Tooltip/Tooltip.jsx";
+export { NoticeIcon } from "./ui-kit/components/atoms/NoticeIcon/NoticeIcon.jsx";
+export { TitleBox } from "./ui-kit/components/atoms/TitleBox/TitleBox.jsx";
+export { AmountInput } from "./ui-kit/components/molecules/AmountInput/AmountInput.jsx";
+export { SwapForm } from "./ui-kit/components/organisms/SwapForm/SwapForm.jsx";
+export { Textarea } from "./ui-kit/components/atoms/Textarea/Textarea.jsx";
+export { QrCode } from "./ui-kit/components/atoms/QrCode/QrCode.jsx";
+export { LinesOfText } from "./ui-kit/components/atoms/TwoLinesOfText/LinesOfText.jsx";
+export { LineWithIconLink } from "./ui-kit/components/molecules/LineWithIconLink/LineWithIconLink.jsx";
+export { DeterminedErrorDialogStep } from "./ui-kit/components/templates/DeterminedErrorDialogStep/DeterminedErrorDialogStep.jsx";
+export { TitledLineWithIconLink } from "./ui-kit/components/molecules/TitledLineWithIconLink/TitledLineWithIconLink.jsx";
+export { RadioButtonWithText } from "./ui-kit/components/atoms/buttons/RadioButtonWithText/RadioButtonWithText.jsx";
+export { InformationMessage } from "./ui-kit/components/atoms/InformationMessage/InformationMessage.jsx";
+export { Input } from "./ui-kit/components/atoms/Input/Input.jsx";
+export { COIN_PICKER_MODES, CoinPicker } from "./ui-kit/components/molecules/CoinPicker/CoinPicker.jsx";
+export { CoinPickerDialogStep } from "./ui-kit/components/organisms/CoinPickerDialogStep/CoinPickerDialogStep.jsx";
 
 // UI-KIT constants
-export { DIALOG_SIZES } from "./constants/organisms/dialog/dialog.js";
-export { DIALOG_STEP_CLASS } from "./constants/organisms/dialog/DialogStep/dialogStep.js";
-export { ICON_ROTATE_OPTIONS } from "./constants/atoms/LinkButton/linkButton.jsx";
-export { TOOLTIP_POSITIONS } from "./constants/atoms/Tooltip/tooltip.jsx";
-export { CLOSE_COLORS } from "./constants/atoms/Close/close.jsx";
-export { FALLBACK_ASSET_ICON_URL, DEFAULT_CRYPTO_DECIMAL_COUNT } from "./constants/globalConstants.jsx";
+export { FALLBACK_ASSET_ICON_URL, DEFAULT_CRYPTO_DECIMAL_COUNT } from "./common-apis/globalConstants.jsx";
 
-export { useCallHandlingErrors } from "./components/hooks/useCallHandlingErrors.js";
-export { useReferredState } from "./components/hooks/useReferredState.js";
-export { handleClickOutside } from "./components/utils/uiUtils.js";
-export { InputValuesProviders } from "./components/utils/inputValueProviders.js";
-export { copyBrowserTextToClipboard } from "./components/utils/textUtils.js";
+export { useCallHandlingErrors } from "./ui-kit/hooks/useCallHandlingErrors.js";
+export { useReferredState } from "./ui-kit/hooks/useReferredState.js";
+export { handleClickOutside } from "./ui-kit/utils/uiUtils.js";
+export { InputValuesProviders } from "./ui-kit/utils/inputValueProviders.js";
+export { copyBrowserTextToClipboard } from "./ui-kit/utils/textUtils.js";
+export { useIsHydrated } from "./ui-kit/hooks/useIsHydrated.js";
 
-export { saveQueryParameterAndValues } from "./components/utils/urlQueryUtils.js";
-export { removeQueryParameterAndValues } from "./components/utils/urlQueryUtils.js";
-export { getQueryParameterSingleValue } from "./components/utils/urlQueryUtils.js";
-export { getQueryParameterValues } from "./components/utils/urlQueryUtils.js";
+export { saveQueryParameterAndValues } from "./ui-kit/utils/urlQueryUtils.js";
+export { removeQueryParameterAndValues } from "./ui-kit/utils/urlQueryUtils.js";
+export { getQueryParameterSingleValue } from "./ui-kit/utils/urlQueryUtils.js";
+export { getQueryParameterValues } from "./ui-kit/utils/urlQueryUtils.js";
 
 // Common code lib (to be extracted later to dedicated lib)
-export { improveAndRethrow } from "./common/errorUtils.js";
-export { logErrorOrOutputToConsole } from "./common/errorUtils.js";
-export { FiatCurrenciesService } from "./common/fiatCurrenciesService.js";
-export { AmountUtils } from "./common/amountUtils.js";
+export { improveAndRethrow } from "./common-apis/errorUtils.js";
+export { logErrorOrOutputToConsole } from "./common-apis/errorUtils.js";
+export { FiatCurrenciesService } from "./common-apis/fiatCurrenciesService.js";
+export { AmountUtils } from "./common-apis/amountUtils.js";
 
-export { Blockchain } from "./common/models/blockchain.js";
-export { Protocol } from "./common/models/protocol.js";
-export { Coin } from "./common/models/coin.js";
+export { Blockchain } from "./common-apis/models/blockchain.js";
+export { Protocol } from "./common-apis/models/protocol.js";
+export { Coin } from "./common-apis/models/coin.js";
 
-export { Cache } from "./common/utils/cache.js";
-export { safeStringify } from "./common/utils/safeStringify.js";
-export { LogsStorage } from "./common/utils/logging/logsStorage.js";
-export { Logger } from "./common/utils/logging/logger.js";
-export { postponeExecution } from "./common/utils/postponeExecution.js";
-export { AxiosAdapter } from "./common/adapters/axiosAdapter.js";
+export { Cache } from "./common-apis/utils/cache.js";
+export { safeStringify } from "./common-apis/utils/safeStringify.js";
+export { LogsStorage } from "./common-apis/utils/logging/logsStorage.js";
+export { Logger } from "./common-apis/utils/logging/logger.js";
+export { postponeExecution } from "./common-apis/utils/postponeExecution.js";
+export { AxiosAdapter } from "./common-apis/adapters/axiosAdapter.js";
 
-export { EmailsApi } from "./common/utils/emailAPI.js";
-export { IpAddressProvider } from "./common/external-apis/ipAddressProviders.js";
+export { EmailsApi } from "./common-apis/utils/emailAPI.js";
+export { IpAddressProvider } from "./common-apis/external-apis/ipAddressProviders.js";
 
 // Robust data retriever service and related APIs (to be extracted later to dedicated lib)
-export { CacheAndConcurrentRequestsResolver } from "./robustExteranlApiCallerService/cacheAndConcurrentRequestsResolver.js";
-export { CachedRobustExternalApiCallerService } from "./robustExteranlApiCallerService/cachedRobustExternalApiCallerService.js";
-export { CancelProcessing } from "./robustExteranlApiCallerService/cancelProcessing.js";
-export { ExternalApiProvider } from "./robustExteranlApiCallerService/externalApiProvider.js";
-export { RobustExternalAPICallerService } from "./robustExteranlApiCallerService/robustExternalAPICallerService.js";
-export { ConcurrentCalculationsMetadataHolder } from "./robustExteranlApiCallerService/concurrentCalculationsMetadataHolder.js";
+export { CacheAndConcurrentRequestsResolver } from "./robust-api-caller/cacheAndConcurrentRequestsResolver.js";
+export { CachedRobustExternalApiCallerService } from "./robust-api-caller/cachedRobustExternalApiCallerService.js";
+export { CancelProcessing } from "./robust-api-caller/cancelProcessing.js";
+export { ExternalApiProvider } from "./robust-api-caller/externalApiProvider.js";
+export { RobustExternalAPICallerService } from "./robust-api-caller/robustExternalAPICallerService.js";
+export { ConcurrentCalculationsMetadataHolder } from "./robust-api-caller/concurrentCalculationsMetadataHolder.js";
 
-export { ApiGroups } from "./common/external-apis/apiGroups.js";
-export { ApiGroup } from "./common/external-apis/apiGroups.js";
+export { ApiGroups } from "./common-apis/external-apis/apiGroups.js";
+export { ApiGroup } from "./common-apis/external-apis/apiGroups.js";
 
 // Swaps lib (to be extracted later to dedicated lib)
 export { ExistingSwap } from "./swaps-lib/models/existingSwap.js";

package/src/{robustExteranlApiCallerService → robust-api-caller}/cacheAndConcurrentRequestsResolver.js

@@ -1,7 +1,7 @@
 import { v4 } from "uuid";
 
-import { improveAndRethrow } from "../common/errorUtils.js";
-import { Logger } from "../common/utils/logging/logger.js";
+import { improveAndRethrow } from "../common-apis/errorUtils.js";
+import { Logger } from "../common-apis/utils/logging/logger.js";
 
 /**
  * This util helps to avoid duplicated calls to a shared resource.

package/src/{robustExteranlApiCallerService → robust-api-caller}/cachedRobustExternalApiCallerService.js

@@ -1,8 +1,8 @@
 import Hashes from "jshashes";
 
-import { improveAndRethrow } from "../common/errorUtils.js";
-import { safeStringify } from "../common/utils/safeStringify.js";
-import { Logger } from "../common/utils/logging/logger.js";
+import { improveAndRethrow } from "../common-apis/errorUtils.js";
+import { safeStringify } from "../common-apis/utils/safeStringify.js";
+import { Logger } from "../common-apis/utils/logging/logger.js";
 
 import { RobustExternalAPICallerService } from "./robustExternalAPICallerService.js";
 import { CacheAndConcurrentRequestsResolver } from "./cacheAndConcurrentRequestsResolver.js";

package/src/{robustExteranlApiCallerService → robust-api-caller}/concurrentCalculationsMetadataHolder.js

@@ -1,6 +1,6 @@
 import { v4 } from "uuid";
 
-import { Logger } from "../common/utils/logging/logger.js";
+import { Logger } from "../common-apis/utils/logging/logger.js";
 
 // TODO: [refactoring, low] Consider removing this logic task_id=c360f2af75764bde8badd9ff1cc00d48
 export class ConcurrentCalculationsMetadataHolder {

package/src/{robustExteranlApiCallerService → robust-api-caller}/externalServicesStatsCollector.js

@@ -1,5 +1,5 @@
-import { improveAndRethrow } from "../common/errorUtils.js";
-import { Logger } from "../common/utils/logging/logger.js";
+import { improveAndRethrow } from "../common-apis/errorUtils.js";
+import { Logger } from "../common-apis/utils/logging/logger.js";
 
 export class ExternalServicesStatsCollector {
     constructor() {

package/src/{robustExteranlApiCallerService → robust-api-caller}/robustExternalAPICallerService.js

@@ -1,8 +1,8 @@
-import { improveAndRethrow } from "../common/errorUtils.js";
-import { safeStringify } from "../common/utils/safeStringify.js";
-import { Logger } from "../common/utils/logging/logger.js";
-import { postponeExecution } from "../common/utils/postponeExecution.js";
-import { AxiosAdapter } from "../common/adapters/axiosAdapter.js";
+import { improveAndRethrow } from "../common-apis/errorUtils.js";
+import { safeStringify } from "../common-apis/utils/safeStringify.js";
+import { Logger } from "../common-apis/utils/logging/logger.js";
+import { postponeExecution } from "../common-apis/utils/postponeExecution.js";
+import { AxiosAdapter } from "../common-apis/adapters/axiosAdapter.js";
 
 import { concurrentCalculationsMetadataHolder } from "./concurrentCalculationsMetadataHolder.js";
 import { ExternalServicesStatsCollector } from "./externalServicesStatsCollector.js";

package/src/{robustExteranlApiCallerService → robust-api-caller}/tests/robustExternalAPICallerService/robustExternalAPICallerService/callExternalAPI/_performCallAttempt.test.js

@@ -4,8 +4,8 @@ import should from "should";
 import { beforeEach, afterEach, describe, it } from "vitest";
 import { v4 } from "uuid";
 import { ExternalApiProvider } from "../../../../externalApiProvider.js";
-import { ApiGroup } from "../../../../../common/external-apis/apiGroups.js";
-import { AxiosAdapter } from "../../../../../common/adapters/axiosAdapter.js";
+import { ApiGroup } from "../../../../../common-apis/external-apis/apiGroups.js";
+import { AxiosAdapter } from "../../../../../common-apis/adapters/axiosAdapter.js";
 import { RobustExternalAPICallerService } from "../../../../robustExternalAPICallerService.js";
 
 /**

package/src/{robustExteranlApiCallerService → robust-api-caller}/tests/robustExternalAPICallerService/robustExternalAPICallerService/callExternalAPI/callExternalAPI.test.js

@@ -5,7 +5,7 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { v4 } from "uuid";
 import { ExternalApiProvider } from "../../../../externalApiProvider.js";
-import { ApiGroup } from "../../../../../common/external-apis/apiGroups.js";
+import { ApiGroup } from "../../../../../common-apis/external-apis/apiGroups.js";
 import { RobustExternalAPICallerService } from "../../../../robustExternalAPICallerService.js";
 
 describe("RobustExternalAPICallerService", function () {

package/src/{robustExteranlApiCallerService → robust-api-caller}/tests/robustExternalAPICallerService/robustExternalAPICallerService/constructor.test.js

@@ -4,7 +4,7 @@ import { describe, it } from "vitest";
 
 import { ExternalApiProvider } from "../../../externalApiProvider.js";
 import { RobustExternalAPICallerService } from "../../../robustExternalAPICallerService.js";
-import { ApiGroup } from "../../../../common/external-apis/apiGroups.js";
+import { ApiGroup } from "../../../../common-apis/external-apis/apiGroups.js";
 
 describe("RobustExternalAPICallerService", function () {
     describe("#constructor", function () {

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

@@ -117,6 +117,7 @@ export class SwapProvider {
      *            rate: (string|null),
      *            durationMinutesRange: string,
      *            fixed: boolean,
+     *            isRefundAddressRequired: boolean,
      *            [rawSwapData]: Object
      *         })>}
      */

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

@@ -1,15 +1,15 @@
 import axios from "axios";
 import { BigNumber } from "bignumber.js";
 
-import { AmountUtils } from "../../common/amountUtils.js";
-import { improveAndRethrow } from "../../common/errorUtils.js";
+import { AmountUtils } from "../../common-apis/amountUtils.js";
+import { improveAndRethrow } from "../../common-apis/errorUtils.js";
 import { SwapProvider } from "./swapProvider.js";
 import { ExistingSwap } from "../models/existingSwap.js";
-import { Coin } from "../../common/models/coin.js";
-import { Protocol } from "../../common/models/protocol.js";
-import { safeStringify } from "../../common/utils/safeStringify.js";
-import { Logger } from "../../common/utils/logging/logger.js";
-import { FALLBACK_ASSET_ICON_URL } from "../../constants/globalConstants.jsx";
+import { Coin } from "../../common-apis/models/coin.js";
+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";
 
 export const BANNED_PARTNERS = ["stealthex", "changee", "coincraddle"];
 
@@ -17,6 +17,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
     constructor(apiKeysProxyUrl, cache, customCoinBuilder = (coin, network) => null, useRestrictedCoinsSet = true) {
         super();
         this._supportedCoins = [];
+        this._partners = [];
         this._URL = `${apiKeysProxyUrl}`;
         this._maxRateDigits = 20;
         this.useRestrictedCoinsSet = useRestrictedCoinsSet;
@@ -198,6 +199,19 @@ export class SwapspaceSwapProvider extends SwapProvider {
         }
     }
 
+    async _fetchPartnersListIfNeeded() {
+        const loggerSource = "_fetchPartnersListIfNeeded";
+        try {
+            if (this._partners?.length === 0) {
+                const rawResponse = await axios.get(`${this._URL}/api/v2/partners`);
+                Logger.log(`Retrieved ${rawResponse?.data?.length} partners`, loggerSource);
+                this._partners = Array.isArray(rawResponse?.data) ? rawResponse?.data : [];
+            }
+        } catch (e) {
+            Logger.logError(e, loggerSource, "Failed to fetch partners list from swapspace");
+        }
+    }
+
     /**
      * This method sort internal list putting popular (as swapspace thinks) coins to the top.
      * This is just for users of this API if they don't care about the sorting - we just improve a list a bit this way.
@@ -387,6 +401,11 @@ export class SwapspaceSwapProvider extends SwapProvider {
 
                 const rate =
                     bestOpt.toAmount && bestOpt.fromAmount ? BigNumber(bestOpt.toAmount).div(bestOpt.fromAmount) : null;
+
+                await this._fetchPartnersListIfNeeded();
+                const partner = this._partners.find(p => bestOpt?.partner?.toLowerCase() === p.path.toLowerCase());
+                const isRefundAddressRequired =
+                    partner == null ? true : bestOpt.fixed ? partner.reqFixedRefund : partner.reqFloatRefund;
                 return {
                     result: true,
                     min: min,
@@ -397,6 +416,7 @@ export class SwapspaceSwapProvider extends SwapProvider {
                     durationMinutesRange: bestOpt.duration ?? null,
                     fixed: bestOpt.fixed,
                     rawSwapData: bestOpt,
+                    isRefundAddressRequired: !!isRefundAddressRequired,
                 };
             }
             const result = {

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

@@ -12,6 +12,7 @@ export class BaseSwapCreationInfo {
      * @param fiatMax {number}
      * @param durationMinutesRange {string}
      * @param fixed {boolean}
+     * @param [isRefundAddressRequired=false] {boolean}
      */
     constructor(
         fromCoin,
@@ -25,7 +26,8 @@ export class BaseSwapCreationInfo {
         max,
         fiatMax,
         durationMinutesRange,
-        fixed
+        fixed,
+        isRefundAddressRequired = false
     ) {
         this.fromCoin = fromCoin;
         this.toCoin = toCoin;
@@ -39,5 +41,6 @@ export class BaseSwapCreationInfo {
         this.fiatMax = fiatMax;
         this.durationMinutesRange = durationMinutesRange;
         this.fixed = fixed;
+        this.isRefundAddressRequired = isRefundAddressRequired;
     }
 }

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

@@ -1,12 +1,12 @@
 import { BigNumber } from "bignumber.js";
 import EventBusInstance from "eventbusjs";
 
-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 { FiatCurrenciesService } from "../../common-apis/fiatCurrenciesService.js";
+import { improveAndRethrow } from "../../common-apis/errorUtils.js";
+import { safeStringify } from "../../common-apis/utils/safeStringify.js";
+import { Logger } from "../../common-apis/utils/logging/logger.js";
+import { Coin } from "../../common-apis/models/coin.js";
+import { AmountUtils } from "../../common-apis/amountUtils.js";
 import { BaseSwapCreationInfo } from "../models/baseSwapCreationInfo.js";
 import { SwapUtils } from "../utils/swapUtils.js";
 import { SwapspaceSwapProvider } from "../external-apis/swapspaceSwapProvider.js";
@@ -245,7 +245,8 @@ export class PublicSwapService {
                     max,
                     fiatMax,
                     details.durationMinutesRange,
-                    details.fixed
+                    details.fixed,
+                    details.isRefundAddressRequired
                 ),
             };
             Logger.log(

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

@@ -5,9 +5,9 @@ import should from "should";
 import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Coin } from "../../../../common/models/coin.js";
-import { Cache } from "../../../../common/utils/cache.js";
-import { Protocol } from "../../../../common/models/protocol.js";
+import { Coin } from "../../../../common-apis/models/coin.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
+import { Protocol } from "../../../../common-apis/models/protocol.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("_fetchSupportedCurrenciesIfNeeded", function () {

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

@@ -6,9 +6,9 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapProvider } from "../../../external-apis/swapProvider.js";
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Coin } from "../../../../common/models/coin.js";
-import { Blockchain } from "../../../../common/models/blockchain.js";
-import { Cache } from "../../../../common/utils/cache.js";
+import { Coin } from "../../../../common-apis/models/coin.js";
+import { Blockchain } from "../../../../common-apis/models/blockchain.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("createSwap", function () {

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

@@ -6,7 +6,7 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapProvider } from "../../../external-apis/swapProvider.js";
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Cache } from "../../../../common/utils/cache.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("getAllSupportedCurrencies", function () {

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

@@ -6,7 +6,7 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapProvider } from "../../../external-apis/swapProvider.js";
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Cache } from "../../../../common/utils/cache.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("getDepositCurrencies", function () {

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

@@ -6,10 +6,10 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapProvider } from "../../../external-apis/swapProvider.js";
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Cache } from "../../../../common/utils/cache.js";
-import { AmountUtils } from "../../../../common/amountUtils.js";
-import { Coin } from "../../../../common/models/coin.js";
-import { Blockchain } from "../../../../common/models/blockchain.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
+import { AmountUtils } from "../../../../common-apis/amountUtils.js";
+import { Coin } from "../../../../common-apis/models/coin.js";
+import { Blockchain } from "../../../../common-apis/models/blockchain.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("getSwapInfo", function () {
@@ -92,6 +92,7 @@ describe("swapspaceSwapProvider", function () {
         let swapspaceSwapProvider;
         let axiosGetStub;
         let trimCryptoAmountByCoinStub;
+        let _fetchPartnersListIfNeededStub;
 
         beforeEach(() => {
             swapspaceSwapProvider = new SwapspaceSwapProvider("", new Cache());
@@ -100,6 +101,9 @@ describe("swapspaceSwapProvider", function () {
 
             trimCryptoAmountByCoinStub = sinon.stub(AmountUtils, "trim");
             trimCryptoAmountByCoinStub.callsFake(amount => amount?.toString());
+
+            _fetchPartnersListIfNeededStub = sinon.stub(swapspaceSwapProvider, "_fetchPartnersListIfNeeded");
+            _fetchPartnersListIfNeededStub.resolves();
         });
 
         afterEach(() => {
@@ -1576,5 +1580,121 @@ describe("swapspaceSwapProvider", function () {
             result.result.should.be.false();
             result.reason.should.be.equal(SwapProvider.NO_SWAPS_REASONS.NOT_SUPPORTED);
         });
+
+        [
+            {
+                description: "should return a result with isRefundAddressRequired true when partner is not found",
+                supportedCoins: [
+                    { coin: BTC, code: "btc", network: "btc", deposit: true },
+                    { coin: ETH, code: "eth", network: "eth", withdrawal: true },
+                ],
+                mockData: [
+                    {
+                        exists: true,
+                        fixed: false,
+                        toAmount: 2,
+                        fromAmount: 1,
+                        duration: "10-20",
+                        max: 5,
+                        min: 0.1,
+                        partner: "partner1",
+                    },
+                ],
+                partners: [],
+                expected: {
+                    result: true,
+                    isRefundAddressRequired: true,
+                },
+            },
+            {
+                description:
+                    "should return a result with isRefundAddressRequired false for a fixed option with reqFixedRefund as false",
+                isFixed: true,
+                supportedCoins: [
+                    { coin: BTC, code: "btc", network: "btc", deposit: true },
+                    { coin: ETH, code: "eth", network: "eth", withdrawal: true },
+                ],
+                mockData: [
+                    {
+                        exists: true,
+                        fixed: true,
+                        toAmount: 2,
+                        fromAmount: 1,
+                        duration: "10-20",
+                        max: 5,
+                        min: 0.1,
+                        partner: "partner1",
+                    },
+                ],
+                partners: [{ path: "partner1", reqFixedRefund: false, reqFloatRefund: true }],
+                expected: {
+                    result: true,
+                    isRefundAddressRequired: false,
+                },
+            },
+            {
+                description:
+                    "should return a result with isRefundAddressRequired true for a floating option with reqFloatRefund as true",
+                supportedCoins: [
+                    { coin: BTC, code: "btc", network: "btc", deposit: true },
+                    { coin: ETH, code: "eth", network: "eth", withdrawal: true },
+                ],
+                mockData: [
+                    {
+                        exists: true,
+                        fixed: false,
+                        toAmount: 2,
+                        fromAmount: 1,
+                        duration: "10-20",
+                        max: 5,
+                        min: 0.1,
+                        partner: "partner1",
+                    },
+                ],
+                partners: [{ path: "partner1", reqFixedRefund: false, reqFloatRefund: true }],
+                expected: {
+                    result: true,
+                    isRefundAddressRequired: true,
+                },
+            },
+        ].forEach(({ description, isFixed, supportedCoins, mockData, partners, expected }) => {
+            it(description, async () => {
+                swapspaceSwapProvider._supportedCoins = supportedCoins;
+                axiosGetStub.returns(Promise.resolve({ data: mockData }));
+
+                _fetchPartnersListIfNeededStub.resolves();
+                swapspaceSwapProvider._partners = partners;
+
+                const result = await swapspaceSwapProvider.getSwapInfo(BTC, ETH, "1", !!isFixed);
+
+                result.result.should.be.equal(expected.result);
+                result.isRefundAddressRequired.should.be.equal(expected.isRefundAddressRequired);
+            });
+        });
+        it("should call _fetchPartnersListIfNeeded ones", async () => {
+            swapspaceSwapProvider._supportedCoins = [
+                { coin: BTC, code: "btc", network: "btc", deposit: true },
+                { coin: ETH, code: "eth", network: "eth", withdrawal: true },
+            ];
+            const mockData = [
+                {
+                    exists: true,
+                    fixed: false,
+                    toAmount: 2,
+                    fromAmount: 1,
+                    duration: "10-20",
+                    max: 5,
+                    min: 0.1,
+                    partner: "partner1",
+                },
+            ];
+            axiosGetStub.returns(Promise.resolve({ data: mockData }));
+
+            swapspaceSwapProvider._partners = [{ path: "partner1", reqFixedRefund: false, reqFloatRefund: true }];
+
+            await swapspaceSwapProvider.getSwapInfo(BTC, ETH, "1");
+
+            _fetchPartnersListIfNeededStub.callCount.should.be.equal(1);
+        });
     });
 });

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

@@ -6,7 +6,7 @@ import { beforeEach, afterEach, describe, it } from "vitest";
 
 import { SwapProvider } from "../../../external-apis/swapProvider.js";
 import { SwapspaceSwapProvider } from "../../../external-apis/swapspaceSwapProvider.js";
-import { Cache } from "../../../../common/utils/cache.js";
+import { Cache } from "../../../../common-apis/utils/cache.js";
 
 describe("swapspaceSwapProvider", function () {
     describe("getWithdrawalCurrencies", function () {