diff --git a/app/(main)/search/page.tsx b/app/(main)/search/page.tsx
index 99e86a1..f20bc05 100644
--- a/app/(main)/search/page.tsx
+++ b/app/(main)/search/page.tsx
@@ -75,18 +75,15 @@ function StatusBadge({ status }: { status: Player["status"] }) {
}
function PlayerCard({ player }: { player: Player }) {
- const minPrice = useMemo(() => {
- if (!player.services || player.services.length === 0) return 0
- return Math.min(...player.services.map((s) => s.price))
- }, [player.services])
+ const minPrice =
+ !player.services || player.services.length === 0
+ ? 0
+ : Math.min(...player.services.map((s) => s.price))
- const unit = useMemo(() => {
- if (!player.services || player.services.length === 0) return "局"
- const cheapestService = player.services.reduce((prev, curr) =>
- prev.price < curr.price ? prev : curr,
- )
- return cheapestService.unit
- }, [player.services])
+ const unit =
+ !player.services || player.services.length === 0
+ ? "局"
+ : player.services.reduce((prev, curr) => (prev.price < curr.price ? prev : curr)).unit
return (
@@ -333,7 +330,7 @@ function SearchPageContent() {
const minP = priceRange.min ? Number(priceRange.min) : 0
const maxP = priceRange.max ? Number(priceRange.max) : Infinity
- const playerMinPrice = Math.min(...(player.services?.map((s) => s.price) || [0]))
+ const playerMinPrice = Math.min(...player.services.map((s) => s.price))
if (playerMinPrice < minP) return false
if (priceRange.max && playerMinPrice > maxP) return false
@@ -352,13 +349,13 @@ function SearchPageContent() {
case "rating":
return b.rating - a.rating
case "price_asc": {
- const priceA = Math.min(...(a.services?.map((s) => s.price) || [0]))
- const priceB = Math.min(...(b.services?.map((s) => s.price) || [0]))
+ const priceA = Math.min(...a.services.map((s) => s.price))
+ const priceB = Math.min(...b.services.map((s) => s.price))
return priceA - priceB
}
case "price_desc": {
- const priceA = Math.min(...(a.services?.map((s) => s.price) || [0]))
- const priceB = Math.min(...(b.services?.map((s) => s.price) || [0]))
+ const priceA = Math.min(...a.services.map((s) => s.price))
+ const priceB = Math.min(...b.services.map((s) => s.price))
return priceB - priceA
}
case "orders":
diff --git a/app/(order)/orders/page.tsx b/app/(order)/orders/page.tsx
index 30d2b7d..a51f896 100644
--- a/app/(order)/orders/page.tsx
+++ b/app/(order)/orders/page.tsx
@@ -104,14 +104,16 @@ export default function OrderListPage() {
{order.status === "in_progress" &&
(() => {
const session = mockChatSessions.find((s) => s.orderId === order.id)
- return session ? (
-
- ) : null
+ return (
+ session && (
+
+ )
+ )
})()}
{order.status === "completed" && (