@rabbitio/ui-kit 1.0.0-beta.68 → 1.0.0-beta.69

package/package.json

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

package/src/components/organisms/SwapForm/SwapForm.jsx

@@ -828,6 +828,7 @@ export const SwapForm = ({
                     />
                 </div>
                 <div className={s["swap-form-information-field"]}>
+                    {/* TODO: [refactoring, moderate] Add flags calculation for each message to avoid this ugly cumbersome implicit unclear logic of message displaying. task_id=8bc31dbcd94d46a598346e8bfb505971 */}
                     <p>
                         {!isPairSupported ? (
                             translations.informationBlock.pairNotAvailable
@@ -845,7 +846,7 @@ export const SwapForm = ({
                                     ""
                                 )}
                             </>
-                        ) : isSwapCalculated || (!minimalAmount.current && swapRate) ? (
+                        ) : !isLoading.current && (isSwapCalculated || (!minimalAmount.current && swapRate)) ? (
                             <>
                                 {translations.informationBlock.swapRate}
                                 <span>
@@ -902,12 +903,16 @@ export const SwapForm = ({
                                     )}
                                 </>
                             )
-                        ) : sendAssetAmount.current || isSwapAll.current ? (
-                            translations.informationBlock[
-                                formHasBalance ? "calculatingNetworkFee" : "calculatingSwapRates"
-                            ]
+                        ) : isLoading.current ? (
+                            sendAssetAmount.current || isSwapAll.current ? (
+                                translations.informationBlock[
+                                    formHasBalance ? "calculatingNetworkFee" : "calculatingSwapRates"
+                                ]
+                            ) : (
+                                translations.informationBlock.loadingMinimalAmount
+                            )
                         ) : (
-                            translations.informationBlock.loadingMinimalAmount
+                            ""
                         )}
                     </p>
                 </div>

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

@@ -173,8 +173,14 @@ export class PublicSwapService {
                 fixed,
                 coinUsdtRate
             );
-            const min = details.smallestMin;
-            const max = details.greatestMax;
+
+            // eslint-disable-next-line no-console
+            console.log("getSwapInfo result: ", details);
+
+            const min =
+                details.smallestMin != null && BigNumber(details.smallestMin).gt("0") ? details.smallestMin : null;
+            const max =
+                details.greatestMax != null && BigNumber(details.greatestMax).gt("0") ? details.greatestMax : null;
             let fiatMin = null,
                 fiatMax = null;
             if (coinUsdtRate != null) {