diff --git a/packages/web/components/swap-tool/trade-details.tsx b/packages/web/components/swap-tool/trade-details.tsx
index 2bd87d8473..d4ddd8417f 100644
--- a/packages/web/components/swap-tool/trade-details.tsx
+++ b/packages/web/components/swap-tool/trade-details.tsx
@@ -87,7 +87,7 @@ export const TradeDetails = observer(
>
-
+
@@ -102,7 +102,7 @@ export const TradeDetails = observer(
setOutAsBase(!outAsBase)}
className={classNames(
- "body2 sm:caption text-osmoverse-300",
+ "body2 sm:caption py-1 text-osmoverse-300",
{
"animate-pulse": inPriceFetching || isLoading,
}
@@ -140,7 +140,7 @@ export const TradeDetails = observer(
height={16}
/>
)}
-
+
{open ? t("swap.hideDetails") : t("swap.showDetails")}
@@ -178,7 +178,8 @@ export const TradeDetails = observer(
"text-bullish-400": !isPriceImpactHigh,
})}
>
- -{formatPretty(priceImpact ?? new Dec(0))}
+ {!priceImpact?.toDec().isZero() && "~"}
+ {formatPretty(priceImpact ?? new Dec(0))}
diff --git a/packages/web/components/transactions/transaction-content.tsx b/packages/web/components/transactions/transaction-content.tsx
index 9e68e6d7dd..59f513c0ff 100644
--- a/packages/web/components/transactions/transaction-content.tsx
+++ b/packages/web/components/transactions/transaction-content.tsx
@@ -91,17 +91,20 @@ export const TransactionContent = ({
{TX_PAGE_TABS.map((defaultTab) => (
-
{t(
defaultTab === "history"
? "transactions.history"
: "transactions.orders"
)}
-
+
))}
diff --git a/packages/web/components/transactions/transaction-details/transaction-details-content.tsx b/packages/web/components/transactions/transaction-details/transaction-details-content.tsx
index 5d94b897aa..748c4ab708 100644
--- a/packages/web/components/transactions/transaction-details/transaction-details-content.tsx
+++ b/packages/web/components/transactions/transaction-details/transaction-details-content.tsx
@@ -11,7 +11,11 @@ import { IconButton } from "~/components/buttons/icon-button";
import { displayFiatPrice } from "~/components/transactions/transaction-utils";
import { Button } from "~/components/ui/button";
import { EventName } from "~/config";
-import { useAmplitudeAnalytics, useTranslation } from "~/hooks";
+import {
+ useAmplitudeAnalytics,
+ useFeatureFlags,
+ useTranslation,
+} from "~/hooks";
import { theme } from "~/tailwind.config";
import { formatPretty } from "~/utils/formatter";
@@ -77,12 +81,16 @@ export const TransactionDetailsContent = ({
failed: t("transactions.swapFailed"),
};
+ const featureFlags = useFeatureFlags();
+
return (
diff --git a/packages/web/modals/base.tsx b/packages/web/modals/base.tsx
index 8fae634c04..3caf9bac22 100644
--- a/packages/web/modals/base.tsx
+++ b/packages/web/modals/base.tsx
@@ -6,6 +6,7 @@ import { useUnmount } from "react-use";
import { Icon } from "~/components/assets";
import { IconButton } from "~/components/ui/button";
import { SpriteIconId } from "~/config";
+import { useFeatureFlags } from "~/hooks";
import { useWindowSize } from "~/hooks/window/use-window-size";
if (setAppElement) {
@@ -39,7 +40,7 @@ export const ModalBase = ({
children,
}: PropsWithChildren
) => {
const { isMobile } = useWindowSize();
-
+ const featureFlags = useFeatureFlags();
const bodyOpenClassNames = classNames("overflow-hidden", bodyOpenClassName);
useUnmount(() => {
document.body.classList.remove(bodyOpenClassNames);
@@ -58,8 +59,12 @@ export const ModalBase = ({
overlayClassName
)}
className={classNames(
- "absolute mx-10 my-8 flex max-h-[95vh] w-full max-w-modal flex-col overflow-auto rounded-3xl bg-osmoverse-800 p-8 outline-none sm:max-h-full sm:w-full sm:px-4",
- className
+ "absolute mx-10 my-8 flex max-h-[95vh] w-full max-w-modal flex-col overflow-auto rounded-3xl p-8 outline-none sm:max-h-full sm:w-full sm:px-4",
+ className,
+ {
+ "bg-osmoverse-800": !featureFlags.limitOrders,
+ "bg-osmoverse-850": featureFlags.limitOrders,
+ }
)}
closeTimeoutMS={150}
onAfterClose={onAfterClose}
diff --git a/packages/web/modals/review-order.tsx b/packages/web/modals/review-order.tsx
index 467aaa3d32..f73b710e06 100644
--- a/packages/web/modals/review-order.tsx
+++ b/packages/web/modals/review-order.tsx
@@ -87,7 +87,6 @@ export function ReviewOrder({
isBeyondOppositePrice = false,
}: ReviewOrderProps) {
const { t } = useTranslation();
-
const { logEvent } = useAmplitudeAnalytics();
const [manualSlippage, setManualSlippage] = useState("");
const [isEditingSlippage, setIsEditingSlippage] = useState(false);
@@ -204,7 +203,7 @@ export function ReviewOrder({
isOpen={isOpen}
onRequestClose={onClose}
hideCloseButton
- className="w-[512px] rounded-2xl !p-0"
+ className="w-[512px] rounded-2xl !p-0 sm:h-full sm:max-h-[100vh] sm:!rounded-none"
>
@@ -222,7 +221,7 @@ export function ReviewOrder({
})}
>
{orderType === "limit" && tab !== "swap" && (
-
+
{(tab === "buy" && !isBeyondOppositePrice) ||
@@ -441,7 +440,7 @@ export function ReviewOrder({
-
+
{headerTitle}