diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 76aea5b..a8205ff 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -271,16 +271,16 @@ function DashboardPassengerOfficeComponent() { ), }, { - accessorFn: (row) => row.refer_reason, - id: "refer_reason", + accessorFn: (row) => row.latest_history.expert_description, + id: "latest_history.expert_description", header: t("PassengerBoss.refer_reason"), enableColumnFilter: false, datatype: "text", filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], - Cell: ({renderedCellValue, row}) => { + Cell: ({row}) => { return ( - {renderedCellValue} + {row.original.latest_history.action === 'refer'? row.original.latest_history.expert_description : null} ) }, }, diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index a807635..62efc0a 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -413,16 +413,16 @@ function DashboardTransportationAssistanceComponent() { ), }, { - accessorFn: (row) => row.refer_reason, - id: "refer_reason", + accessorFn: (row) => row.latest_history.expert_description, + id: "latest_history.expert_description", header: t("TransportationAssistance.refer_reason"), enableColumnFilter: false, datatype: "text", filterFn: "contains", columnFilterModeOptions: ["contains", "equals", "notEquals"], - Cell: ({renderedCellValue, row}) => { + Cell: ({row}) => { return ( - {renderedCellValue} + {row.original.latest_history.action === 'refer'? row.original.latest_history.expert_description : null} ) }, },