From d1397e431ad084d6d7d127d9c3144655bc99912b Mon Sep 17 00:00:00 2001 From: Uriel Date: Sat, 18 Nov 2023 19:19:18 -0300 Subject: [PATCH 1/3] better checks for tracker name --- gui/src/hooks/status-system.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gui/src/hooks/status-system.ts b/gui/src/hooks/status-system.ts index 082358b38a..ef2cf3732d 100644 --- a/gui/src/hooks/status-system.ts +++ b/gui/src/hooks/status-system.ts @@ -146,11 +146,12 @@ export function parseStatusToLocale( return { trackerName: 'unknown', }; - const name = tracker.tracker.info?.customName - ? tracker.tracker.info?.customName - : tracker.tracker.info?.bodyPart - ? l10n.getString('body_part-' + BodyPart[tracker.tracker.info?.bodyPart]) - : tracker.tracker.info?.displayName || 'unknown'; + const name = + tracker.tracker.info?.customName ?? + (tracker.tracker.info?.bodyPart !== undefined + ? l10n.getString('body_part-' + BodyPart[tracker.tracker.info.bodyPart]) + : tracker.tracker.info?.displayName) ?? + 'unknown'; if (typeof name !== 'string') { return { trackerName: new TextDecoder().decode(name), From e4d0ddacc8be4c76a525c3c4b4b98926eb70b3d6 Mon Sep 17 00:00:00 2001 From: Uriel Date: Sat, 18 Nov 2023 19:55:39 -0300 Subject: [PATCH 2/3] actually fix the tracker unknown issue --- gui/src/hooks/status-system.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/gui/src/hooks/status-system.ts b/gui/src/hooks/status-system.ts index ef2cf3732d..e8359c74c1 100644 --- a/gui/src/hooks/status-system.ts +++ b/gui/src/hooks/status-system.ts @@ -138,7 +138,6 @@ export function parseStatusToLocale( const tracker = trackers.find( ({ tracker }) => - data.trackerId?.trackerNum && tracker?.trackerId?.trackerNum == data.trackerId.trackerNum && tracker?.trackerId?.deviceId?.id == data.trackerId.deviceId?.id ); From d8f77dbe9b51d46f4c5c8fc49fad6292fe5f096d Mon Sep 17 00:00:00 2001 From: Uriel Date: Sun, 19 Nov 2023 00:39:34 -0300 Subject: [PATCH 3/3] undo the name part --- gui/src/hooks/status-system.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gui/src/hooks/status-system.ts b/gui/src/hooks/status-system.ts index e8359c74c1..63ce8c17e5 100644 --- a/gui/src/hooks/status-system.ts +++ b/gui/src/hooks/status-system.ts @@ -138,19 +138,18 @@ export function parseStatusToLocale( const tracker = trackers.find( ({ tracker }) => - tracker?.trackerId?.trackerNum == data.trackerId.trackerNum && - tracker?.trackerId?.deviceId?.id == data.trackerId.deviceId?.id + tracker?.trackerId?.trackerNum == data.trackerId?.trackerNum && + tracker?.trackerId?.deviceId?.id == data.trackerId?.deviceId?.id ); if (!tracker) return { trackerName: 'unknown', }; - const name = - tracker.tracker.info?.customName ?? - (tracker.tracker.info?.bodyPart !== undefined - ? l10n.getString('body_part-' + BodyPart[tracker.tracker.info.bodyPart]) - : tracker.tracker.info?.displayName) ?? - 'unknown'; + const name = tracker.tracker.info?.customName + ? tracker.tracker.info?.customName + : tracker.tracker.info?.bodyPart + ? l10n.getString('body_part-' + BodyPart[tracker.tracker.info?.bodyPart]) + : tracker.tracker.info?.displayName || 'unknown'; if (typeof name !== 'string') { return { trackerName: new TextDecoder().decode(name),