diff --git a/frontend/src/components/BookTable/index.tsx b/frontend/src/components/BookTable/index.tsx index 63134a82..6a6d7960 100644 --- a/frontend/src/components/BookTable/index.tsx +++ b/frontend/src/components/BookTable/index.tsx @@ -14,6 +14,7 @@ import { LinearProgress, IconButton, Tooltip, + LinearProgressProps, } from '@mui/material'; import { DataGrid, @@ -664,11 +665,11 @@ const BookTable = ({ }; interface GridComponentProps { - LoadingOverlay: JSX.Element; - NoResultsOverlay?: JSX.Element; - NoRowsOverlay?: JSX.Element; - Footer?: JSX.Element; - Toolbar?: JSX.Element; + LoadingOverlay: (props: LinearProgressProps) => JSX.Element; + NoResultsOverlay?: (props: any) => JSX.Element; + NoRowsOverlay?: (props: any) => JSX.Element; + Footer?: (props: any) => JSX.Element; + Toolbar?: (props: any) => JSX.Element; } const NoResultsOverlay = function () { diff --git a/frontend/src/components/OrderDetails/TakeButton.tsx b/frontend/src/components/OrderDetails/TakeButton.tsx index 0852af4b..fa28ec7b 100644 --- a/frontend/src/components/OrderDetails/TakeButton.tsx +++ b/frontend/src/components/OrderDetails/TakeButton.tsx @@ -55,8 +55,9 @@ const TakeButton = ({ order, setOrder, baseUrl, hasRobot, info }: TakeButtonProp const defaultRoutingBudget = 0.001; const btc_now = order.satoshis_now / 100000000; const rate = order.amount ? order.amount / btc_now : order.max_amount / btc_now; + const amount = order.currency === 1000 ? Number(takeAmount) / 100000000 : Number(takeAmount); const satoshis = computeSats({ - amount: Number(takeAmount), + amount: amount, routingBudget: order.is_buyer ? defaultRoutingBudget : 0, fee: tradeFee, rate: rate,