diff --git a/resources/js/Pages/ShippingOrder/Show.tsx b/resources/js/Pages/ShippingOrder/Show.tsx
index 9b8d95b..47c87ee 100644
--- a/resources/js/Pages/ShippingOrder/Show.tsx
+++ b/resources/js/Pages/ShippingOrder/Show.tsx
@@ -1,16 +1,17 @@
-import { ArrowLeft, Package, Clock, User, CheckCircle2, AlertCircle, Trash2, Edit } from "lucide-react";
+import { ArrowLeft, Package, Info, CheckCircle2, AlertCircle, Trash2, Edit } from "lucide-react";
 import { Button } from "@/Components/ui/button";
 import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
 import { Head, Link, router } from "@inertiajs/react";
 import { Badge } from "@/Components/ui/badge";
 import { toast } from "sonner";
-import ActivityLogSection from "@/Components/ActivityLog/ActivityLogSection";
+import ActivityLog from "@/Components/ActivityLog/ActivityLog";
 
 interface Props {
     order: any;
+    activities: any[];
 }
 
-export default function ShippingOrderShow({ order }: Props) {
+export default function ShippingOrderShow({ order, activities = [] }: Props) {
     const isDraft = order.status === 'draft';
     const isCompleted = order.status === 'completed';
 
@@ -171,9 +172,8 @@ export default function ShippingOrderShow({ order }: Props) {
 
                         {/* 活動日誌區塊 */}
                         <div className="mt-8">
-                            <ActivityLogSection
-                                targetType="App\Modules\Procurement\Models\ShippingOrder"
-                                targetId={order.id}
+                            <ActivityLog
+                                activities={activities}
                             />
                         </div>
                     </div>