From 4bf8a07e8ece2fd338aa6143362d236f66bf2b86 Mon Sep 17 00:00:00 2001
From: Michael Absolon <absolon.mm@gmail.com>
Date: Thu, 12 Dec 2024 01:33:39 +0100
Subject: [PATCH] =?UTF-8?q?feat(playground):=20Add=20support=20for=20multi?=
 =?UTF-8?q?-assets=20to=20playground=20=F0=9F=9B=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CurrencySelection.tsx      | 131 +++++----
 .../src/components/RouterTransferForm.tsx     |  63 ++--
 .../src/components/TransferForm.tsx           | 180 ------------
 .../src/components/TransferInfoForm.tsx       |  29 +-
 .../src/components/assets/AssetsForm.tsx      |  82 +++---
 .../eth-bridge/EthBridgeTransfer.tsx          |   3 +-
 .../eth-bridge/EthBridgeTransferForm.tsx      |   7 +-
 .../components/{ => transfer}/XcmTransfer.tsx |  65 +++--
 .../components/transfer/XcmTransferForm.tsx   | 270 ++++++++++++++++++
 apps/playground/src/routes/XcmSdkSandbox.tsx  |   2 +-
 .../x-transfer-eth/dto/x-transfer-eth.dto.ts  |  11 +-
 .../x-transfer-eth.controller.test.ts         |   3 +-
 .../x-transfer-eth.service.test.ts            |  15 +-
 .../x-transfer-eth/x-transfer-eth.service.ts  |   2 -
 .../src/x-transfer/dto/XTransferDto.ts        |   6 +
 .../builder/evm-builder/EvmBuilder.test.ts    |  25 +-
 .../sdk/src/builder/evm-builder/EvmBuilder.ts |  23 +-
 .../src/nodes/xTokens/XTokensTransferImpl.ts  |   7 +-
 .../buildEthTransferOptions.test.ts           |  15 +-
 .../ethTransfer/buildEthTransferOptions.ts    |   5 +-
 .../xcmPallet/ethTransfer/ethTransfer.test.ts |   3 +-
 .../xcmPallet/ethTransfer/ethTransfer.ts      |   4 +-
 .../transfer/resolveOverriddenAsset.test.ts   |   2 +-
 .../transfer/resolveOverriddenAsset.ts        |   4 +-
 packages/sdk/src/types/TBuilder.ts            |   8 +-
 packages/sdk/src/types/TCurrency.ts           |   2 +
 .../transfer/buildTransferExtrinsics.test.ts  |  20 ++
 .../src/transfer/buildTransferExtrinsics.ts   |  18 +-
 .../src/transfer/transferFromEthereum.ts      |   6 +-
 29 files changed, 554 insertions(+), 457 deletions(-)
 delete mode 100644 apps/playground/src/components/TransferForm.tsx
 rename apps/playground/src/components/{ => transfer}/XcmTransfer.tsx (76%)
 create mode 100644 apps/playground/src/components/transfer/XcmTransferForm.tsx

diff --git a/apps/playground/src/components/CurrencySelection.tsx b/apps/playground/src/components/CurrencySelection.tsx
index 24bb5b41..9cda50cc 100644
--- a/apps/playground/src/components/CurrencySelection.tsx
+++ b/apps/playground/src/components/CurrencySelection.tsx
@@ -11,71 +11,88 @@ import {
   JsonInput,
 } from "@mantine/core";
 import type { UseFormReturnType } from "@mantine/form";
-import type { FormValues } from "./TransferForm";
+import type { FormValues } from "./transfer/XcmTransferForm";
 import { isRelayChain } from "@paraspell/sdk";
 
 type Props = {
   form: UseFormReturnType<FormValues>;
   currencyOptions: ComboboxItem[];
+  index: number;
 };
 
-const CurrencySelection: FC<Props> = ({ form, currencyOptions }) => {
+const CurrencySelection: FC<Props> = ({ form, currencyOptions, index }) => {
+  const { from, to, currencies } = form.getValues();
+
+  const isCustomCurrency = currencies[index].isCustomCurrency;
+  const customCurrencyType = currencies[index].customCurrencyType;
+
   useEffect(() => {
-    if (!form.values.customCurrencyType) return;
-    form.setFieldValue("customCurrency", "");
-  }, [form.values.customCurrencyType]);
+    if (!customCurrencyType) return;
+    form.setFieldValue(`currencies.${index}.customCurrency`, "");
+  }, [customCurrencyType]);
 
-  const isRelayToPara = isRelayChain(form.values.from);
-  const isParaToRelay = isRelayChain(form.values.to);
+  const isRelayToPara = isRelayChain(from);
+  const isParaToRelay = isRelayChain(to);
 
   const isNotParaToPara = isRelayToPara || isParaToRelay;
 
+  // If it's not para-to-para, we do not allow custom currencies
   useEffect(() => {
     if (isNotParaToPara) {
-      form.setFieldValue("isCustomCurrency", false);
+      form.setFieldValue(`currencies.${index}.isCustomCurrency`, false);
     }
   }, [isNotParaToPara]);
 
