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

package/dist/index.modern.js

@@ -4288,9 +4288,12 @@ const SwapForm = ({
   var _isFixedRate$current2, _isFixedRate$current3, _maximumAmount$curren4, _maximumAmount$curren5, _maximumAmount$curren6, _minimalAmount$curren5;
   const DETAIL_REFRESH_INTERVAL_MS = 1.5 * 60000;
   const IS_FIXED_BY_DEFAULT = false;
+
+  // Updating the states below will insert the new value into the send or receive input field
   const [updateSendInputTo, setUpdateSendInputTo] = useState(_preservedAmount != null ? _preservedAmount : null);
   const [updateReceiveInputTo, setUpdateReceiveInputTo] = useState(null);
   const [sendAssetAmount, setSendAssetAmount] = useReferredState(_preservedAmount == null || _preservedAmount === "" ? null : _preservedAmount);
+  const [receiveAssetAmount, setReceiveAssetAmount] = useReferredState(null);
   const [swapRate, setSwapRate] = useState();
   const [minimalAmount, setMinimalAmount] = useReferredState(null);
   const [maximumAmount, setMaximumAmount] = useReferredState(null);
@@ -4301,6 +4304,8 @@ const SwapForm = ({
   const [isSameCoins, setIsSameCoins] = useState(false);
   const [isSwapCalculated, setIsSwapCalculated] = useState(false);
   const [readyToSwap, setReadyToSwap] = useState(false); // Basically a param that enables/disables the "Next" button
+  // TODO: [refactoring, moderate] instead of handling preservedAmount at a lot of cases below, just
+  //       write single useEffect setting sendAssetAmount to the=is passed value and simplify the logic below. task_id=6453251e49b04c5e88a3cc771479ffb5
   const [isAmountZero, setIsAmountZero] = useState(_preservedAmount == null || String(_preservedAmount) === "0");
   const [isLoading, setIsLoading] = useReferredState(false); // Whether the form is in the progress of loading some data (new rates, for example)
   const [isFixedRate, setIsFixedRate] = useReferredState(null);
@@ -4326,14 +4331,17 @@ const SwapForm = ({
   const displayRateSelector = !_formHasBalance;
   const handleSendAssetAmountChange = amount => {
     setIsLastEditedReceiving(false);
+    const receiveAmount = AmountUtils.trim(BigNumber(amount).times(swapRate), _receivingAssetDecimalCount);
     if (amount != null && amount !== "") {
-      setUpdateReceiveInputTo(AmountUtils.trim(BigNumber(amount).times(swapRate), _receivingAssetDecimalCount));
+      setReceiveAssetAmount(receiveAmount);
+      setUpdateReceiveInputTo(receiveAmount);
     } else {
       setUpdateReceiveInputTo("");
     }
     setSendAssetAmount(amount);
   };
   const handleReceiveAssetAmountChange = amount => {
+    setReceiveAssetAmount(amount);
     setIsLastEditedReceiving(true);
     let sendAssetAmount = "";
     if (amount != null && amount !== "") {
@@ -4515,7 +4523,7 @@ const SwapForm = ({
   };
   const handleRateModeChanged = isFixed => {
     setIsFixedRate(isFixed);
-    requestDataRefresh(sendAssetAmount.current, true);
+    requestDataRefresh(isLastEditedReceiving ? receiveAssetAmount.current : sendAssetAmount.current, true);
   };
   useEffect(() => {
     if (isSwapAll.current === true) {
@@ -4538,7 +4546,7 @@ const SwapForm = ({
     const isCurrentAmountNotZero = sendAssetAmount.current && !BigNumber("0").eq(sendAssetAmount.current);
     const isPreservedAmountNotZero = _preservedAmount && !BigNumber("0").eq(_preservedAmount);
     if (isCurrentAmountNotZero) {
-      loadFullEstimation(sendAssetAmount.current);
+      loadFullEstimation(isLastEditedReceiving ? receiveAssetAmount.current : sendAssetAmount.current);
     } else if (isPreservedAmountNotZero) {
       loadFullEstimation(_preservedAmount, true);
     } else {
@@ -4589,7 +4597,7 @@ const SwapForm = ({
     if (readyToSwap) {
       timeoutId = setTimeout(() => {
         var _sendAssetAmount$curr;
-        return requestDataRefresh((_sendAssetAmount$curr = sendAssetAmount.current) != null ? _sendAssetAmount$curr : _preservedAmount, true);
+        return requestDataRefresh(isLastEditedReceiving ? receiveAssetAmount.current : (_sendAssetAmount$curr = sendAssetAmount.current) != null ? _sendAssetAmount$curr : _preservedAmount, true);
       }, DETAIL_REFRESH_INTERVAL_MS);
       setIdleDataUpdateTimeoutId(timeoutId);
     } else {
@@ -4632,7 +4640,8 @@ const SwapForm = ({
     setConfirmButtonTo(_composeConfirmButtonTo(sendingAssetTicker, receivingAssetTicker, sendAssetAmount.current));
     if (sendAssetAmount.current == null) return;
     let processingAmount = sendAssetAmount.current === "" ? "0" : sendAssetAmount.current;
-    requestDataRefresh(processingAmount);
+    let processingReceivingAmount = receiveAssetAmount.current === "" ? "0" : receiveAssetAmount.current;
+    requestDataRefresh(isLastEditedReceiving ? processingReceivingAmount : processingAmount);
     processMinMaxAmounts(processingAmount);
     setIsAmountZero(BigNumber("0").eq(processingAmount));
     setIsSwapCalculated(false);
@@ -4783,7 +4792,7 @@ const SwapForm = ({
     size: "lg",
     mode: "primary",
     content: _translations.confirmButtonText,
-    onClick: resetButtonLoader => _handleConfirmButtonClick(resetButtonLoader, setValidationContent, setBalanceValid, setMinimalAmountValid, setMaximumAmountValid, setIsPairSupported, setIsSameCoins, recipientAddress.current, recipientAddressExtraId.current, refundAddress.current, refundAddressExtraId.current),
+    onClick: resetButtonLoader => _handleConfirmButtonClick(resetButtonLoader, setValidationContent, setBalanceValid, setMinimalAmountValid, setMaximumAmountValid, setIsPairSupported, setIsSameCoins, recipientAddress.current, recipientAddressExtraId.current, refundAddress.current, refundAddressExtraId.current, isLastEditedReceiving),
     fullWidthOnMobiles: true,
     isDisabled: !readyToSwap,
     to: _formHasBalance ? "" : confirmButtonTo,