From b370d54394a582cd1d63b1301f33cf4ec43c01f0 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sun, 5 Oct 2025 22:34:47 +1100
Subject: [PATCH] Fix rendering for custom status values (#10492)

- Improve field lookup priority
---
 src/frontend/src/components/render/StatusRenderer.tsx | 5 ++++-
 src/frontend/src/tables/ColumnRenderers.tsx           | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/frontend/src/components/render/StatusRenderer.tsx b/src/frontend/src/components/render/StatusRenderer.tsx
index 4a5823bffd..6ecfe6bb88 100644
--- a/src/frontend/src/components/render/StatusRenderer.tsx
+++ b/src/frontend/src/components/render/StatusRenderer.tsx
@@ -194,7 +194,10 @@ export function TableStatusRenderer(
   accessor?: string
 ): ((record: any) => any) | undefined {
   return (record: any) => {
-    const status = resolveItem(record, accessor ?? 'status');
+    const status =
+      resolveItem(record, accessor ?? 'status') ??
+      resolveItem(record, 'status_custom_key') ??
+      resolveItem(record, 'status');
 
     return (
       status && (
diff --git a/src/frontend/src/tables/ColumnRenderers.tsx b/src/frontend/src/tables/ColumnRenderers.tsx
index 265b49ba28..ce27f54432 100644
--- a/src/frontend/src/tables/ColumnRenderers.tsx
+++ b/src/frontend/src/tables/ColumnRenderers.tsx
@@ -368,14 +368,14 @@ export type StatusColumnProps = TableColumnProps & {
 };
 
 export function StatusColumn(props: StatusColumnProps): TableColumn {
-  const accessor: string = props.accessor ?? 'status';
+  const accessor: string = props.accessor ?? 'status_custom_key';
 
   return {
     accessor: 'status',
     sortable: true,
     switchable: true,
     minWidth: '50px',
-    render: TableStatusRenderer(props.model, accessor ?? 'status_custom_key'),
+    render: TableStatusRenderer(props.model, accessor),
     ...props
   };
 }