From 10c91462fdc8d6d09d4e6a145013223f345ad486 Mon Sep 17 00:00:00 2001 From: vkulinich Date: Fri, 3 Apr 2026 10:54:37 +0200 Subject: [PATCH 1/6] Fix DCA and OTC minor issues --- .../modules/trade/orders/DcaOrderDetailsModal.tsx | 6 +++--- .../src/modules/trade/orders/columns/SwapPrice.tsx | 9 ++++++++- .../otc/place-order/PlaceOrderModalContent.tsx | 1 - .../trade/otc/place-order/PlaceOrderPrice.tsx | 14 ++++++++++++-- packages/ui/src/assets/icons/AssetIcon.svg | 5 ----- packages/ui/src/assets/icons/index.ts | 1 - 6 files changed, 23 insertions(+), 13 deletions(-) delete mode 100644 packages/ui/src/assets/icons/AssetIcon.svg diff --git a/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx b/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx index 30f35fcc37..c81049488d 100644 --- a/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx +++ b/apps/main/src/modules/trade/orders/DcaOrderDetailsModal.tsx @@ -66,9 +66,9 @@ export const DcaOrderDetailsModal = ({ details, onTerminate }: Props) => { {t("number", { value: details.isOpenBudget ? details.fromAmountExecuted - : details.status === DcaScheduleStatus.Created - ? details.fromAmountRemaining - : "0", + : details.status === DcaScheduleStatus.Completed + ? "0" + : (details.fromAmountRemaining ?? details.fromAmountBudget), })} {!details.isOpenBudget && ( <> diff --git a/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx b/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx index 54f134959c..a35c162964 100644 --- a/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx +++ b/apps/main/src/modules/trade/orders/columns/SwapPrice.tsx @@ -13,7 +13,14 @@ type Props = { } export const SwapPrice: FC = ({ from, to, price }) => { - const { t } = useTranslation() + const { t } = useTranslation("common") + + if (!price) + return ( + + - + + ) return ( diff --git a/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx b/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx index aa756f45bf..d52601c1f4 100644 --- a/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx +++ b/apps/main/src/modules/trade/otc/place-order/PlaceOrderModalContent.tsx @@ -449,7 +449,6 @@ export const PlaceOrderModalContent: FC = ({ onClose }) => { )} )} -