From c449073fa30258930a8e838eeaa5ecb2fc3e6213 Mon Sep 17 00:00:00 2001
From: nurikk <ainur@yojee.com>
Date: Fri, 10 Dec 2021 12:23:40 +0800
Subject: [PATCH] fix(DevicesTable): fix data accessors

---
 src/components/zigbee/DevicesTable.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/zigbee/DevicesTable.tsx b/src/components/zigbee/DevicesTable.tsx
index f64bd3de7..bb445c0bf 100644
--- a/src/components/zigbee/DevicesTable.tsx
+++ b/src/components/zigbee/DevicesTable.tsx
@@ -69,13 +69,13 @@ export function DevicesTable(props: DevicesTableProps) {
         {
             id: 'manufacturer',
             Header: t('manufacturer'),
-            accessor: ({ device }) => [device.manufacturer, device.definition?.vendor].join(' '),
+            accessor: ({ device }) => [device.definition?.vendor, device.manufacturer].join(' '),
             Cell: ({ row: { original: { device } } }) => <VendorLink device={device} />
         },
         {
             id: 'model',
             Header: t('model'),
-            accessor: ({ device }) => [device.model_id, device.definition?.model].join(' '),
+            accessor: ({ device }) => [device.definition?.model, device.model_id].join(' '),
             Cell: ({ row: { original: { device } } }) => <ModelLink device={device} />
         },
         {
@@ -89,7 +89,7 @@ export function DevicesTable(props: DevicesTableProps) {
         {
             id: 'power',
             Header: t('power'),
-            accessor: ({ state }) => state.battery,
+            accessor: ({ state, device }) => [state.battery, device.definition?.power].join(' '),
             Cell: ({ row: { original: { state, device } } }) => <PowerSource source={device.power_source} battery={state.battery as number} batteryLow={state.battery_low as boolean} />,
         },
         {