@@ -37,7 +37,11 @@ const StateCell: FunctionComponent<OtaRowProps & OtaApi> = (props) => {
3737 { otaState . progress } %
3838 </ div >
3939 </ div >
40- < div > { t ( 'remaining_time' , { remaining : toHHMMSS ( otaState . remaining ) } ) } </ div >
40+ < div >
41+ { t ( 'remaining_time' , {
42+ remaining : otaState . remaining != null ? toHHMMSS ( otaState . remaining ) : 'N/A' ,
43+ } ) }
44+ </ div >
4145 </ >
4246 ) ;
4347 case 'available' :
@@ -185,17 +189,31 @@ class OtaPage extends Component<PropsFromStore & OtaApi & WithTranslation<'ota'>
185189 } ) => < ModelLink device = { device } /> ,
186190 } ,
187191 {
188- Header : t ( 'zigbee:firmware_installed_version' ) as string ,
192+ Header : t ( 'zigbee:firmware_id' ) as string ,
193+ accessor : ( { device } ) => device . software_build_id ,
194+ Cell : ( {
195+ row : {
196+ original : { device } ,
197+ } ,
198+ } ) => (
199+ < >
200+ < OTALink device = { device } />
201+ < span title = { t ( 'zigbee:firmware_build_date' ) } > ({ device . date_code ?? 'N/A' } )</ span >
202+ </ >
203+ ) ,
204+ } ,
205+ {
206+ Header : t ( 'zigbee:installed_version' ) as string ,
189207 accessor : ( { state } ) => {
190208 const installed_version = ( ( state ?. update ?? { } ) as OTAState ) . installed_version ;
191209
192210 if ( typeof installed_version === 'number' && installed_version >= 0 )
193211 return fileVersion2String ( installed_version ) ;
194- else return t ( 'zigbee:firmware_installed_version_na ' ) ;
212+ else return t ( 'zigbee:installed_version_na ' ) ;
195213 } ,
196214 } ,
197215 {
198- Header : t ( 'zigbee:firmware_available_version ' ) as string ,
216+ Header : t ( 'zigbee:available_version ' ) as string ,
199217 accessor : ( { state } ) => {
200218 const latest_version = ( ( state ?. update ?? { } ) as OTAState ) . latest_version ;
201219
0 commit comments