@rabbitio/ui-kit 1.0.0-beta.74 → 1.0.0-beta.75

package/dist/index.umd.js

@@ -4731,7 +4731,7 @@
 	    _ref$formHasBalance = _ref.formHasBalance,
 	    formHasBalance = _ref$formHasBalance === void 0 ? false : _ref$formHasBalance,
 	    _ref$retrieveSwapDeta = _ref.retrieveSwapDetails,
-	    retrieveSwapDetails = _ref$retrieveSwapDeta === void 0 ? function (sendingAssetTicker, receivingAssetTicker, amount, isSwapAll, editedLastInput) {
+	    retrieveSwapDetails = _ref$retrieveSwapDeta === void 0 ? function (sendingAssetTicker, receivingAssetTicker, amount, isSwapAll, isFixed, amountIsToReceive) {
 	      return Promise.resolve();
 	    } : _ref$retrieveSwapDeta,
 	    _ref$retrieveInitialS = _ref.retrieveInitialSwapData,
@@ -4758,6 +4758,10 @@
 	    termsOfUseUrl = _ref$termsOfUseUrl === void 0 ? null : _ref$termsOfUseUrl,
 	    _ref$privacyPolicyUrl = _ref.privacyPolicyUrl,
 	    privacyPolicyUrl = _ref$privacyPolicyUrl === void 0 ? null : _ref$privacyPolicyUrl,
+	    _ref$getExtraIdNameBy = _ref.getExtraIdNameByTicker,
+	    getExtraIdNameByTicker = _ref$getExtraIdNameBy === void 0 ? function (ticker) {
+	      return null;
+	    } : _ref$getExtraIdNameBy,
 	    _ref$validateAddressB = _ref.validateAddressByTicker,
 	    validateAddressByTicker = _ref$validateAddressB === void 0 ? function () {
 	      return false;
@@ -4767,8 +4771,6 @@
 	    swapButtonAlwaysActive = _ref$swapButtonAlways === void 0 ? false : _ref$swapButtonAlways,
 	    _ref$onIsFixedChange = _ref.onIsFixedChange,
 	    onIsFixedChange = _ref$onIsFixedChange === void 0 ? function () {} : _ref$onIsFixedChange,
-	    recipientAddressExtraIdName = _ref.recipientAddressExtraIdName,
-	    refundAddressExtraIdName = _ref.refundAddressExtraIdName,
 	    _ref$translations = _ref.translations,
 	    translations = _ref$translations === void 0 ? {
 	      swapAllButtonTitles: {
@@ -5050,14 +5052,12 @@
 	          setIsPairSupported(true);
 	          setIsSwapCalculated(false);
 	          return Promise.resolve(retrieveSwapDetails(sendingAssetTicker, receivingAssetTicker, amount, isSwapAll.current, (_isFixedRate$current = isFixedRate.current) != null ? _isFixedRate$current : IS_FIXED_BY_DEFAULT, isFixedRate.current ? isLastEditedReceiving : false)).then(function (response) {
-	            if (!isSwapAll.current && String(amount) !== String(isForPreserved && sendAssetAmount.current == null ? preservedAmount : sendAssetAmount.current)) {
+	            if (!isSwapAll.current && String(amount) !== String(isForPreserved && sendAssetAmount.current == null ? preservedAmount : isFixedRate.current && isLastEditedReceiving ? receiveAssetAmount.current : sendAssetAmount.current)) {
 	              // Means amount changed and we no more need to do this exact calculation
 	              return;
 	            }
 	            if (response.result) {
 	              var swapCreationInfo = response.swapCreationInfo;
-	              setUpdateSendInputTo(swapCreationInfo.fromAmountCoins);
-	              setUpdateReceiveInputTo(swapCreationInfo.toAmountCoins);
 	              if (isSwapAll.current) {
 	                setIsAmountZero(bignumber_js.BigNumber("0").eq(swapCreationInfo.fromAmountCoins));
 	              }
@@ -5066,6 +5066,8 @@
 	              setIsRefundAddressRequired(swapCreationInfo == null ? void 0 : swapCreationInfo.isRefundAddressRequired);
 	              processMinMaxAmounts(isSwapAll.current ? swapCreationInfo.fromAmountCoins : amount);
 	              setIsSwapCalculated(true);
+	              setUpdateSendInputTo(swapCreationInfo.fromAmountCoins);
+	              setUpdateReceiveInputTo(swapCreationInfo.toAmountCoins);
 	            } else {
 	              handleSwapServiceError(response.reason, setValidationContent, setBalanceValid, setMinimalAmountValid, setMaximumAmountValid, setIsPairSupported, setIsSameCoins);
 	              if (isSwapAll.current) {
@@ -5255,7 +5257,11 @@
 	  }, [updateSendInputTo, updateReceiveInputTo]);
 	  React.useEffect(function () {
 	    if (swapRate != null && sendAssetAmount.current != null) {
-	      setUpdateReceiveInputTo(AmountUtils.trim(bignumber_js.BigNumber(sendAssetAmount.current).times(swapRate), receivingAssetDecimalCount));
+	      if (isLastEditedReceiving) {
+	        setUpdateSendInputTo(AmountUtils.trim(bignumber_js.BigNumber(receiveAssetAmount.current).div(swapRate), sendingAssetDecimalCount));
+	      } else {
+	        setUpdateReceiveInputTo(AmountUtils.trim(bignumber_js.BigNumber(sendAssetAmount.current).times(swapRate), receivingAssetDecimalCount));
+	      }
 	    }
 	    // eslint-disable-next-line react-hooks/exhaustive-deps
 	  }, [swapRate]);
@@ -5277,6 +5283,8 @@
 	    setIsSwapCalculated(false);
 	    // eslint-disable-next-line react-hooks/exhaustive-deps
 	  }, [sendAssetAmount.current]);
+	  var recipientAddressExtraIdName = getExtraIdNameByTicker(receivingAssetTicker);
+	  var refundAddressExtraIdName = getExtraIdNameByTicker(sendingAssetTicker);
 	  return /*#__PURE__*/React__default["default"].createElement("div", {
 	    className: s$9["swap-form"]
 	  }, /*#__PURE__*/React__default["default"].createElement(TitleBox, {
@@ -5316,7 +5324,7 @@
 	    upperFormPosition: true,
 	    errorEncountered: !minimalAmountValid,
 	    ref: fromAssetSelectionButtonRef,
-	    isLoading: false,
+	    isLoading: isLastEditedReceiving ? isLoading.current : false,
 	    cryptoAssetToFiatRate: sendingAssetToFiatRate,
 	    fiatCurrencyCode: formHasFiat ? fiatCurrencyCode : null,
 	    fiatCurrencyDecimals: fiatCurrencyDecimals,
@@ -5350,7 +5358,7 @@
 	    lowerFormPosition: true,
 	    estimateAmount: !isFixedRate.current,
 	    ref: toAssetSelectionButtonRef,
-	    isLoading: isLoading.current,
+	    isLoading: isLastEditedReceiving ? false : isLoading.current,
 	    cryptoAssetToFiatRate: receivingAssetToFiatRate,
 	    fiatCurrencyCode: formHasFiat ? fiatCurrencyCode : null,
 	    fiatCurrencyDecimals: fiatCurrencyDecimals,
@@ -9677,8 +9685,28 @@
 	   * @private
 	   */;
 	  _proto._putPopularCoinsFirst = function _putPopularCoinsFirst() {
+	    var popularCoinsList = ["BTC", "ETH", "USDTERC20", "USDTTRC20", "USDCERC20", "XRP", "TON", "XMR", "TRX", "DAIERC20", "DOGE", "BNB", "PEPEERC20", "NOTTON", "SOL", "DOT", "LTC", "SHIBERC20", "AVAX", "UNIERC20", "LINKERC20", "MATIC", "BUSDBEP20", "AAVEERC20", "ATOM", "RUNE", "ADA"];
 	    this._supportedCoins.sort(function (i1, i2) {
-	      if (i1.isPopular !== i2.isPopular) return i2.isPopular - i1.isPopular;
+	      var isInPopularList1 = popularCoinsList.includes(i1.coin.ticker);
+	      var isInPopularList2 = popularCoinsList.includes(i2.coin.ticker);
+
+	      // If both are in the popularCoinsList, sort by their index in the list
+	      if (isInPopularList1 && isInPopularList2) {
+	        var index1 = popularCoinsList.indexOf(i1.coin.ticker);
+	        var index2 = popularCoinsList.indexOf(i2.coin.ticker);
+	        return index1 - index2;
+	      }
+
+	      // Sort by whether the coin is in the popularCoinsList
+	      if (isInPopularList1 && !isInPopularList2) return -1;
+	      if (!isInPopularList1 && isInPopularList2) return 1;
+
+	      // If both are not in the popularCoinsList, use the isPopular flag - partners can fill it
+	      var p1 = i1.isPopular;
+	      var p2 = i2.isPopular;
+	      if (p1 !== p2) return p2 - p1;
+
+	      // By default, sort by the coin ticker
 	      return i1.coin.ticker.localeCompare(i2.coin.ticker);
 	    });
 	  }
@@ -10571,7 +10599,7 @@
 	          var swaps = wo404.map(function (r) {
 	            return r.data;
 	          }).map(function (swap, index) {
-	            var _this6$_supportedCoin, _this6$_supportedCoin2, _swap$from$extraId, _swap$to$extraId, _swap$refundExtraId;
+	            var _this6$_supportedCoin, _this6$_supportedCoin2, _swap$blockExplorerTr, _swap$from$extraId, _swap$to$extraId, _swap$refundExtraId;
 	            var fromCoin = (_this6$_supportedCoin = _this6._supportedCoins.find(function (i) {
 	              return i.code === swap.from.code && i.network === swap.from.network;
 	            })) == null ? void 0 : _this6$_supportedCoin.coin;
@@ -10589,7 +10617,8 @@
 	            var status = _this6._mapSwapspaceStatusToRabbitStatus(swap.status, isExpiredByTime);
 	            var toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
 	            var addressToSendCoinsToSwapspace = swap.from.address;
-	            return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, _this6._maxRateDigits), swap.fixed, swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, swap.blockExplorerTransactionUrl.to, swap.to.address, swap.partner, (_swap$from$extraId = swap.from.extraId) != null ? _swap$from$extraId : null, (_swap$to$extraId = swap.to.extraId) != null ? _swap$to$extraId : null, (_swap$refundExtraId = swap.refundExtraId) != null ? _swap$refundExtraId : null);
+	            var toUrl = ((_swap$blockExplorerTr = swap.blockExplorerTransactionUrl.to) != null ? _swap$blockExplorerTr : "").replace(/from=swapspace&?/g, "").replaceAll(/&&+/g, "&").replace("?&", "?").replace(/&$/, "").replace(/\?$/, "");
+	            return new ExistingSwap(swapIds[index], status, toUtcTimestamp(swap.timestamps.createdAt), expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, _this6._maxRateDigits), swap.fixed, swap.refundAddress, addressToSendCoinsToSwapspace, fromCoin, AmountUtils.trim(swap.from.amount, fromCoin.digits), swap.from.transactionHash, swap.blockExplorerTransactionUrl.from, toCoin, AmountUtils.trim(swap.to.amount, toDigits), swap.to.transactionHash, toUrl, swap.to.address, swap.partner, (_swap$from$extraId = swap.from.extraId) != null ? _swap$from$extraId : null, (_swap$to$extraId = swap.to.extraId) != null ? _swap$to$extraId : null, (_swap$refundExtraId = swap.refundExtraId) != null ? _swap$refundExtraId : null);
 	          }).flat();
 	          Logger.log("Swap details result " + safeStringify(swaps), loggerSource);
 	          return {
@@ -11085,6 +11114,8 @@
 	    try {
 	      var _this3 = this;
 	      var loggerSource = "getSwapInfo";
+	      var min = null;
+	      var max = null;
 	      return Promise.resolve(_catch$1(function () {
 	        if (!(fromCoin instanceof Coin) || !(toCoin instanceof Coin) || typeof amountCoins !== "string" || bignumber_js.BigNumber(amountCoins).lt("0") || fixed !== null && typeof fixed !== "boolean" || amountIsToReceive && !fixed) {
 	          throw new Error("Wrong input params: " + amountCoins + " " + fromCoin.ticker + " -> " + toCoin.ticker + ", " + (fromCoin instanceof Coin) + ", " + (toCoin instanceof Coin) + ", " + typeof fixed + " " + fixed + ", " + amountIsToReceive);
@@ -11126,11 +11157,9 @@
 	          //     const extraUsdToFitMinMax = BigNumber("1"); // We correct the limits as the exact limit can fluctuate and cause failed swap creation
 	          //     extraCoinsToFitMinMax = AmountUtils.trim(extraUsdToFitMinMax.div(fromCoinToUsdRate), fromCoin.digits);
 	          // }
-	          var min = null;
 	          if (data != null && data.min_amount) {
 	            min = AmountUtils.trim(data == null ? void 0 : data.min_amount, amountIsToReceive ? toCoin.digits : fromCoin.digits);
 	          }
-	          var max = null;
 	          if (data != null && data.max_amount) {
 	            max = AmountUtils.trim(data == null ? void 0 : data.max_amount, amountIsToReceive ? toCoin.digits : fromCoin.digits);
 	          }
@@ -11183,8 +11212,16 @@
 	          };
 	        });
 	      }, function (e) {
-	        var _e$response;
-	        if ((e == null || (_e$response = e.response) == null ? void 0 : _e$response.status) === 429) {
+	        var _e$response, _e$response2;
+	        if ((e == null || (_e$response = e.response) == null ? void 0 : _e$response.status) === 404) {
+	          return {
+	            result: false,
+	            reason: SwapProvider.NO_SWAPS_REASONS.NOT_SUPPORTED,
+	            smallestMin: min,
+	            greatestMax: max
+	          };
+	        }
+	        if ((e == null || (_e$response2 = e.response) == null ? void 0 : _e$response2.status) === 429) {
 	          return {
 	            result: false,
 	            reason: SwapProvider.COMMON_ERRORS.REQUESTS_LIMIT_EXCEEDED
@@ -11272,7 +11309,7 @@
 	          throw new Error(errorMessage);
 	        });
 	      }, function (e) {
-	        var _e$response2, _e$response3;
+	        var _e$response3, _e$response4;
 	        Logger.logError(e, loggerSource, "Failed to create swap. Error is: " + safeStringify(e));
 	        var composeFailResult = function composeFailResult(reason) {
 	          return {
@@ -11280,8 +11317,8 @@
 	            reason: reason
 	          };
 	        };
-	        var status = e == null || (_e$response2 = e.response) == null ? void 0 : _e$response2.status;
-	        var data = e == null || (_e$response3 = e.response) == null ? void 0 : _e$response3.data;
+	        var status = e == null || (_e$response3 = e.response) == null ? void 0 : _e$response3.status;
+	        var data = e == null || (_e$response4 = e.response) == null ? void 0 : _e$response4.data;
 	        if (status === 429) {
 	          Logger.log("Returning fail - RPS limit exceeded " + data, loggerSource);
 	          return composeFailResult(SwapProvider.COMMON_ERRORS.REQUESTS_LIMIT_EXCEEDED);
@@ -11326,7 +11363,10 @@
 	            var isExpiredByTime = expiresAt && expiresAt < Date.now();
 	            var status = _this5._mapLetsExchangeStatusToRabbitStatus(swap.status, isExpiredByTime);
 	            var toDigits = status === SwapProvider.SWAP_STATUSES.REFUNDED ? fromCoin.digits : toCoin.digits;
-	            return new ExistingSwap(swapIds[index], status, createdAt, expiresAt, swap.confirmations, AmountUtils.trim(swap.rate, _this5._maxRateDigits), swap.is_float != null ? !swap.is_float : false, swap["return"], swap.deposit, fromCoin, AmountUtils.trim(swap.deposit_amount, fromCoin.digits), swap.hash_in, swap.hash_in ? "" + swap.coin_from_explorer_url + swap.hash_in : null, toCoin, AmountUtils.trim(swap.withdrawal_amount, toDigits), swap.hash_out, swap.hash_out ? "" + swap.coin_to_explorer_url + swap.hash_out : null, swap.withdrawal, "letsexchange", (_swap$deposit_extra_i = swap.deposit_extra_id) != null ? _swap$deposit_extra_i : null, (_swap$withdrawal_extr = swap.withdrawal_extra_id) != null ? _swap$withdrawal_extr : null, (_swap$return_extra_id = swap.return_extra_id) != null ? _swap$return_extra_id : null);
+	            var deposit = swap.real_deposit_amount && swap.real_deposit_amount !== "" ? swap.real_deposit_amount : swap.deposit_amount;
+	            var withdrawal = swap.real_withdrawal_amount && swap.real_withdrawal_amount !== "" ? swap.real_withdrawal_amount : swap.withdrawal_amount;
+	            var rate = bignumber_js.BigNumber(withdrawal).div(deposit).toFixed(_this5._maxRateDigits); // We don't use their rate as it excludes their fee
+	            return new ExistingSwap(swapIds[index], status, createdAt, expiresAt, swap.confirmations, rate, swap.is_float != null ? !swap.is_float : false, swap["return"], swap.deposit, fromCoin, AmountUtils.trim(deposit, fromCoin.digits), swap.hash_in, swap.hash_in ? "" + swap.coin_from_explorer_url + swap.hash_in : null, toCoin, AmountUtils.trim(withdrawal, toDigits), swap.hash_out, swap.hash_out ? "" + swap.coin_to_explorer_url + swap.hash_out : null, swap.withdrawal, "letsexchange", (_swap$deposit_extra_i = swap.deposit_extra_id) != null ? _swap$deposit_extra_i : null, (_swap$withdrawal_extr = swap.withdrawal_extra_id) != null ? _swap$withdrawal_extr : null, (_swap$return_extra_id = swap.return_extra_id) != null ? _swap$return_extra_id : null);
 	          }).flat();
 	          Logger.log("Swap details result " + safeStringify(swaps), loggerSource);
 	          return {
@@ -11335,7 +11375,7 @@
 	          };
 	        });
 	      }, function (e) {
-	        var _e$response4, _e$response5;
+	        var _e$response5, _e$response6;
 	        Logger.logError(e, loggerSource, "Failed to get swap details. Error is: " + safeStringify(e));
 	        var composeFailResult = function composeFailResult(reason) {
 	          return {
@@ -11343,8 +11383,8 @@
 	            reason: reason
 	          };
 	        };
-	        var status = e == null || (_e$response4 = e.response) == null ? void 0 : _e$response4.status;
-	        var data = e == null || (_e$response5 = e.response) == null ? void 0 : _e$response5.data;
+	        var status = e == null || (_e$response5 = e.response) == null ? void 0 : _e$response5.status;
+	        var data = e == null || (_e$response6 = e.response) == null ? void 0 : _e$response6.data;
 	        if (status === 429) {
 	          Logger.log("Returning fail - RPS limit exceeded " + data, loggerSource);
 	          return composeFailResult(SwapProvider.COMMON_ERRORS.REQUESTS_LIMIT_EXCEEDED);
@@ -11354,21 +11394,22 @@
 	    } catch (e) {
 	      return Promise.reject(e);
 	    }
-	  } // TODO: [dev] Serg, please check this during the review to make sure I did no mistakes in statuses mapping.
-	  //   I will remove these comments after the review. https://api.letsexchange.io/doc
-	  // wait	The exchange has just been created and it’s waiting for coins to reach the deposit wallet
-	  // confirmation	The transaction appears in mempool and now it is waiting for necessary network confirmations to start.
-	  // confirmed	The user’s payment is confirmed, the exchange process is about to start.
-	  // exchanging	The exchange process is running.
-	  // sending	Funds are being sent to the recipient`s address.
-	  // sending_confirmation	The outgoing transaction is waiting for network confirmations.
-	  // success	The exchange is completed and the funds are successfully sent to the recipient’s address.
-	  // aml_check_failed	The deposit was marked as risky by AML check service.
-	  // overdue	The deposit receiving time for this transaction has expired.
-	  // error	The transaction has failed. In most cases, the amount that was sent differs from the amount that was specified when creating the transaction.
-	  // refund	The exchange failed and the coins were refunded to the user's wallet.
-	  ;
+	  };
 	  _proto._mapLetsExchangeStatusToRabbitStatus = function _mapLetsExchangeStatusToRabbitStatus(status, isExpiredByTime) {
+	    /**
+	     * Lets exchange statuses description
+	     * wait - The exchange has just been created and it’s waiting for coins to reach the deposit wallet
+	     * confirmation - The transaction appears in mempool and now it is waiting for necessary network confirmations to start.
+	     * confirmed - The user’s payment is confirmed, the exchange process is about to start.
+	     * exchanging -	The exchange process is running.
+	     * sending - Funds are being sent to the recipient`s address.
+	     * sending_confirmation - The outgoing transaction is waiting for network confirmations.
+	     * success - The exchange is completed and the funds are successfully sent to the recipient’s address.
+	     * aml_check_failed - The deposit was marked as risky by AML check service.
+	     * overdue - The deposit receiving time for this transaction has expired.
+	     * error - The transaction has failed. In most cases, the amount that was sent differs from the amount that was specified when creating the transaction.
+	     * refund -	The exchange failed and the coins were refunded to the user's wallet.
+	     */
 	    switch (status) {
 	      case "wait":
 	        if (isExpiredByTime) {
@@ -11382,7 +11423,7 @@
 	      case "exchanging":
 	        return SwapProvider.SWAP_STATUSES.EXCHANGING;
 	      case "sending":
-	        return SwapProvider.SWAP_STATUSES.PAYMENT_RECEIVED;
+	        return SwapProvider.SWAP_STATUSES.EXCHANGING;
 	      case "sending_confirmation":
 	        return SwapProvider.SWAP_STATUSES.EXCHANGING;
 	      case "success":
@@ -11602,7 +11643,7 @@
 	   *
 	   * @param fromCoin {Coin}
 	   * @param toCoin {Coin}
-	   * @param fromAmountCoins {string}
+	   * @param amountCoins {string}
 	   * @param [fixed=false] {boolean|null} null means fixed or float doesn't matter
 	   * @param [withoutFiat=false] {boolean} pass true if you don't need the fiat equivalent - this will diminish requests count
 	   * @param [amountIsToReceive=false] {boolean} whether the given amount is receiving amount.
@@ -11621,7 +11662,7 @@
 	   *         }>}
 	   */
 	  ;
-	  _proto.getPublicSwapDetails = function getPublicSwapDetails(fromCoin, toCoin, fromAmountCoins, fixed, withoutFiat, amountIsToReceive) {
+	  _proto.getPublicSwapDetails = function getPublicSwapDetails(fromCoin, toCoin, amountCoins, fixed, withoutFiat, amountIsToReceive) {
 	    if (fixed === void 0) {
 	      fixed = false;
 	    }
@@ -11638,7 +11679,7 @@
 	        function _temp2(_getCoinToUSDTRate) {
 	          var _getCoinToUSDTRate$ra;
 	          var coinUsdtRate = withoutFiat ? _getCoinToUSDTRate : (_getCoinToUSDTRate$ra = _getCoinToUSDTRate == null ? void 0 : _getCoinToUSDTRate.rate) != null ? _getCoinToUSDTRate$ra : null;
-	          return Promise.resolve((fixed ? _this7._fixedSwapProvider : _this7._swapProvider).getSwapInfo(fromCoin, toCoin, fromAmountCoins, fixed, coinUsdtRate, amountIsToReceive)).then(function (details) {
+	          return Promise.resolve((fixed ? _this7._fixedSwapProvider : _this7._swapProvider).getSwapInfo(fromCoin, toCoin, amountCoins, fixed, coinUsdtRate, amountIsToReceive)).then(function (details) {
 	            var _result$swapCreationI, _result$swapCreationI2;
 	            // eslint-disable-next-line no-console
 	            console.log("getSwapInfo result: ", details);
@@ -11678,13 +11719,14 @@
 	                return composeFailResult(PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS.NO_FIXED_BUT_HAVE_FLOATING_PUBLIC_SWAP_OPTION);
 	              }
 	            }
-	            var fromAmountBigNumber = bignumber_js.BigNumber(fromAmountCoins);
-	            if (typeof min === "string" && fromAmountBigNumber.lt(min)) {
+	            var amountBigNumber = bignumber_js.BigNumber(amountCoins);
+	            if (typeof min === "string" && amountBigNumber.lt(min)) {
 	              return composeFailResult(PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS.AMOUNT_LESS_THAN_MIN_SWAPPABLE);
-	            } else if (typeof max === "string" && fromAmountBigNumber.gt(max)) {
+	            } else if (typeof max === "string" && amountBigNumber.gt(max)) {
 	              return composeFailResult(PublicSwapService.PUBLIC_SWAP_DETAILS_FAIL_REASONS.AMOUNT_HIGHER_THAN_MAX_SWAPPABLE);
 	            }
-	            var toAmountCoins = AmountUtils.trim(fromAmountBigNumber.times(details.rate), fromCoin.digits);
+	            var fromAmountCoins = amountIsToReceive ? AmountUtils.trim(amountBigNumber.div(details.rate), fromCoin.digits) : amountCoins;
+	            var toAmountCoins = amountIsToReceive ? amountCoins : AmountUtils.trim(amountBigNumber.times(details.rate), toCoin.digits);
 	            var result = {
 	              result: true,
 	              swapCreationInfo: new BaseSwapCreationInfo(fromCoin, toCoin, fromAmountCoins, toAmountCoins, details.rate, details.rawSwapData, min, fiatMin, max, fiatMax, details.durationMinutesRange, details.fixed, details.isRefundAddressRequired)