+  const options = [
+    { label: "Asset ID", value: "id" },
+    { label: "Symbol", value: "symbol" },
+    { label: "Multi-location", value: "multilocation" },
+    ...(currencies.length === 1
+      ? [{ label: "Override Multi-location", value: "overridenMultilocation" }]
+      : []),
+  ];
+
+  const size = currencies.length > 1 ? "xs" : "sm";
+
   return (
     <Stack gap="xs">
-      {form.values.isCustomCurrency &&
-        (form.values.customCurrencyType === "id" ||
-          form.values.customCurrencyType === "symbol") && (
+      {isCustomCurrency &&
+        (customCurrencyType === "id" || customCurrencyType === "symbol") && (
           <TextInput
+            size={size}
             label="Custom currency"
-            placeholder={
-              form.values.customCurrencyType === "id" ? "Asset ID" : "Symbol"
-            }
+            placeholder={customCurrencyType === "id" ? "Asset ID" : "Symbol"}
             required
-            {...form.getInputProps("customCurrency")}
+            {...form.getInputProps(`currencies.${index}.customCurrency`)}
           />
         )}
 
-      {form.values.isCustomCurrency &&
-        form.values.customCurrencyType === "multilocation" && (
-          <JsonInput
-            placeholder="Input Multi-Location JSON or interior junctions JSON to search for and identify the asset"
-            formatOnBlur
-            autosize
-            minRows={10}
-            {...form.getInputProps("customCurrency")}
-          />
-        )}
+      {isCustomCurrency && customCurrencyType === "multilocation" && (
+        <JsonInput
+          size={size}
+          placeholder="Input Multi-Location JSON or interior junctions JSON"
+          formatOnBlur
+          autosize
+          minRows={10}
+          {...form.getInputProps(`currencies.${index}.customCurrency`)}
+        />
+      )}
 
-      {form.values.isCustomCurrency &&
-        form.values.customCurrencyType === "overridenMultilocation" && (
-          <JsonInput
-            placeholder="Provide the XCM Multi-Location JSON to override the default configuration"
-            formatOnBlur
-            autosize
-            minRows={10}
-            {...form.getInputProps("customCurrency")}
-          />
-        )}
+      {isCustomCurrency && customCurrencyType === "overridenMultilocation" && (
+        <JsonInput
+          size={size}
+          placeholder="Provide the XCM Multi-Location JSON to override the default configuration"
+          formatOnBlur
+          autosize
+          minRows={10}
+          {...form.getInputProps(`currencies.${index}.customCurrency`)}
+        />
+      )}
 
-      {!form.values.isCustomCurrency && (
+      {!isCustomCurrency && (
         <Select
-          key={form.values.from + form.values.to}
+          key={from + to}
+          size={size}
           label="Currency"
           placeholder="Pick value"
           data={currencyOptions}
@@ -84,29 +101,35 @@ const CurrencySelection: FC<Props> = ({ form, currencyOptions }) => {
           searchable
           required
           data-testid="select-currency"
-          {...form.getInputProps("currencyOptionId")}
+          {...form.getInputProps(`currencies.${index}.currencyOptionId`)}
         />
       )}
+
       {!isNotParaToPara && (
         <Group>
-          <Checkbox
-            size="xs"
-            label="Select custom asset"
-            {...form.getInputProps("isCustomCurrency", { type: "checkbox" })}
-          />
-          {form.values.isCustomCurrency && (
+          <Group>
+            <Checkbox
+              size="xs"
+              label="Select custom asset"
+              {...form.getInputProps(`currencies.${index}.isCustomCurrency`, {
+                type: "checkbox",
+              })}
+            />
+            {currencies.length > 1 && (
+              <Checkbox
+                size="xs"
+                label="Is fee asset"
+                {...form.getInputProps(`currencies.${index}.isFeeAsset`, {
+                  type: "checkbox",
+                })}
+              />
+            )}
+          </Group>
+          {isCustomCurrency && (
             <SegmentedControl
               size="xs"
-              data={[
-                { label: "Asset ID", value: "id" },
-                { label: "Symbol", value: "symbol" },
-                { label: "Multi-location", value: "multilocation" },
-                {
-                  label: "Override Multi-location",
-                  value: "overridenMultilocation",
-                },
-              ]}
-              {...form.getInputProps("customCurrencyType")}
+              data={options}
+              {...form.getInputProps(`currencies.${index}.customCurrencyType`)}
             />
           )}
         </Group>
diff --git a/apps/playground/src/components/RouterTransferForm.tsx b/apps/playground/src/components/RouterTransferForm.tsx
index 9975d6bf..fa1268ed 100644
--- a/apps/playground/src/components/RouterTransferForm.tsx
+++ b/apps/playground/src/components/RouterTransferForm.tsx
@@ -164,18 +164,20 @@ const RouterTransferForm: FC<Props> = ({
     },
   });
 
+  const { from, to, exchange } = form.getValues();
+
   useEffect(() => {
-    if (form.values.from === "Ethereum" || form.values.to === "Ethereum") {
+    if (from === "Ethereum" || to === "Ethereum") {
       onAccountDisconnect();
     }
-  }, [form.values.from, form.values.to]);
+  }, [from, to]);
 
   useEffect(() => {
-    if (form.values.from !== "Ethereum" || form.values.to !== "Ethereum") {
+    if (from !== "Ethereum" || to !== "Ethereum") {
       onAssetHubAccountDisconnect();
       onEthWalletDisconnect();
     }
-  }, [form.values.from, form.values.to]);
+  }, [from, to]);
 
   const connectAssetHubWallet = async () => {
     try {
@@ -234,11 +236,7 @@ const RouterTransferForm: FC<Props> = ({
     currencyToMap,
     isFromNotParaToPara,
     isToNotParaToPara,
-  } = useRouterCurrencyOptions(
-    form.values.from,
-    form.values.exchange,
-    form.values.to,
-  );
+  } = useRouterCurrencyOptions(from, exchange, to);
 
   const onSubmitInternal = (values: TRouterFormValues) => {
     const currencyFrom = currencyFromMap[values.currencyFromOptionId];
@@ -388,12 +386,7 @@ const RouterTransferForm: FC<Props> = ({
         />
 
         <Select
-          key={
-            form.values.from +
-            form.values.exchange +
-            form.values.to +
-            "currencyFrom"
-          }
+          key={from + exchange + to + "currencyFrom"}
           label="Currency From"
           placeholder="Pick value"
           data={currencyFromOptions}
@@ -406,12 +399,7 @@ const RouterTransferForm: FC<Props> = ({
         />
 
         <Select
-          key={
-            form.values.from +
-            form.values.exchange +
-            form.values.to +
-            "currencyTo"
-          }
+          key={from + exchange + to + "currencyTo"}
           label="Currency To"
           placeholder="Pick value"
           data={currencyToOptions}
@@ -472,8 +460,7 @@ const RouterTransferForm: FC<Props> = ({
             data-testid="checkbox-api"
           />
           <Button.Group orientation="vertical">
-            {(form.values.from === "Ethereum" ||
-              form.values.to === "Ethereum") && (
+            {(from === "Ethereum" || to === "Ethereum") && (
               <Button
                 size="xs"
                 variant="outline"
@@ -486,8 +473,7 @@ const RouterTransferForm: FC<Props> = ({
                   : "Connect Ethereum Wallet"}
               </Button>
             )}
-            {(form.values.from === "Ethereum" ||
-              form.values.to === "Ethereum") && (
+            {(from === "Ethereum" || to === "Ethereum") && (
               <Button
                 size="xs"
                 variant="outline"
@@ -500,20 +486,19 @@ const RouterTransferForm: FC<Props> = ({
                   : "Connect AssetHub wallet"}
               </Button>
             )}
-            {form.values.from !== "Ethereum" &&
-              form.values.to !== "Ethereum" && (
-                <Button
-                  size="xs"
-                  variant="outline"
-                  onClick={onConnectEvmWallet}
-                  rightSection={infoEvmWallet}
-                  data-testid="connect-evm-wallet"
-                >
-                  {selectedAccount
-                    ? `${selectedAccount?.meta.name} (${selectedAccount?.meta.source})`
-                    : "Connect EVM wallet"}
-                </Button>
-              )}
+            {from !== "Ethereum" && to !== "Ethereum" && (
+              <Button
+                size="xs"
+                variant="outline"
+                onClick={onConnectEvmWallet}
+                rightSection={infoEvmWallet}
+                data-testid="connect-evm-wallet"
+              >
+                {selectedAccount
+                  ? `${selectedAccount?.meta.name} (${selectedAccount?.meta.source})`
+                  : "Connect EVM wallet"}
+              </Button>
+            )}
           </Button.Group>
         </Group>
 
diff --git a/apps/playground/src/components/TransferForm.tsx b/apps/playground/src/components/TransferForm.tsx
deleted file mode 100644
index 854f7527..00000000
--- a/apps/playground/src/components/TransferForm.tsx
+++ /dev/null
@@ -1,180 +0,0 @@
-import { useForm } from "@mantine/form";
-import { isValidWalletAddress } from "../utils";
-import type { FC } from "react";
-import { useEffect } from "react";
-import { Button, Checkbox, Select, Stack, TextInput } from "@mantine/core";
-import type {
-  TAsset,
-  TNodeDotKsmWithRelayChains,
-  TNodeWithRelayChains,
-} from "@paraspell/sdk";
-import {
-  NODES_WITH_RELAY_CHAINS,
-  NODES_WITH_RELAY_CHAINS_DOT_KSM,
-} from "@paraspell/sdk";
-import useCurrencyOptions from "../hooks/useCurrencyOptions";
-import CurrencySelection from "./CurrencySelection";
-
-export type FormValues = {
-  from: TNodeDotKsmWithRelayChains;
-  to: TNodeWithRelayChains;
-  currencyOptionId: string;
-  customCurrency: string;
-  address: string;
-  ahAddress: string;
-  amount: string;
-  useApi: boolean;
-  isCustomCurrency: boolean;
-  customCurrencyType?:
-    | "id"
-    | "symbol"
-    | "multilocation"
-    | "overridenMultilocation";
-};
-
-export type FormValuesTransformed = FormValues & {
-  currency?: TAsset;
-};
-
-type Props = {
-  onSubmit: (values: FormValuesTransformed) => void;
-  loading: boolean;
-};
-
-const TransferForm: FC<Props> = ({ onSubmit, loading }) => {
-  const form = useForm<FormValues>({
-    initialValues: {
-      from: "Astar",
-      to: "Moonbeam",
-      currencyOptionId: "",
-      customCurrency: "",
-      amount: "10000000000000000000",
-      address: "5F5586mfsnM6durWRLptYt3jSUs55KEmahdodQ5tQMr9iY96",
-      ahAddress: "",
-      useApi: false,
-      isCustomCurrency: false,
-      customCurrencyType: "id",
-    },
-
-    validate: {
-      address: (value) =>
-        isValidWalletAddress(value) ? null : "Invalid address",
-      currencyOptionId: (value, values) => {
-        if (values.isCustomCurrency) {
-          return values.customCurrency ? null : "Custom currency is required";
-        } else {
-          return value ? null : "Currency selection is required";
-        }
-      },
-      customCurrency: (value, values) => {
-        if (values.isCustomCurrency) {
-          return value ? null : "Custom currency is required";
-        }
-        return null;
-      },
-      ahAddress: (value, values) => {
-        if (values.to === "Ethereum" && values.from === "Hydration") {
-          return value
-            ? null
-            : "AssetHub address is required for transfers to Ethereum";
-        }
-        return null;
-      },
-    },
-  });
-
-  const { currencyOptions, currencyMap, isNotParaToPara } = useCurrencyOptions(
-    form.values.from,
-    form.values.to,
-  );
-
-  const onSubmitInternal = (values: FormValues) => {
-    if (values.isCustomCurrency) {
-      onSubmit(values);
-      return;
-    }
-
-    const currency = currencyMap[values.currencyOptionId];
-
-    if (!currency) {
-      return;
-    }
-
-    const transformedValues = { ...values, currency: currency };
-
-    onSubmit(transformedValues);
-  };
-
-  useEffect(() => {
-    if (isNotParaToPara && Object.keys(currencyMap).length === 1) {
-      form.setFieldValue("currencyOptionId", Object.keys(currencyMap)[0]);
-    }
-  }, [isNotParaToPara, currencyMap]);
-
-  return (
-    <form onSubmit={form.onSubmit(onSubmitInternal)}>
-      <Stack>
-        <Select
-          label="Origin node"
-          placeholder="Pick value"
-          data={NODES_WITH_RELAY_CHAINS_DOT_KSM}
-          allowDeselect={false}
-          searchable
-          required
-          data-testid="select-origin"
-          {...form.getInputProps("from")}
-        />
-
-        <Select
-          label="Destination node"
-          placeholder="Pick value"
-          data={NODES_WITH_RELAY_CHAINS}
-          allowDeselect={false}
-          searchable
-          required
-          data-testid="select-destination"
-          {...form.getInputProps("to")}
-        />
-
-        <CurrencySelection form={form} currencyOptions={currencyOptions} />
-
-        <TextInput
-          label="Recipient address"
-          placeholder="0x0000000"
-          required
-          data-testid="input-address"
-          {...form.getInputProps("address")}
-        />
-
-        {form.values.to === "Ethereum" && form.values.from === "Hydration" && (
-          <TextInput
-            label="AssetHub address"
-            placeholder="0x0000000"
-            data-testid="input-ahaddress"
-            {...form.getInputProps("ahAddress")}
-          />
-        )}
-
-        <TextInput
-          label="Amount"
-          placeholder="0"
-          required
-          data-testid="input-amount"
-          {...form.getInputProps("amount")}
-        />
-
-        <Checkbox
-          label="Use XCM API"
-          {...form.getInputProps("useApi")}
-          data-testid="checkbox-api"
-        />
-
-        <Button type="submit" loading={loading} data-testid="submit">
-          Submit transaction
-        </Button>
-      </Stack>
-    </form>
-  );
-};
-
-export default TransferForm;
diff --git a/apps/playground/src/components/TransferInfoForm.tsx b/apps/playground/src/components/TransferInfoForm.tsx
index 0e65172a..3bea2b04 100644
--- a/apps/playground/src/components/TransferInfoForm.tsx
+++ b/apps/playground/src/components/TransferInfoForm.tsx
@@ -52,27 +52,25 @@ const TransferInfoForm: FC<Props> = ({ onSubmit, loading }) => {
     },
   });
 
-  const isNotParaToPara =
-    form.values.from === "Polkadot" ||
-    form.values.from === "Kusama" ||
-    form.values.to === "Polkadot" ||
-    form.values.to === "Kusama";
+  const { from, to, customCurrencyType } = form.getValues();
+
+  const isNotParaToPara = isRelayChain(from) || isRelayChain(to);
 
   const onSelectCurrencyTypeClick = () => {
     form.setFieldValue("currency", "");
   };
 
   useEffect(() => {
-    if (isRelayChain(form.values.from) || isRelayChain(form.values.to)) {
+    if (isNotParaToPara) {
       form.setFieldValue("customCurrencyType", "symbol");
-      if (isRelayChain(form.values.from)) {
-        form.setFieldValue("currency", getRelayChainSymbol(form.values.from));
+      if (isRelayChain(from)) {
+        form.setFieldValue("currency", getRelayChainSymbol(from));
       }
-      if (isRelayChain(form.values.to)) {
-        form.setFieldValue("currency", getRelayChainSymbol(form.values.to));
+      if (isRelayChain(to)) {
+        form.setFieldValue("currency", getRelayChainSymbol(to));
       }
     }
-  }, [form.values.from, form.values.to]);
+  }, [from, to]);
 
   return (
     <form onSubmit={form.onSubmit(onSubmit)}>
@@ -100,22 +98,19 @@ const TransferInfoForm: FC<Props> = ({ onSubmit, loading }) => {
         />
 
         <Stack gap="xs">
-          {(form.values.customCurrencyType === "id" ||
-            form.values.customCurrencyType === "symbol") && (
+          {(customCurrencyType === "id" || customCurrencyType === "symbol") && (
             <TextInput
               disabled={isNotParaToPara}
               flex={1}
               label="Currency"
-              placeholder={
-                form.values.customCurrencyType === "id" ? "Asset ID" : "Symbol"
-              }
+              placeholder={customCurrencyType === "id" ? "Asset ID" : "Symbol"}
               required
               data-testid="input-currency"
               {...form.getInputProps("currency")}
             />
           )}
 
-          {form.values.customCurrencyType === "multilocation" && (
+          {customCurrencyType === "multilocation" && (
             <JsonInput
               placeholder="Input Multi-Location JSON or interior junctions JSON to search for and identify the asset"
               formatOnBlur
diff --git a/apps/playground/src/components/assets/AssetsForm.tsx b/apps/playground/src/components/assets/AssetsForm.tsx
index a006f080..27d67c75 100644
--- a/apps/playground/src/components/assets/AssetsForm.tsx
+++ b/apps/playground/src/components/assets/AssetsForm.tsx
@@ -45,33 +45,33 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
     },
   });
 
-  const funcVal = form.values.func;
+  const { func, node, currencyType } = form.getValues();
 
   const showSymbolInput =
-    funcVal === "ASSET_ID" ||
-    funcVal === "DECIMALS" ||
-    funcVal == "HAS_SUPPORT" ||
-    funcVal === "BALANCE_FOREIGN" ||
-    funcVal === "ASSET_BALANCE" ||
-    funcVal === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
-    funcVal === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
-    funcVal === "TRANSFERABLE_AMOUNT" ||
-    funcVal === "EXISTENTIAL_DEPOSIT";
+    func === "ASSET_ID" ||
+    func === "DECIMALS" ||
+    func == "HAS_SUPPORT" ||
+    func === "BALANCE_FOREIGN" ||
+    func === "ASSET_BALANCE" ||
+    func === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
+    func === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
+    func === "TRANSFERABLE_AMOUNT" ||
+    func === "EXISTENTIAL_DEPOSIT";
 
   const supportsCurrencyType =
-    funcVal === "BALANCE_FOREIGN" ||
-    funcVal === "ASSET_BALANCE" ||
-    funcVal === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
-    funcVal === "TRANSFERABLE_AMOUNT" ||
-    funcVal === "EXISTENTIAL_DEPOSIT";
+    func === "BALANCE_FOREIGN" ||
+    func === "ASSET_BALANCE" ||
+    func === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
+    func === "TRANSFERABLE_AMOUNT" ||
+    func === "EXISTENTIAL_DEPOSIT";
 
   const showAddressInput =
-    funcVal === "BALANCE_FOREIGN" ||
-    funcVal === "BALANCE_NATIVE" ||
-    funcVal === "ASSET_BALANCE" ||
-    funcVal === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
-    funcVal === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
-    funcVal === "TRANSFERABLE_AMOUNT";
+    func === "BALANCE_FOREIGN" ||
+    func === "BALANCE_NATIVE" ||
+    func === "ASSET_BALANCE" ||
+    func === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
+    func === "MAX_FOREIGN_TRANSFERABLE_AMOUNT" ||
+    func === "TRANSFERABLE_AMOUNT";
 
   const onSubmitInternal = (formValues: FormValues) => {
     const { func } = formValues;
@@ -84,24 +84,23 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
   };
 
   const notSupportsEthereum =
-    funcVal === "PARA_ID" ||
-    funcVal === "BALANCE_NATIVE" ||
-    funcVal === "BALANCE_FOREIGN" ||
-    funcVal === "ASSET_BALANCE" ||
-    funcVal === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
-    funcVal === "MAX_FOREIGN_TRANSFERABLE_AMOUNT";
+    func === "PARA_ID" ||
+    func === "BALANCE_NATIVE" ||
+    func === "BALANCE_FOREIGN" ||
+    func === "ASSET_BALANCE" ||
+    func === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
+    func === "MAX_FOREIGN_TRANSFERABLE_AMOUNT";
 
   const supportsRelayChains =
-    funcVal === "ASSETS_OBJECT" ||
-    funcVal === "NATIVE_ASSETS" ||
-    funcVal === "BALANCE_NATIVE" ||
-    funcVal === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
-    funcVal === "EXISTENTIAL_DEPOSIT" ||
-    funcVal === "TRANSFERABLE_AMOUNT";
+    func === "ASSETS_OBJECT" ||
+    func === "NATIVE_ASSETS" ||
+    func === "BALANCE_NATIVE" ||
+    func === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
+    func === "EXISTENTIAL_DEPOSIT" ||
+    func === "TRANSFERABLE_AMOUNT";
 
   const optionalCurrency =
-    funcVal === "MAX_NATIVE_TRANSFERABLE_AMOUNT" ||
-    funcVal === "EXISTENTIAL_DEPOSIT";
+    func === "MAX_NATIVE_TRANSFERABLE_AMOUNT" || func === "EXISTENTIAL_DEPOSIT";
 
   const getNodeList = () => {
     if (notSupportsEthereum && supportsRelayChains) {
@@ -122,17 +121,17 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
   const nodeList = getNodeList();
 
   useEffect(() => {
-    if (!nodeList.includes(form.values.node as (typeof nodeList)[0])) {
+    if (!nodeList.includes(node as (typeof nodeList)[0])) {
       form.setFieldValue("node", "Acala");
     }
-  }, [nodeList, form.values.node]);
+  }, [nodeList, node]);
 
   useEffect(() => {
     if (showSymbolInput) {
       form.setFieldValue("currency", "");
       form.setFieldValue("currencyType", "symbol");
     }
-  }, [form.values.func]);
+  }, [func]);
 
   const onSelectCurrencyTypeClick = () => {
     form.setFieldValue("currency", "");
@@ -165,8 +164,7 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
 
         {showSymbolInput && (
           <Stack gap="xs">
-            {(form.values.currencyType === "id" ||
-              form.values.currencyType === "symbol") && (
+            {(currencyType === "id" || currencyType === "symbol") && (
               <TextInput
                 flex={1}
                 label={
@@ -177,7 +175,7 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
                 placeholder={
                   supportsCurrencyType
                     ? "GLMR"
-                    : form.values.currencyType === "id"
+                    : currencyType === "id"
                       ? "Asset ID"
                       : "Symbol"
                 }
@@ -187,7 +185,7 @@ const AssetsForm: FC<Props> = ({ onSubmit, loading }) => {
               />
             )}
 
-            {form.values.currencyType === "multilocation" && (
+            {currencyType === "multilocation" && (
               <JsonInput
                 placeholder="Input Multi-Location JSON or interior junctions JSON to search for and identify the asset"
                 formatOnBlur
diff --git a/apps/playground/src/components/eth-bridge/EthBridgeTransfer.tsx b/apps/playground/src/components/eth-bridge/EthBridgeTransfer.tsx
index 2a943910..401719fe 100644
--- a/apps/playground/src/components/eth-bridge/EthBridgeTransfer.tsx
+++ b/apps/playground/src/components/eth-bridge/EthBridgeTransfer.tsx
@@ -148,8 +148,7 @@ const EthBridgeTransfer = () => {
 
     await EvmBuilder(provider)
       .to(to)
-      .amount(amount)
-      .currency({ symbol: currency?.symbol ?? "" })
+      .currency({ symbol: currency?.symbol ?? "", amount })
       .address(address)
       .signer(signer)
       .build();
diff --git a/apps/playground/src/components/eth-bridge/EthBridgeTransferForm.tsx b/apps/playground/src/components/eth-bridge/EthBridgeTransferForm.tsx
index 1f3227d9..840e8339 100644
--- a/apps/playground/src/components/eth-bridge/EthBridgeTransferForm.tsx
+++ b/apps/playground/src/components/eth-bridge/EthBridgeTransferForm.tsx
@@ -39,10 +39,9 @@ const EthBridgeTransferForm: FC<Props> = ({ onSubmit, loading }) => {
     },
   });
 
-  const { currencyOptions, currencyMap } = useCurrencyOptions(
-    "Ethereum",
-    form.values.to,
-  );
+  const { to } = form.getValues();
+
+  const { currencyOptions, currencyMap } = useCurrencyOptions("Ethereum", to);
 
   const onSubmitInternal = (values: FormValues) => {
     const currency = currencyMap[values.currencyOptionId];
diff --git a/apps/playground/src/components/XcmTransfer.tsx b/apps/playground/src/components/transfer/XcmTransfer.tsx
similarity index 76%
rename from apps/playground/src/components/XcmTransfer.tsx
rename to apps/playground/src/components/transfer/XcmTransfer.tsx
index ecba0456..4c3ff185 100644
--- a/apps/playground/src/components/XcmTransfer.tsx
+++ b/apps/playground/src/components/transfer/XcmTransfer.tsx
@@ -1,9 +1,15 @@
 import { Stack, Title, Box } from "@mantine/core";
-import ErrorAlert from "./ErrorAlert";
-import type { FormValuesTransformed } from "./TransferForm";
-import TransferForm from "./TransferForm";
+import ErrorAlert from "../ErrorAlert";
+import type {
+  FormValuesTransformed,
+  TCurrencyEntryTransformed,
+} from "./XcmTransferForm";
+import XcmTransferForm from "./XcmTransferForm";
 import { useDisclosure, useScrollIntoView } from "@mantine/hooks";
-import type { TCurrencyInputWithAmount } from "@paraspell/sdk";
+import type {
+  TCurrencyCoreWithFee,
+  TCurrencyInputWithAmount,
+} from "@paraspell/sdk";
 import {
   isForeignAsset,
   Override,
@@ -16,9 +22,9 @@ import { getOtherAssets, isRelayChain } from "@paraspell/sdk/papi";
 import type { PolkadotClient, PolkadotSigner } from "polkadot-api";
 import type { Signer } from "@polkadot/api/types";
 import { useState, useEffect } from "react";
-import { submitTransaction, submitTransactionPapi } from "../utils";
-import { getTxFromApi } from "../utils/submitUsingApi";
-import { useWallet } from "../hooks/useWallet";
+import { submitTransaction, submitTransactionPapi } from "../../utils";
+import { getTxFromApi } from "../../utils/submitUsingApi";
+import { useWallet } from "../../hooks/useWallet";
 import type { ApiPromise } from "@polkadot/api";
 import { ethers } from "ethers";
 
@@ -42,14 +48,16 @@ const XcmTransfer = () => {
     }
   }, [error, scrollIntoView]);
 
-  const determineCurrency = ({
-    from,
-    isCustomCurrency,
-    customCurrency,
-    customCurrencyType,
-    currency,
-    amount,
-  }: FormValuesTransformed): TCurrencyInputWithAmount => {
+  const determineCurrency = (
+    { from }: FormValuesTransformed,
+    {
+      isCustomCurrency,
+      customCurrency,
+      customCurrencyType,
+      currency,
+      amount,
+    }: TCurrencyEntryTransformed,
+  ): TCurrencyInputWithAmount => {
     if (isCustomCurrency) {
       if (customCurrencyType === "id") {
         return {
@@ -98,7 +106,7 @@ const XcmTransfer = () => {
   };
 
   const submit = async (formValues: FormValuesTransformed) => {
-    const { from, to, address, ahAddress, useApi } = formValues;
+    const { from, to, currencies, address, ahAddress, useApi } = formValues;
 
     if (!selectedAccount) {
       alert("No account selected, connect wallet first");
@@ -117,6 +125,14 @@ const XcmTransfer = () => {
     const api = await Sdk.createApiInstanceForNode(from);
 
     try {
+      const useMultiAssets = currencies.length > 1;
+      const currencyInputs = currencies.map((c) => {
+        return {
+          ...determineCurrency(formValues, c),
+          ...(useMultiAssets && { isFeeAsset: c.isFeeAsset }),
+        };
+      });
+
       let tx: Extrinsic | TPapiTransaction;
       if (useApi) {
         tx = await getTxFromApi(
@@ -130,7 +146,12 @@ const XcmTransfer = () => {
               formValues.to === "Polkadot" || formValues.to === "Kusama"
                 ? undefined
                 : formValues.to,
-            currency: determineCurrency(formValues),
+            currency:
+              currencyInputs.length === 1
+                ? currencyInputs[0]
+                : {
+                    multiasset: currencyInputs,
+                  },
           },
           api,
           apiType === "PJS" ? "/x-transfer" : "/x-transfer-papi",
@@ -144,7 +165,13 @@ const XcmTransfer = () => {
         tx = await builder
           .from(from)
           .to(to)
-          .currency(determineCurrency(formValues))
+          .currency(
+            currencyInputs.length === 1
+              ? currencyInputs[0]
+              : {
+                  multiasset: currencyInputs as TCurrencyCoreWithFee[],
+                },
+          )
           .address(address, ahAddress)
           .build();
       }
@@ -186,7 +213,7 @@ const XcmTransfer = () => {
     <Stack gap="xl">
       <Stack w="100%" maw={400} mx="auto" gap="lg">
         <Title order={3}>New XCM transfer</Title>
-        <TransferForm onSubmit={onSubmit} loading={loading} />
+        <XcmTransferForm onSubmit={onSubmit} loading={loading} />
       </Stack>
       <Box ref={targetRef}>
         {alertOpened && (
diff --git a/apps/playground/src/components/transfer/XcmTransferForm.tsx b/apps/playground/src/components/transfer/XcmTransferForm.tsx
new file mode 100644
index 00000000..e57a6694
--- /dev/null
+++ b/apps/playground/src/components/transfer/XcmTransferForm.tsx
@@ -0,0 +1,270 @@
+import { useForm } from "@mantine/form";
+import { isValidWalletAddress } from "../../utils";
+import type { FC } from "react";
+import { useEffect } from "react";
+import {
+  ActionIcon,
+  Button,
+  Checkbox,
+  Fieldset,
+  Group,
+  Select,
+  Stack,
+  TextInput,
+} from "@mantine/core";
+import type {
+  TAsset,
+  TNodeDotKsmWithRelayChains,
+  TNodeWithRelayChains,
+} from "@paraspell/sdk";
+import {
+  NODES_WITH_RELAY_CHAINS,
+  NODES_WITH_RELAY_CHAINS_DOT_KSM,
+} from "@paraspell/sdk";
+import useCurrencyOptions from "../../hooks/useCurrencyOptions";
+import CurrencySelection from "../CurrencySelection";
+import { IconPlus, IconTrash } from "@tabler/icons-react";
+
+export type TCurrencyEntry = {
+  currencyOptionId: string;
+  customCurrency: string;
+  amount: string;
+  isFeeAsset: boolean;
+  isCustomCurrency: boolean;
+  customCurrencyType?:
+    | "id"
+    | "symbol"
+    | "multilocation"
+    | "overridenMultilocation";
+};
+
+export type FormValues = {
+  from: TNodeDotKsmWithRelayChains;
+  to: TNodeWithRelayChains;
+  currencies: TCurrencyEntry[];
+  address: string;
+  ahAddress: string;
+  useApi: boolean;
+};
+
+export type TCurrencyEntryTransformed = TCurrencyEntry & { currency?: TAsset };
+
+export type FormValuesTransformed = FormValues & {
+  currencies: TCurrencyEntryTransformed[];
+};
+
+type Props = {
+  onSubmit: (values: FormValuesTransformed) => void;
+  loading: boolean;
+};
+
+const XcmTransferForm: FC<Props> = ({ onSubmit, loading }) => {
+  const form = useForm<FormValues>({
+    initialValues: {
+      from: "Astar",
+      to: "Moonbeam",
+      currencies: [
+        {
+          currencyOptionId: "",
+          customCurrency: "",
+          amount: "10000000000000000000",
+          isFeeAsset: false,
+          isCustomCurrency: false,
+          customCurrencyType: "id",
+        },
+      ],
+      address: "5F5586mfsnM6durWRLptYt3jSUs55KEmahdodQ5tQMr9iY96",
+      ahAddress: "",
+      useApi: false,
+    },
+
+    validate: {
+      address: (value) =>
+        isValidWalletAddress(value) ? null : "Invalid address",
+      currencies: {
+        currencyOptionId: (value, values, path) => {
+          const index = Number(path.split(".")[1]);
+          console.log("index", index);
+          if (values.currencies[index].isCustomCurrency) {
+            return values.currencies[index].customCurrency
+              ? null
+              : "Custom currency is required";
+          } else {
+            return value ? null : "Currency selection is required";
+          }
+        },
+        customCurrency: (value, values, path) => {
+          const index = Number(path.split(".")[1]);
+          if (values.currencies[index].isCustomCurrency) {
+            return value ? null : "Custom currency is required";
+          }
+          return null;
+        },
+      },
+      ahAddress: (value, values) => {
+        if (values.to === "Ethereum" && values.from === "Hydration") {
+          return value
+            ? null
+            : "AssetHub address is required for transfers to Ethereum";
+        }
+        return null;
+      },
+    },
+  });
+
+  const { from, to, currencies } = form.getValues();
+
+  const { currencyOptions, currencyMap, isNotParaToPara } = useCurrencyOptions(
+    from,
+    to,
+  );
+
+  const onSubmitInternal = (values: FormValues) => {
+    // Transform each currency entry
+    const transformedCurrencies = values.currencies.map((currEntry) => {
+      if (currEntry.isCustomCurrency) {
+        // Custom currency doesn't map to currencyMap
+        return { ...currEntry };
+      }
+
+      const currency = currencyMap[currEntry.currencyOptionId];
+
+      if (!currency) {
+        return { ...currEntry };
+      }
+
+      return { ...currEntry, currency };
+    });
+
+    const transformedValues: FormValuesTransformed = {
+      ...values,
+      currencies: transformedCurrencies,
+    };
+
+    onSubmit(transformedValues);
+  };
+
+  useEffect(() => {
+    if (isNotParaToPara && Object.keys(currencyMap).length === 1) {
+      form.setFieldValue(
+        "currencies.0.currencyOptionId",
+        Object.keys(currencyMap)[0],
+      );
+    }
+  }, [isNotParaToPara, currencyMap]);
+
+  return (
+    <form onSubmit={form.onSubmit(onSubmitInternal)}>
+      <Stack>
+        <Select
+          label="Origin node"
+          placeholder="Pick value"
+          data={NODES_WITH_RELAY_CHAINS_DOT_KSM}
+          allowDeselect={false}
+          searchable
+          required
+          data-testid="select-origin"
+          {...form.getInputProps("from")}
+        />
+
+        <Select
+          label="Destination node"
+          placeholder="Pick value"
+          data={NODES_WITH_RELAY_CHAINS}
+          allowDeselect={false}
+          searchable
+          required
+          data-testid="select-destination"
+          {...form.getInputProps("to")}
+        />
+
+        <Stack gap="md">
+          {currencies.map((_, index) => (
+            <Fieldset
+              key={index}
+              legend={currencies.length > 1 ? `Asset ${index + 1}` : undefined}
+              pos="relative"
+            >
+              <Group>
+                <Stack gap={4} flex={1}>
+                  <CurrencySelection
+                    form={form}
+                    index={index}
+                    currencyOptions={currencyOptions}
+                  />
+                  <TextInput
+                    label="Amount"
+                    placeholder="0"
+                    size={currencies.length > 1 ? "xs" : "sm"}
+                    required
+                    data-testid={`input-amount-${index}`}
+                    {...form.getInputProps(`currencies.${index}.amount`)}
+                  />
+                </Stack>
+                {form.values.currencies.length > 1 && (
+                  <ActionIcon
+                    color="red"
+                    variant="subtle"
+                    bg="white"
+                    pos="absolute"
+                    right={20}
+                    top={-25}
+                    onClick={() => form.removeListItem("currencies", index)}
+                  >
+                    <IconTrash size={16} />
+                  </ActionIcon>
+                )}
+              </Group>
+            </Fieldset>
+          ))}
+
+          <Button
+            variant="transparent"
+            size="compact-xs"
+            leftSection={<IconPlus size={16} />}
+            onClick={() =>
+              form.insertListItem("currencies", {
+                currencyOptionId: "",
+                customCurrency: "",
+                amount: "10000000000000000000",
+                isCustomCurrency: false,
+                customCurrencyType: "id",
+              })
+            }
+          >
+            Add another asset
+          </Button>
+        </Stack>
+
+        <TextInput
+          label="Recipient address"
+          placeholder="0x0000000"
+          required
+          data-testid="input-address"
+          {...form.getInputProps("address")}
+        />
+
+        {form.values.to === "Ethereum" && form.values.from === "Hydration" && (
+          <TextInput
+            label="AssetHub address"
+            placeholder="0x0000000"
+            data-testid="input-ahaddress"
+            {...form.getInputProps("ahAddress")}
+          />
+        )}
+
+        <Checkbox
+          label="Use XCM API"
+          {...form.getInputProps("useApi")}
+          data-testid="checkbox-api"
+        />
+
+        <Button type="submit" loading={loading} data-testid="submit">
+          Submit transaction
+        </Button>
+      </Stack>
+    </form>
+  );
+};
+
+export default XcmTransferForm;
diff --git a/apps/playground/src/routes/XcmSdkSandbox.tsx b/apps/playground/src/routes/XcmSdkSandbox.tsx
index 3f21dc74..c0cc4881 100644
--- a/apps/playground/src/routes/XcmSdkSandbox.tsx
+++ b/apps/playground/src/routes/XcmSdkSandbox.tsx
@@ -6,7 +6,7 @@ import {
   IconSend2,
   IconWallet,
 } from "@tabler/icons-react";
-import XcmTransfer from "../components/XcmTransfer";
+import XcmTransfer from "../components/transfer/XcmTransfer";
 import AssetsQueries from "../components/assets/AssetsQueries";
 import PalletsQueries from "../components/pallets/PalletsQueries";
 import TransferInfo from "../components/TransferInfo";
diff --git a/apps/xcm-api/src/x-transfer-eth/dto/x-transfer-eth.dto.ts b/apps/xcm-api/src/x-transfer-eth/dto/x-transfer-eth.dto.ts
index 55573c2b..9b55400d 100644
--- a/apps/xcm-api/src/x-transfer-eth/dto/x-transfer-eth.dto.ts
+++ b/apps/xcm-api/src/x-transfer-eth/dto/x-transfer-eth.dto.ts
@@ -1,20 +1,13 @@
-import { CurrencyCoreSchemaV1 } from '../../x-transfer/dto/XTransferDto.js';
+import { CurrencyCoreSchemaV1WithAmount } from '../../x-transfer/dto/XTransferDto.js';
 import { z } from 'zod';
-import { validateAmount } from '../../utils/validateAmount.js';
 
 export const XTransferEthDtoSchema = z.object({
   to: z.string(),
-  amount: z.union([
-    z.string().refine(validateAmount, {
-      message: 'Amount must be a positive number',
-    }),
-    z.number().positive({ message: 'Amount must be a positive number' }),
-  ]),
   address: z.string().min(1, { message: 'Source address is required' }),
   destAddress: z
     .string()
     .min(1, { message: 'Destination address is required' }),
-  currency: CurrencyCoreSchemaV1,
+  currency: CurrencyCoreSchemaV1WithAmount,
 });
 
 export type XTransferEthDto = z.infer<typeof XTransferEthDtoSchema>;
diff --git a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.controller.test.ts b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.controller.test.ts
index f34fadee..d5a60855 100644
--- a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.controller.test.ts
+++ b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.controller.test.ts
@@ -36,9 +36,8 @@ describe('XTransferEthController', () => {
     it('should call generateXcmCall service method with correct parameters and return result', async () => {
       const queryParams: XTransferEthDto = {
         to: 'AssetHubPolkadot',
-        amount: 100,
         address: '5F5586mfsnM6durWRLptYt3jSUs55KEmahdodQ5tQMr9iY96',
-        currency: { symbol: 'WETH' },
+        currency: { symbol: 'WETH', amount: 100 },
         destAddress: '0x5F5586mfsnM6durWRLptYt3jSUs55KEmahdodQ5tQMr9iY96',
       };
       const mockResult = {} as TSerializedEthTransfer;
diff --git a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.test.ts b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.test.ts
index 9e264560..bfb7531c 100644
--- a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.test.ts
+++ b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.test.ts
@@ -28,10 +28,9 @@ describe('XTransferEthService', () => {
   it('should throw BadRequestException if the node is invalid', async () => {
     const dto: XTransferEthDto = {
       to: 'InvalidNode',
-      amount: 100,
       address: '0xAddress',
       destAddress: '1DestinationAddress',
-      currency: { symbol: 'DOT' },
+      currency: { symbol: 'DOT', amount: 100 },
     };
 
     await expect(service.generateEthCall(dto)).rejects.toThrow(
@@ -45,10 +44,9 @@ describe('XTransferEthService', () => {
   it('should throw BadRequestException if the destination address is invalid', async () => {
     const dto: XTransferEthDto = {
       to: 'Polkadot',
-      amount: 100,
       address: '0xAddress',
       destAddress: 'InvalidAddress',
-      currency: { symbol: 'DOT' },
+      currency: { symbol: 'DOT', amount: 100 },
     };
 
     vi.mocked(isValidPolkadotAddress).mockReturnValue(false);
@@ -64,10 +62,9 @@ describe('XTransferEthService', () => {
   it('should return the result from buildEthTransferOptions for valid input', async () => {
     const dto: XTransferEthDto = {
       to: 'Polkadot',
-      amount: 100,
       address: '0xAddress',
       destAddress: '1DestinationAddress',
-      currency: { symbol: 'DOT' },
+      currency: { symbol: 'DOT', amount: 100 },
     };
 
     const mockResult = { success: true };
@@ -82,20 +79,18 @@ describe('XTransferEthService', () => {
     expect(result).toBe(mockResult);
     expect(buildEthTransferOptions).toHaveBeenCalledWith({
       to: 'Polkadot',
-      amount: '100',
       address: '0xAddress',
       destAddress: '1DestinationAddress',
-      currency: { symbol: 'DOT' },
+      currency: { symbol: 'DOT', amount: 100 },
     });
   });
 
   it('should throw InternalServerErrorException when buildEthTransferOptions throws an error', async () => {
     const dto: XTransferEthDto = {
       to: 'Polkadot',
-      amount: 100,
       address: '0xAddress',
       destAddress: '1DestinationAddress',
-      currency: { symbol: 'DOT' },
+      currency: { symbol: 'DOT', amount: 100 },
     };
 
     vi.mocked(isValidPolkadotAddress).mockReturnValue(true);
diff --git a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.ts b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.ts
index c5b6a893..1e795e48 100644
--- a/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.ts
+++ b/apps/xcm-api/src/x-transfer-eth/x-transfer-eth.service.ts
@@ -15,7 +15,6 @@ import { XTransferEthDto } from './dto/x-transfer-eth.dto.js';
 export class XTransferEthService {
   async generateEthCall({
     to,
-    amount,
     address,
     destAddress,
     currency,
@@ -35,7 +34,6 @@ export class XTransferEthService {
     try {
       return await buildEthTransferOptions({
         to: toNode,
-        amount: amount.toString(),
         address,
         destAddress,
         currency,
diff --git a/apps/xcm-api/src/x-transfer/dto/XTransferDto.ts b/apps/xcm-api/src/x-transfer/dto/XTransferDto.ts
index cd87ddb8..3a3972bc 100644
--- a/apps/xcm-api/src/x-transfer/dto/XTransferDto.ts
+++ b/apps/xcm-api/src/x-transfer/dto/XTransferDto.ts
@@ -86,6 +86,12 @@ export const CurrencyCoreSchemaV1 = z.union([
     .required(),
 ]);
 
+export const CurrencyCoreSchemaV1WithAmount = CurrencyCoreSchemaV1.and(
+  z.object({
+    amount: AmountSchema,
+  }),
+);
+
 export const CurrencyCoreSchema = z.union([
   CurrencySymbolSchema,
   z.object({
diff --git a/packages/sdk/src/builder/evm-builder/EvmBuilder.test.ts b/packages/sdk/src/builder/evm-builder/EvmBuilder.test.ts
index a6dad00c..17ce78a8 100644
--- a/packages/sdk/src/builder/evm-builder/EvmBuilder.test.ts
+++ b/packages/sdk/src/builder/evm-builder/EvmBuilder.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest'
 import type { AbstractProvider, Signer } from 'ethers'
-import type { TCurrencyCoreV1, TNodePolkadotKusama } from '../../types'
+import type { TCurrencyCoreV1WithAmount, TNodePolkadotKusama } from '../../types'
 import type { TEvmBuilderOptions } from '../../types/TBuilder'
 import transferEthToPolkadot from '../../pallets/xcmPallet/ethTransfer/ethTransfer'
 import { EvmBuilder } from './EvmBuilder'
@@ -13,17 +13,15 @@ describe('EvmBuilderClass', () => {
   let provider: AbstractProvider
   let signer: Signer
   let node: TNodePolkadotKusama
-  let currency: TCurrencyCoreV1
+  let currency: TCurrencyCoreV1WithAmount
   let address: string
-  let amount: string
 
   beforeEach(() => {
     provider = {} as AbstractProvider
     signer = {} as Signer
     node = {} as TNodePolkadotKusama
-    currency = {} as TCurrencyCoreV1
+    currency = {} as TCurrencyCoreV1WithAmount
     address = '0x1234567890abcdef'
-    amount = '100'
   })
 
   it('should throw an error if required parameters are missing', async () => {
@@ -33,18 +31,12 @@ describe('EvmBuilderClass', () => {
   })
 
   it('should set all required parameters and call transferEthToPolkadot', async () => {
-    const builder = EvmBuilder(provider)
-      .to(node)
-      .amount(amount)
-      .currency(currency)
-      .address(address)
-      .signer(signer)
+    const builder = EvmBuilder(provider).to(node).currency(currency).address(address).signer(signer)
 
     await builder.build()
 
     expect(transferEthToPolkadot).toHaveBeenCalledWith(provider, {
       to: node,
-      amount,
       currency,
       address,
       signer
@@ -53,18 +45,13 @@ describe('EvmBuilderClass', () => {
 
   it('should return the builder instance when setting parameters', () => {
     const builder = EvmBuilder(provider)
-    const result = builder
-      .to(node)
-      .amount(amount)
-      .currency(currency)
-      .address(address)
-      .signer(signer)
+    const result = builder.to(node).currency(currency).address(address).signer(signer)
 
     expect(result).toBe(builder)
   })
 
   it('should throw an error if build is called without all required parameters', async () => {
-    const builder = EvmBuilder(provider).to(node).amount(amount).currency(currency)
+    const builder = EvmBuilder(provider).to(node).currency(currency)
 
     await expect(builder.build()).rejects.toThrow('Builder object is missing parameter: address')
   })
diff --git a/packages/sdk/src/builder/evm-builder/EvmBuilder.ts b/packages/sdk/src/builder/evm-builder/EvmBuilder.ts
index 2c5b9f70..15c9f01e 100644
--- a/packages/sdk/src/builder/evm-builder/EvmBuilder.ts
+++ b/packages/sdk/src/builder/evm-builder/EvmBuilder.ts
@@ -1,5 +1,5 @@
 import type { AbstractProvider, Signer } from 'ethers'
-import type { TCurrencyCoreV1, TNodePolkadotKusama } from '../../types'
+import type { TCurrencyCoreV1WithAmount, TNodePolkadotKusama } from '../../types'
 import type { TEvmBuilderOptions, TOptionalEvmBuilderOptions } from '../../types/TBuilder'
 import transferEthToPolkadot from '../../pallets/xcmPallet/ethTransfer/ethTransfer'
 
@@ -27,24 +27,13 @@ class EvmBuilderClass {
     return this
   }
 
-  /**
-   * Specifies the amount to transfer.
-   *
-   * @param amount - The amount to transfer, as a string.
-   * @returns An instance of EvmBuilder
-   */
-  amount(amount: string): this {
-    this._options.amount = amount
-    return this
-  }
-
   /**
    * Specifies the currency to transfer.
    *
    * @param currency - The currency to be transferred.
    * @returns An instance of EvmBuilder
    */
-  currency(currency: TCurrencyCoreV1): this {
+  currency(currency: TCurrencyCoreV1WithAmount): this {
     this._options.currency = currency
     return this
   }
@@ -77,13 +66,7 @@ class EvmBuilderClass {
    * @throws Error if any required parameters are missing.
    */
   async build(): Promise<void> {
-    const requiredParams: Array<keyof TEvmBuilderOptions> = [
-      'to',
-      'amount',
-      'currency',
-      'address',
-      'signer'
-    ]
+    const requiredParams: Array<keyof TEvmBuilderOptions> = ['to', 'currency', 'address', 'signer']
 
     for (const param of requiredParams) {
       if (this._options[param] === undefined) {
diff --git a/packages/sdk/src/nodes/xTokens/XTokensTransferImpl.ts b/packages/sdk/src/nodes/xTokens/XTokensTransferImpl.ts
index 8ad02de6..965eab32 100644
--- a/packages/sdk/src/nodes/xTokens/XTokensTransferImpl.ts
+++ b/packages/sdk/src/nodes/xTokens/XTokensTransferImpl.ts
@@ -31,7 +31,10 @@ class XTokensTransferImpl {
     const isAstarOrShidenToRelay =
       scenario === 'ParaToRelay' && (origin === 'Astar' || origin === 'Shiden')
 
-    const shouldUseMultiasset = isAstarOrShidenToRelay || (isAssetHubDest && !isBifrostOrigin)
+    const isMultiAsset = overriddenAsset && !isTMultiLocation(overriddenAsset)
+
+    const shouldUseMultiasset =
+      isAstarOrShidenToRelay || (isAssetHubDest && !isBifrostOrigin) || !!isMultiAsset
 
     const modifiedCurrencySelection = getCurrencySelection(
       input,
@@ -39,8 +42,6 @@ class XTokensTransferImpl {
       currencySelection
     )
 
-    const isMultiAsset = overriddenAsset && !isTMultiLocation(overriddenAsset)
-
     const section: TXTokensSection = shouldUseMultiasset
       ? isMultiAsset
         ? 'transfer_multiassets'
diff --git a/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.test.ts b/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.test.ts
index e1f83f57..64ccce21 100644
--- a/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.test.ts
+++ b/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.test.ts
@@ -60,11 +60,10 @@ describe('buildEthTransferOptions', () => {
     } as SendValidationResult)
 
     const options: TSerializeEthTransferOptions = {
-      currency: { symbol: 'ETH' },
+      currency: { symbol: 'ETH', amount: '1000000' },
       to: 'AssetHubPolkadot',
       address: '0xSenderAddress',
-      destAddress: '0xDestinationAddress',
-      amount: '1000000'
+      destAddress: '0xDestinationAddress'
     }
 
     const result = await buildEthTransferOptions(options)
@@ -83,11 +82,10 @@ describe('buildEthTransferOptions', () => {
     })
 
     const options: TSerializeEthTransferOptions = {
-      currency: { symbol: 'ETH' },
+      currency: { symbol: 'ETH', amount: '1000000' },
       to: 'AssetHubPolkadot',
       address: '0xSenderAddress',
-      destAddress: '0xDestinationAddress',
-      amount: '1000000'
+      destAddress: '0xDestinationAddress'
     }
 
     await expect(buildEthTransferOptions(options)).rejects.toThrow('Asset not found')
@@ -109,11 +107,10 @@ describe('buildEthTransferOptions', () => {
     } as SendValidationResult)
 
     const options: TSerializeEthTransferOptions = {
-      currency: { symbol: 'ETH' },
+      currency: { symbol: 'ETH', amount: '1000000' },
       to: 'AssetHubPolkadot',
       address: '0xSenderAddress',
-      destAddress: '0xDestinationAddress',
-      amount: '1000000'
+      destAddress: '0xDestinationAddress'
     }
 
     await expect(buildEthTransferOptions(options)).rejects.toThrow('Failed to validate send')
diff --git a/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.ts b/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.ts
index 98b27644..00b66b4f 100644
--- a/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.ts
+++ b/packages/sdk/src/pallets/xcmPallet/ethTransfer/buildEthTransferOptions.ts
@@ -9,8 +9,7 @@ export const buildEthTransferOptions = async ({
   currency,
   to,
   address,
-  destAddress,
-  amount
+  destAddress
 }: TSerializeEthTransferOptions): Promise<TSerializedEthTransfer> => {
   const ethAsset = findEthAsset(currency)
 
@@ -32,7 +31,7 @@ export const buildEthTransferOptions = async ({
     destAddress,
     ethAsset.assetId ?? '',
     destParaId,
-    BigInt(amount),
+    BigInt(currency.amount),
     BigInt(0)
   )
 
diff --git a/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.test.ts b/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.test.ts
index dfa68b6c..0da78aa4 100644
--- a/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.test.ts
+++ b/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.test.ts
@@ -65,10 +65,9 @@ describe('transferEthToPolkadot', () => {
     const mockProvider = {} as AbstractProvider
 
     const options: TEvmBuilderOptions = {
-      currency: { symbol: 'ETH' },
+      currency: { symbol: 'ETH', amount: '1000000' },
       to: 'AssetHubPolkadot',
       address: '0xSenderAddress',
-      amount: '1000000',
       signer: {} as Signer
     }
 
diff --git a/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.ts b/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.ts
index 7e6177e4..60ddd1a1 100644
--- a/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.ts
+++ b/packages/sdk/src/pallets/xcmPallet/ethTransfer/ethTransfer.ts
@@ -18,7 +18,7 @@ import { getParaId } from '../../../nodes/config'
  */
 const transferEthToPolkadot = async (
   provider: AbstractProvider,
-  { signer, address, to, amount, currency }: TEvmBuilderOptions
+  { signer, address, to, currency }: TEvmBuilderOptions
 ) => {
   const ethAsset = findEthAsset(currency)
 
@@ -33,7 +33,7 @@ const transferEthToPolkadot = async (
     address,
     ethAsset.assetId ?? '',
     destParaId,
-    BigInt(amount),
+    BigInt(currency.amount),
     BigInt(0)
   )
 
diff --git a/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.test.ts b/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.test.ts
index 4b06b1b9..0fb00b85 100644
--- a/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.test.ts
+++ b/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.test.ts
@@ -110,7 +110,7 @@ describe('resolveOverriddenAsset', () => {
 
     const result = resolveOverriddenAsset(options, false, true)
 
-    expect(validateAssetSupport).toHaveBeenCalledTimes(1)
+    expect(validateAssetSupport).toHaveBeenCalledTimes(2)
     expect(getAssetBySymbolOrId).toHaveBeenCalledTimes(multiasset.length)
     expect(createMultiAsset).toHaveBeenCalledTimes(multiasset.length)
     expect(result).toEqual([
diff --git a/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.ts b/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.ts
index be201e8d..7ff9bffe 100644
--- a/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.ts
+++ b/packages/sdk/src/pallets/xcmPallet/transfer/resolveOverriddenAsset.ts
@@ -40,9 +40,7 @@ export const resolveOverriddenAsset = <TApi, TRes>(
         )
       }
 
-      if (!currency.isFeeAsset) {
-        validateAssetSupport(options, assetCheckEnabled, isBridge, asset)
-      }
+      validateAssetSupport(options, assetCheckEnabled, isBridge, asset)
 
       const originTyped = origin as TNodePolkadotKusama
       const originNode = getNode<TApi, TRes, typeof originTyped>(originTyped)
diff --git a/packages/sdk/src/types/TBuilder.ts b/packages/sdk/src/types/TBuilder.ts
index f6839af9..2fad8414 100644
--- a/packages/sdk/src/types/TBuilder.ts
+++ b/packages/sdk/src/types/TBuilder.ts
@@ -1,6 +1,6 @@
 import type { Signer } from 'ethers'
 import type { TNodeDotKsmWithRelayChains, TNodePolkadotKusama, TNodeWithRelayChains } from './TNode'
-import type { TCurrencyCoreV1, TCurrencyInputWithAmount } from './TCurrency'
+import type { TCurrencyCoreV1WithAmount, TCurrencyInputWithAmount } from './TCurrency'
 import type { TAddress, TDestination, TVersionClaimAssets, Version } from './TTransfer'
 import type { TMultiAsset } from './TMultiAsset'
 
@@ -12,14 +12,10 @@ export type TEvmBuilderOptions = {
    * The destination node on Polkadot network.
    */
   to: TNodePolkadotKusama
-  /**
-   * The amount to transfer.
-   */
-  amount: string
   /**
    * The currency to transfer. Symbol or ID.
    */
-  currency: TCurrencyCoreV1
+  currency: TCurrencyCoreV1WithAmount
   /**
    * The Polkadot destination address.
    */
diff --git a/packages/sdk/src/types/TCurrency.ts b/packages/sdk/src/types/TCurrency.ts
index d6334c52..f8bcaa30 100644
--- a/packages/sdk/src/types/TCurrency.ts
+++ b/packages/sdk/src/types/TCurrency.ts
@@ -40,6 +40,8 @@ export type TCurrencyCoreV1 =
       id: TCurrency
     }
 
+export type TCurrencyCoreV1WithAmount = WithAmount<TCurrencyCoreV1>
+
 export type TMultiLocationValue = string | TMultiLocation | TJunction[]
 
 export type TMultiLocationValueWithOverride = TMultiLocationValue | TOverrideMultiLocationSpecifier
diff --git a/packages/xcm-router/src/transfer/buildTransferExtrinsics.test.ts b/packages/xcm-router/src/transfer/buildTransferExtrinsics.test.ts
index 761e5874..6700a0b9 100644
--- a/packages/xcm-router/src/transfer/buildTransferExtrinsics.test.ts
+++ b/packages/xcm-router/src/transfer/buildTransferExtrinsics.test.ts
@@ -104,6 +104,26 @@ describe('buildTransferExtrinsics', () => {
     expect(toExchangeTxSpy).toHaveBeenCalled();
   });
 
+  it('should build transfer extrinsics correctly - manual exchange selection - From Ethereum', async () => {
+    const options: TBuildTransferExtrinsicsOptions = {
+      ...MOCK_TRANSFER_OPTIONS,
+      exchange: 'AcalaDex',
+      from: 'Ethereum',
+      currencyFrom: { symbol: 'WETH' },
+      assetHubAddress: '14Ghg2yZAxxNhiDF97iYrgk7CwRErEmQR4UpuXaa7JXpVKig',
+      ethAddress: '0x1234567890123456789012345678901234567890',
+    };
+    const result = await buildTransferExtrinsics(options);
+
+    expect(result).toBeDefined();
+    expect(result).toHaveLength(4);
+    expect(createApiInstanceForNode).toHaveBeenCalled();
+    expect(validateSpy).toHaveBeenCalledTimes(2);
+    expect(feeSpy).toHaveBeenCalledTimes(2);
+    expect(fromExchangeTxSpy).toHaveBeenCalledTimes(2);
+    expect(toExchangeTxSpy).toHaveBeenCalled();
+  });
+
   it('should build transfer extrinsics correctly - auto exchange selection', async () => {
     const options = {
       ...MOCK_TRANSFER_OPTIONS,
diff --git a/packages/xcm-router/src/transfer/buildTransferExtrinsics.ts b/packages/xcm-router/src/transfer/buildTransferExtrinsics.ts
index b860e30c..7b9fbe82 100644
--- a/packages/xcm-router/src/transfer/buildTransferExtrinsics.ts
+++ b/packages/xcm-router/src/transfer/buildTransferExtrinsics.ts
@@ -85,10 +85,12 @@ export const buildTransferExtrinsics = async (
     if (from === 'Ethereum' && assetHubAddress) {
       const fromEthereumTx = await buildEthTransferOptions({
         to: 'AssetHubPolkadot',
-        amount: amount.toString(),
         address: ethAddress ?? '',
         destAddress: assetHubAddress,
-        currency: currencyFrom,
+        currency: {
+          ...currencyFrom,
+          amount: amount.toString(),
+        },
       });
       transactions.push({
         node: 'Ethereum',
@@ -168,10 +170,12 @@ export const buildTransferExtrinsics = async (
   } else if (type === TransactionType.FROM_ETH && assetHubAddress) {
     const fromEthereumTx = await buildEthTransferOptions({
       to: 'AssetHubPolkadot',
-      amount: amount.toString(),
       address: ethAddress ?? '',
       destAddress: assetHubAddress,
-      currency: currencyFrom,
+      currency: {
+        ...currencyFrom,
+        amount: amount.toString(),
+      },
     });
     transactions.push({
       node: 'Ethereum',
@@ -201,10 +205,12 @@ export const buildTransferExtrinsics = async (
     if (from === 'Ethereum' && assetHubAddress) {
       const fromEthereumTx = await buildEthTransferOptions({
         to: 'AssetHubPolkadot',
-        amount: amount.toString(),
         address: ethAddress ?? '',
         destAddress: assetHubAddress,
-        currency: currencyFrom,
+        currency: {
+          ...currencyFrom,
+          amount: amount.toString(),
+        },
       });
       transactions.push({
         node: 'Ethereum',
diff --git a/packages/xcm-router/src/transfer/transferFromEthereum.ts b/packages/xcm-router/src/transfer/transferFromEthereum.ts
index 73839e33..af867881 100644
--- a/packages/xcm-router/src/transfer/transferFromEthereum.ts
+++ b/packages/xcm-router/src/transfer/transferFromEthereum.ts
@@ -16,8 +16,10 @@ export const transferFromEthereum = async (options: TTransferOptionsModified) =>
   await EvmBuilder(provider)
     .to('AssetHubPolkadot')
     .address(assetHubAddress ?? '')
-    .amount(amount)
-    .currency(currencyFrom)
+    .currency({
+      ...currencyFrom,
+      amount: amount,
+    })
     .signer(ethSigner as Signer)
     .build();
   maybeUpdateTransferStatus(onStatusChange, {