Skip to content

Commit 9fb6fe9

Browse files
maxyingerclaude
andcommitted
fix(mosaic): read the device strings through the localization provider
`utils/messages` is gone: #9801 moved `fill` into `localization` and put every message bundle behind `useMessages`. The active device strings now go through the same registry, which is what the merged build was failing on. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent be3715a commit 9fb6fe9

4 files changed

Lines changed: 17 additions & 11 deletions

File tree

‎packages/mosaic/src/features/user-profile/user-profile-active-devices-section.view.tsx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import { Badge } from '../../components/badge';
66
import { SubmitButton } from '../../components/button';
77
import { Dialog } from '../../components/dialog';
88
import { Section } from '../../components/section';
9-
import { fill } from '../../utils/messages';
9+
import type { MosaicMessages } from '../../localization';
10+
import { fill, useMessages } from '../../localization';
1011
import type { UserProfileMenuAction } from './user-profile-action-menu';
1112
import { UserProfileActionMenu } from './user-profile-action-menu';
12-
import { userProfileActiveDevicesMessages as m } from './user-profile-active-devices.messages';
1313
import type { UserProfileDevice } from './user-profile-active-devices.types';
1414
import { UserProfileDeviceDetailsDialog } from './user-profile-device-details.dialog';
1515
import { UserProfileSecurityIcon } from './user-profile-security-icon';
@@ -28,6 +28,7 @@ export function UserProfileActiveDevicesSectionView({
2828
onSignOutDevice,
2929
onSignOutAllOtherDevices,
3030
}: UserProfileActiveDevicesSectionViewProps) {
31+
const m = useMessages('userProfileActiveDevices');
3132
const deviceDetails = useMemo(() => Dialog.createHandle<UserProfileDevice>(), []);
3233
const signOutDevice = useMemo(() => Confirmation.createHandle<UserProfileDevice>(), []);
3334
const currentDevices = devices.filter(device => device.isCurrent);
@@ -183,12 +184,13 @@ export function UserProfileActiveDevicesSectionView({
183184
);
184185
}
185186

186-
function deviceBadges(device: UserProfileDevice): string[] {
187-
return [
187+
function deviceBadges(device: UserProfileDevice, m: MosaicMessages['userProfileActiveDevices']): string[] {
188+
const labels: (string | null)[] = [
188189
device.isCurrent ? m.thisDevice : null,
189190
device.isUserDevice ? m.userDevice : null,
190191
device.isImpersonationDevice ? m.impersonationDevice : null,
191-
].filter((label): label is string => label !== null);
192+
];
193+
return labels.filter((label): label is string => label !== null);
192194
}
193195

194196
function DeviceItem({
@@ -202,6 +204,7 @@ function DeviceItem({
202204
onViewDetails: (device: UserProfileDevice) => void;
203205
onSignOut?: (device: UserProfileDevice) => void;
204206
}) {
207+
const m = useMessages('userProfileActiveDevices');
205208
const actions: UserProfileMenuAction[] = [{ label: m.viewDetails, onClick: () => onViewDetails(device) }];
206209

207210
if (onSignOut) {
@@ -214,7 +217,7 @@ function DeviceItem({
214217
<Section.Content>
215218
<Section.Label xstyle={styles.deviceLabel}>
216219
<span>{device.name}</span>
217-
{deviceBadges(device).map(label => (
220+
{deviceBadges(device, m).map(label => (
218221
<Badge
219222
key={label}
220223
color='neutral'

‎packages/mosaic/src/features/user-profile/user-profile-active-devices.messages.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ export const userProfileActiveDevicesMessages = {
2929
confirm: 'Sign out',
3030
cancel: 'Cancel',
3131
},
32-
};
32+
} as const;

‎packages/mosaic/src/features/user-profile/user-profile-device-details.dialog.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import { Card } from '../../components/card';
66
import { DataList } from '../../components/data-list';
77
import type { DialogFocusTarget, DialogHandle } from '../../components/dialog';
88
import { Dialog } from '../../components/dialog';
9-
import { fill } from '../../utils/messages';
10-
import { userProfileActiveDevicesMessages as m } from './user-profile-active-devices.messages';
9+
import { fill, useMessages } from '../../localization';
1110
import type { UserProfileDevice } from './user-profile-active-devices.types';
1211

1312
export interface UserProfileDeviceDetailsDialogProps {
@@ -46,6 +45,7 @@ function DeviceDetailsCard({
4645
handle: DialogHandle<UserProfileDevice>;
4746
onSignOut: UserProfileDeviceDetailsDialogProps['onSignOut'];
4847
}) {
48+
const m = useMessages('userProfileActiveDevices');
4949
const [isSigningOut, setIsSigningOut] = useState(false);
5050
const [errorMessage, setErrorMessage] = useState<string>();
5151
const signingOut = useRef(false);
@@ -68,13 +68,14 @@ function DeviceDetailsCard({
6868
}
6969
};
7070

71-
const details = [
71+
const fields: { label: string; value: string | undefined }[] = [
7272
{ label: m.detailsDialog.model, value: device.model },
7373
{ label: m.detailsDialog.browser, value: device.browser },
7474
{ label: m.detailsDialog.ipAddress, value: device.ipAddress },
7575
{ label: m.detailsDialog.location, value: device.location },
7676
{ label: m.detailsDialog.signedInAt, value: device.signedInAt },
77-
].filter((detail): detail is { label: string; value: string } => Boolean(detail.value));
77+
];
78+
const details = fields.filter((field): field is { label: string; value: string } => Boolean(field.value));
7879

7980
return (
8081
<Card.Root

‎packages/mosaic/src/localization/registry.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { userProfileAddEmailMessages } from '../features/user-profile/user-profi
66
import { userProfileAddPhoneMessages } from '../features/user-profile/user-profile-account-section/user-profile-add-phone.messages';
77
import { userProfileVerifyEmailLinkMessages } from '../features/user-profile/user-profile-account-section/user-profile-verify-email-link.messages';
88
import { userProfileVerifyEmailSsoMessages } from '../features/user-profile/user-profile-account-section/user-profile-verify-email-sso.messages';
9+
import { userProfileActiveDevicesMessages } from '../features/user-profile/user-profile-active-devices.messages';
910
import { userProfileConnectedAccountsMessages } from '../features/user-profile/user-profile-connected-accounts.messages';
1011
import { userProfileDeleteSectionMessages } from '../features/user-profile/user-profile-delete-section/user-profile-delete-section.messages';
1112
import { userProfileEnterpriseAccountsMessages } from '../features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.messages';
@@ -17,6 +18,7 @@ export const mosaicMessages = {
1718
userButton: userButtonMessages,
1819
userProfile: userProfileMessages,
1920
userProfileAccountSection: userProfileAccountSectionMessages,
21+
userProfileActiveDevices: userProfileActiveDevicesMessages,
2022
userProfileAddEmail: userProfileAddEmailMessages,
2123
userProfileAddPhone: userProfileAddPhoneMessages,
2224
userProfileVerifyEmailLink: userProfileVerifyEmailLinkMessages,

0 commit comments

Comments
 (0)