Skip to content

Commit bea922e

Browse files
Ricc68Ricc68
andauthored
fix(ota): when OTA file version is negative number return N/A (#2499)
* feat: add a danger icon to OTA page for battery devices when battery is too low to run an update * style: run pretty * fix: replace red circle danger icon with yellow triangle warning one * fix: when OTA file version is negative number return N/A --------- Co-authored-by: Ricc68 <ricc68@local>
1 parent 2ff3e97 commit bea922e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/components/ota-page/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
189189
accessor: ({ state }) => {
190190
const installed_version = ((state?.update ?? {}) as OTAState).installed_version;
191191

192-
if (typeof installed_version === 'number' && installed_version)
192+
if (typeof installed_version === 'number' && installed_version >= 0)
193193
return fileVersion2String(installed_version);
194194
else return t('zigbee:firmware_installed_version_na');
195195
},
@@ -199,7 +199,8 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
199199
accessor: ({ state }) => {
200200
const latest_version = ((state?.update ?? {}) as OTAState).latest_version;
201201

202-
if (typeof latest_version === 'number' && latest_version) return fileVersion2String(latest_version);
202+
if (typeof latest_version === 'number' && latest_version >= 0)
203+
return fileVersion2String(latest_version);
203204
else return 'N/A';
204205
},
205206
},

ws-messages/onConnect.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8694,7 +8694,7 @@
86948694
"topic": "dining room/ac power/availability"
86958695
},
86968696
{
8697-
"payload": "offline",
8697+
"payload": "online",
86988698
"topic": "0x0017880103d55d65/availability"
86998699
},
87008700
{
@@ -8858,7 +8858,12 @@
88588858
"brightness": 110,
88598859
"color_mode": "xy",
88608860
"last_seen": "2022-04-15T17:48:30+08:00",
8861-
"state": "ON"
8861+
"state": "ON",
8862+
"update": {
8863+
"installed_version": -1,
8864+
"latest_version": -1,
8865+
"state": "unknown"
8866+
}
88628867
},
88638868
"topic": "0x0017880103d55d65"
88648869
}

0 commit comments

Comments
 (0)