diff --git a/src/components/@widgets/OrderDetailWidget/OrderDetailWidget.tsx b/src/components/@widgets/OrderDetailWidget/OrderDetailWidget.tsx index 676c850f..2e1e6bc4 100644 --- a/src/components/@widgets/OrderDetailWidget/OrderDetailWidget.tsx +++ b/src/components/@widgets/OrderDetailWidget/OrderDetailWidget.tsx @@ -30,6 +30,7 @@ import { selectTakeOtcErrors, setErrors, } from "../../../features/takeOtc/takeOtcSlice"; +import { compareAddresses } from "../../../helpers/string"; import useAllowance from "../../../hooks/useAllowance"; import useApprovalPending from "../../../hooks/useApprovalPending"; import useDepositPending from "../../../hooks/useDepositPending"; @@ -146,7 +147,7 @@ const OrderDetailWidget: FC = ({ order }) => { : OrderType.private; const userIsMakerOfSwap = order.signerWallet === account; const userIsIntendedRecipient = - order.senderWallet.toLowerCase() === account?.toLowerCase() || + compareAddresses(order.senderWallet, account || "") || order.senderWallet === ADDRESS_ZERO; const parsedExpiry = useMemo(() => { return new Date(parseInt(order.expiry) * 1000); @@ -270,6 +271,16 @@ const OrderDetailWidget: FC = ({ order }) => { ); } + if (orderTransaction) { + return ( + + ); + } + if (state === OrderDetailWidgetState.review && shouldDepositNativeToken) { return ( @@ -322,16 +333,6 @@ const OrderDetailWidget: FC = ({ order }) => { ); } - if (orderTransaction) { - return ( - - ); - } - return (