@rabbitio/ui-kit 1.0.0-beta.89 → 1.0.0-beta.90

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

@@ -77,8 +77,8 @@ describe("swapspaceSwapProvider", function () {
         beforeEach(() => {
             swapspaceSwapProvider = new SwapspaceSwapProvider("/", new Cache());
             swapspaceSwapProvider._supportedCoins = [
-                { coin: BTC, extraId: "" },
-                { coin: ETH, extraId: "" },
+                { coin: BTC, extraIdName: "" },
+                { coin: ETH, extraIdName: "" },
             ];
 
             fetchSupportedCurrenciesStub = sinon.stub(swapspaceSwapProvider, "_fetchSupportedCurrenciesIfNeeded");
@@ -102,6 +102,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should fetch supported currencies", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -116,6 +118,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should send an axios POST request", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -130,6 +134,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should send the request to the correct URL", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -144,6 +150,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should pass client IP address in request data", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -159,6 +167,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should pass provided refund address in request data", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -174,6 +184,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should use rateId from rawSwapData in request data", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -259,20 +271,19 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.args[0][1].refundExtraId.should.be.equal("");
         });
 
-        it("Should use rawSwapData to form requestData currencies and networks", async () => {
+        it("Should use coins list to form requestData currencies and networks", async () => {
+            swapspaceSwapProvider._supportedCoins = [
+                { coin: USDCTRC20, code: "from-test", network: "from-network-test" },
+                { coin: ETH, code: "to-test", network: "to-network-test" },
+            ];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
                 anyAmount,
                 anyReceivingAddress,
                 anyRefundAddress,
-                {
-                    ...anyValidRawSwapData,
-                    fromCurrency: "from-test",
-                    fromNetwork: "from-network-test",
-                    toCurrency: "to-test",
-                    toNetwork: "to-network-test",
-                },
+                anyValidRawSwapData,
                 anyIp,
                 false
             );
@@ -283,12 +294,13 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.args[0][1].should.have.property("toNetwork", "to-network-test");
         });
 
-        ["fromCurrency", "fromNetwork", "toCurrency", "toNetwork", "id", "partner"].forEach(rawSwapDataProperty => {
+        ["id", "partner"].forEach(rawSwapDataProperty => {
             it(`Should reject if raw swap data contains wrong ${rawSwapDataProperty}`, async () => {
                 const rawSwapData = {
                     ...anyValidRawSwapData,
                     [rawSwapDataProperty]: null,
                 };
+                swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
                 await swapspaceSwapProvider
                     .createSwap(
@@ -306,6 +318,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should send partner from rawSwapData when provided", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -322,6 +336,8 @@ describe("swapspaceSwapProvider", function () {
 
         [false, true].forEach(fixed => {
             it("Should ensure that fixed is always set to passed fixed value in the request data", async () => {
+                swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
                 await swapspaceSwapProvider.createSwap(
                     USDCTRC20,
                     ETH,
@@ -338,6 +354,8 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should ensure all required parameters are passed to axios", async () => {
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
+
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -368,7 +386,7 @@ describe("swapspaceSwapProvider", function () {
         });
 
         it("Should handle cases where toCurrencyExtraId is not found for the coin", async () => {
-            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20, extraId: "" }, { coin: ETH }];
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20, extraIdName: "" }, { coin: ETH }];
             await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
                 ETH,
@@ -384,6 +402,7 @@ describe("swapspaceSwapProvider", function () {
 
         it("Should throw an error if swap creation response is invalid", async () => {
             axiosPostStub.resolves({ data: {} });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -401,6 +420,7 @@ describe("swapspaceSwapProvider", function () {
 
         it("Should handle status 429 and return requests limit exceeded", async () => {
             axiosPostStub.rejects({ response: { status: 429 } });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -420,6 +440,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 422, data: "Pair cannot be processed by" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -439,6 +460,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 403, data: "IP address is forbidden" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -458,6 +480,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 422, data: "Amount maximum is" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -477,6 +500,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 422, data: "Amount minimum is" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -496,6 +520,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 422, data: "Currency not found" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -521,6 +546,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -546,6 +572,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -571,6 +598,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -604,6 +632,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -629,6 +658,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -654,6 +684,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -680,6 +711,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -854,86 +886,6 @@ describe("swapspaceSwapProvider", function () {
             error.message.should.match(/.*Invalid input: .*/);
         });
 
-        it("Should throw an error if swap data has not string fromCurrency", async () => {
-            let error;
-            try {
-                await swapspaceSwapProvider.createSwap(
-                    BTC,
-                    ETH,
-                    anyAmount,
-                    anyReceivingAddress,
-                    anyRefundAddress,
-                    { ...anyValidRawSwapData, fromCurrency: undefined },
-                    anyIp,
-                    false
-                );
-            } catch (e) {
-                error = e;
-            }
-
-            error.message.should.match(/.*Invalid raw swap data: .*/);
-        });
-
-        it("Should throw an error if swap data has not string fromNetwork", async () => {
-            let error;
-            try {
-                await swapspaceSwapProvider.createSwap(
-                    BTC,
-                    ETH,
-                    anyAmount,
-                    anyReceivingAddress,
-                    anyRefundAddress,
-                    { ...anyValidRawSwapData, fromNetwork: undefined },
-                    anyIp,
-                    false
-                );
-            } catch (e) {
-                error = e;
-            }
-
-            error.message.should.match(/.*Invalid raw swap data: .*/);
-        });
-
-        it("Should throw an error if swap data has not string toCurrency", async () => {
-            let error;
-            try {
-                await swapspaceSwapProvider.createSwap(
-                    BTC,
-                    ETH,
-                    anyAmount,
-                    anyReceivingAddress,
-                    anyRefundAddress,
-                    { ...anyValidRawSwapData, toCurrency: undefined },
-                    anyIp,
-                    false
-                );
-            } catch (e) {
-                error = e;
-            }
-
-            error.message.should.match(/.*Invalid raw swap data: .*/);
-        });
-
-        it("Should throw an error if swap data has not string toNetwork", async () => {
-            let error;
-            try {
-                await swapspaceSwapProvider.createSwap(
-                    BTC,
-                    ETH,
-                    anyAmount,
-                    anyReceivingAddress,
-                    anyRefundAddress,
-                    { ...anyValidRawSwapData, toNetwork: undefined },
-                    anyIp,
-                    false
-                );
-            } catch (e) {
-                error = e;
-            }
-
-            error.message.should.match(/.*Invalid raw swap data: .*/);
-        });
-
         it("Should throw an error if swap data has not string id", async () => {
             let error;
             try {
@@ -964,6 +916,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -988,6 +941,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1007,6 +961,7 @@ describe("swapspaceSwapProvider", function () {
             axiosPostStub.rejects({
                 response: { status: 500, data: "Server Error" },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             let error;
             try {
@@ -1030,6 +985,7 @@ describe("swapspaceSwapProvider", function () {
 
         it("Should handle network errors without response data", async () => {
             axiosPostStub.rejects(new Error("Network Error"));
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1055,6 +1011,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             const result = await swapspaceSwapProvider.createSwap(
                 USDCTRC20,
@@ -1072,6 +1029,7 @@ describe("swapspaceSwapProvider", function () {
 
         it("Should reject when _fetchSupportedCurrenciesIfNeeded throws an error", async () => {
             fetchSupportedCurrenciesStub.rejects(new Error("Fetching Error"));
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1089,6 +1047,7 @@ describe("swapspaceSwapProvider", function () {
 
         it("Should handle the scenario when axios.post throws an error with no response object", async () => {
             axiosPostStub.rejects(new Error("Network Error"));
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1106,6 +1065,7 @@ describe("swapspaceSwapProvider", function () {
 
         it('Should handle axios.post returning a response with no "id"', async () => {
             axiosPostStub.resolves({ data: {} });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1131,6 +1091,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1156,6 +1117,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1182,6 +1144,7 @@ describe("swapspaceSwapProvider", function () {
                 },
             });
 
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
             await swapspaceSwapProvider
                 .createSwap(
                     USDCTRC20,
@@ -1206,6 +1169,7 @@ describe("swapspaceSwapProvider", function () {
                     fixed: false,
                 },
             });
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
 
             await swapspaceSwapProvider
                 .createSwap(
@@ -1232,6 +1196,7 @@ describe("swapspaceSwapProvider", function () {
                 },
             });
 
+            swapspaceSwapProvider._supportedCoins = [{ coin: USDCTRC20 }, { coin: ETH }];
             await swapspaceSwapProvider
                 .createSwap(
                     USDCTRC20,

package/src/swaps-lib/utils/swapUtils.js

@@ -128,7 +128,7 @@ export class SwapUtils {
             let remainingSwapIds = new Set(swapIds);
             const failResults = [];
             for (let provider of swapProviders) {
-                const result = await provider.getExistingSwapsDetailsAndStatus([...remainingSwapIds]);
+                const result = await provider.getExistingSwapsDetailsAndStatus(Array.from(remainingSwapIds));
                 if (result.result) {
                     const extendedSwaps = [];
                     for (let swap of result.swaps) {

package/src/ui-kit/components/organisms/SwapForm/SwapForm.jsx

@@ -815,6 +815,7 @@ export const SwapForm = ({
     useEffect(() => {
         (async () => {
             if (!receivingAssetTicker) return;
+            setValidationContent("");
             setIsRecipientAddressValid(
                 recipientAddress.current === ""
                     ? false
@@ -832,6 +833,7 @@ export const SwapForm = ({
     useEffect(() => {
         (async () => {
             if (!sendingAssetTicker || !isRefundAddressRequired) return;
+            setValidationContent("");
             setIsRefundAddressValid(
                 refundAddress.current === ""
                     ? false
@@ -1030,7 +1032,7 @@ export const SwapForm = ({
                         assetIconProtocolSrc={receivingAssetProtocolIconSrc}
                         fallbackAssetIconSrc={fallBackAssetIconSrc}
                         disabled={isSwapAll.current || sendingAssetTicker === null || receivingAssetTicker === null}
-                        locked={!formHasBalance}
+                        locked
                         handleCoinAmountChange={handleReceiveAssetAmountChange}
                         handleChangeAssetClick={handleChangeReceivingAssetClick}
                         updateAssetInputTo={updateReceiveInputTo}