diff --git a/native/profile/linked-devices-list-item.react.js b/native/profile/linked-devices-list-item.react.js --- a/native/profile/linked-devices-list-item.react.js +++ b/native/profile/linked-devices-list-item.react.js @@ -72,16 +72,21 @@ const label = React.useMemo(() => { const baseLabel = deviceID.substr(0, 7); - let finalLabel = baseLabel; + const labelAttributes = []; if (isPrimary) { - finalLabel += ' (primary)'; + labelAttributes.push('primary'); } - if (isThisDevice) { - finalLabel += ' (this device)'; + labelAttributes.push('this device'); + } + + if (labelAttributes.length === 0) { + return baseLabel; } + const joinedAttributes = labelAttributes.join(', '); + const finalLabel = `${baseLabel} (${joinedAttributes})`; return finalLabel; }, [deviceID, isPrimary, isThisDevice]);