chore(swingset): read Mosaic messages from the nested key tree

Author: alexcarpenter

packages/swingset/src/stories/fixtures/api-keys-table.tsx

@@ -90,7 +90,7 @@ export function useAPIKeysTableFixture({
   showDescription?: boolean;
 } = {}): APIKeysTableViewProps {
   const locale = useLocale();
-  const messages = resolveAPIKeysTableMessages(useMessages('apiKeysTable'), subjectKind);
+  const messages = resolveAPIKeysTableMessages(useMessages('apiKeys'), subjectKind);
   const seed = useChaosFixture(initialKeys, items =>
     chaosRows(items).map(key => ({ ...key, name: chaosText(key.name) })),
   );

packages/swingset/src/stories/fixtures/organization-profile-invite-members.ts

@@ -18,7 +18,7 @@ export function useInviteMembersFixture(): {
   onInvite: (event: MouseEvent<HTMLButtonElement>) => void;
   inviteDialog: OrganizationProfileInviteMembersDialogProps;
 } {
-  const m = useMessages('organizationProfileInviteMembers');
+  const m = useMessages('organizationProfile').members.invite;
   const locale = useLocale();
   const roles = useChaosFixture(exampleRoles, items =>
     items.map(role => ({ ...role, label: chaosText(role.label), description: chaosText(role.description) })),

packages/swingset/src/stories/fixtures/user-profile-edit-password.tsx

@@ -24,7 +24,7 @@ export function useUserProfileEditPasswordFixture({
   latency = 800,
   failWith,
 }: UserProfileEditPasswordFixtureOptions = {}) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const [hasPassword, setHasPassword] = useState(initialHasPassword);
   const [hasFailed, setHasFailed] = useState(false);
   const policy: UserProfilePasswordPolicy = hasPassword

packages/swingset/src/stories/fixtures/user-profile-mfa-example.test.tsx

@@ -43,7 +43,9 @@ describe('Profile MFA flows', () => {
     'returns from %s to the method picker without closing the dialog',
     async method => {
       const user = userEvent.setup();
-      render(<ProfileExample localization={{ messages: { userProfileMfa: { addLabel: 'Add a second factor' } } }} />);
+      render(
+        <ProfileExample localization={{ messages: { userProfile: { mfa: { addLabel: 'Add a second factor' } } } }} />,
+      );
       const add = screen.getByRole('button', { name: 'Add a second factor' });
       await user.click(add);
       const dialog = screen.getByRole('dialog', { name: 'Add 2-step verification' });

packages/swingset/src/stories/fixtures/user-profile-profile.tsx

@@ -39,7 +39,7 @@ export function useUserProfileProfileFixture({
   nameFailWith,
   usernameFailWith,
 }: UserProfileProfileFixtureOptions = {}): UserProfileProfileSectionViewProps {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const seed = useChaosFixture({ firstName: initialFirstName, lastName: initialLastName }, () => ({
     firstName: chaosName(0),
     lastName: chaosName(7),

packages/swingset/src/stories/localization.mdx

@@ -90,8 +90,12 @@ is left unused, and a placeholder the values do not cover is rendered literally.
       "members": { "one": "{count} miembro", "other": "{count} miembros" }
     }
   },
-  "userProfileAddEmail": {
-    "link": { "resendCountdown": "¿No recibiste el enlace? Reenviar ({seconds})" }
+  "userProfile": {
+    "email": {
+      "addDialog": {
+        "link": { "resendCountdown": "¿No recibiste el enlace? Reenviar ({seconds})" }
+      }
+    }
   }
 }
 ```

packages/swingset/src/stories/localization.stories.tsx

@@ -129,7 +129,7 @@ function Rows({ rows }: { rows: Array<[string, ReactNode]> }) {
 // helper its placeholders call for.
 function Strings() {
   const m = useMessages('userButton');
-  const link = useMessages('userProfileAddEmail');
+  const link = useMessages('userProfile').email.addDialog;
   const locale = useLocale();
   return (
     <Rows