From 5007212a689962785d68a6fb3979a8fbc70ae336 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 22:41:53 -0500
Subject: [PATCH 1/8] upcoming: [M3-7530] - Restrict proxy users from updating
 username/email

---
 .../SingleTextFieldForm/SingleTextFieldForm.tsx | 17 +++++++++++------
 .../Profile/DisplaySettings/DisplaySettings.tsx | 10 +++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index 3843eb6c91f..eb699bc8598 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -1,5 +1,4 @@
 import { APIError } from '@linode/api-v4/lib/types';
-import { Theme } from '@mui/material/styles';
 import * as React from 'react';
 
 import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
@@ -69,9 +68,11 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
       <Box
         sx={(theme) => ({
           [theme.breakpoints.down('md')]: {
+            alignItems: 'flex-start',
             flexDirection: 'column',
           },
         })}
+        alignItems="flex-end"
         display="flex"
         justifyContent="space-between"
       >
@@ -88,7 +89,6 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
           label={label}
           onBlur={(e) => setValue(e.target.value)}
           onChange={(e) => setValue(e.target.value)}
-          tooltipText={tooltipText ? tooltipText : undefined}
           trimmed={trimmed}
           value={value}
         />
@@ -98,12 +98,17 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
             label: `Update ${label}`,
             loading: submitting,
             onClick: handleSubmit,
-            sx: (theme: Theme) => ({
+            sx: () => ({
+              margin: '0 !important', // Investigate why I can't override with `!important`
               minWidth: 180,
-              [theme.breakpoints.up('md')]: {
-                marginTop: 2,
-              },
             }),
+            tooltipText:
+              tooltipText && typeof tooltipText === 'string'
+                ? tooltipText
+                : undefined,
+          }}
+          sx={{
+            padding: 0,
           }}
         />
       </Box>
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
index 7a05360ef1a..28e16b2f852 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
@@ -30,6 +30,8 @@ export const DisplaySettings = () => {
   const location = useLocation<{ focusEmail: boolean }>();
   const emailRef = React.createRef<HTMLInputElement>();
 
+  const isProxyUser = profile?.user_type === 'proxy';
+
   React.useEffect(() => {
     if (location.state?.focusEmail && emailRef.current) {
       emailRef.current.focus();
@@ -63,6 +65,8 @@ export const DisplaySettings = () => {
     </>
   );
 
+  const restrictedProxyUserTooltip = 'Proxy users cannot update this field.';
+
   return (
     <Paper>
       <Box
@@ -102,9 +106,11 @@ export const DisplaySettings = () => {
         tooltipText={
           profile?.restricted
             ? 'Restricted users cannot update their username. Please contact an account administrator.'
+            : isProxyUser
+            ? restrictedProxyUserTooltip
             : undefined
         }
-        disabled={profile?.restricted}
+        disabled={profile?.restricted || isProxyUser}
         initialValue={profile?.username}
         key={usernameResetToken}
         label="Username"
@@ -125,11 +131,13 @@ export const DisplaySettings = () => {
             refetch();
           }
         }}
+        disabled={isProxyUser}
         initialValue={profile?.email}
         inputRef={emailRef}
         key={emailResetToken}
         label="Email"
         submitForm={updateEmail}
+        tooltipText={isProxyUser ? restrictedProxyUserTooltip : undefined}
         trimmed
         type="email"
       />

From a34ebce3e01d3dffee75d0644bd9ac6937054fd8 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 22:50:47 -0500
Subject: [PATCH 2/8] upcoming: [M3-7530] - Restrict proxy users from updating
 username/email

---
 .../SingleTextFieldForm.tsx                   |  2 +-
 .../DisplaySettings/DisplaySettings.test.tsx  | 35 +++++++++++++++++++
 .../Profile/DisplaySettings/TimezoneForm.tsx  | 11 +++++-
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx

diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index eb699bc8598..f2b1ae4c748 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -99,7 +99,7 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
             loading: submitting,
             onClick: handleSubmit,
             sx: () => ({
-              margin: '0 !important', // Investigate why I can't override with `!important`
+              margin: '0 !important', // Investigate why I can't override without `!important`
               minWidth: 180,
             }),
             tooltipText:
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
new file mode 100644
index 00000000000..6177be0b25a
--- /dev/null
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
@@ -0,0 +1,35 @@
+import { screen } from '@testing-library/react';
+import React from 'react';
+
+import { profileFactory } from 'src/factories/profile';
+import { DisplaySettings } from 'src/features/Profile/DisplaySettings/DisplaySettings';
+import { renderWithTheme } from 'src/utilities/testHelpers';
+
+// Mock the useProfile hooks to immediately return the expected data, circumventing the HTTP request and loading state.
+const queryMocks = vi.hoisted(() => ({
+  useProfile: vi.fn().mockReturnValue({}),
+}));
+
+vi.mock('src/queries/profile', async () => {
+  const actual = await vi.importActual('src/queries/profile');
+  return {
+    ...actual,
+    useProfile: queryMocks.useProfile,
+  };
+});
+
+describe('DisplaySettings component', () => {
+  it('should disable SingleTextFieldForm components based on isProxyUser', () => {
+    queryMocks.useProfile.mockReturnValue({
+      data: profileFactory.build({ user_type: 'proxy' }),
+    });
+
+    renderWithTheme(<DisplaySettings />);
+
+    const usernameInput = screen.getByLabelText('Username');
+    expect(usernameInput).toHaveAttribute('disabled');
+
+    const emailInput = screen.getByLabelText('Email');
+    expect(emailInput).toHaveAttribute('disabled');
+  });
+});
diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index 52682b97ce0..11a2a5eb0dd 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -86,7 +86,11 @@ export const TimezoneForm = (props: Props) => {
           </Typography>
         </StyledLoggedInAsCustomerNotice>
       ) : null}
-      <StyledRootContainer display="flex" justifyContent="space-between">
+      <StyledRootContainer
+        alignItems="flex-end"
+        display="flex"
+        justifyContent="space-between"
+      >
         <Select
           data-qa-tz-select
           defaultValue={defaultTimeZone}
@@ -104,10 +108,15 @@ export const TimezoneForm = (props: Props) => {
             loading: isLoading,
             onClick: onSubmit,
             sx: {
+              margin: '0 !important', // Investigate why I can't override without `!important`
               marginTop: (theme: Theme) => (theme.breakpoints.up('md') ? 2 : 0),
               minWidth: 180,
             },
           }}
+          sx={{
+            margin: 0,
+            padding: 0,
+          }}
         />
       </StyledRootContainer>
     </>

From 1c7e54ea06635bad59e5c6fda08fe48af8904cca Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 22:52:43 -0500
Subject: [PATCH 3/8] upcoming: [M3-7530] - Restrict proxy users from updating
 username/email

---
 .../src/features/Profile/DisplaySettings/TimezoneForm.tsx  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index 11a2a5eb0dd..de9e706ceaa 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -87,6 +87,12 @@ export const TimezoneForm = (props: Props) => {
         </StyledLoggedInAsCustomerNotice>
       ) : null}
       <StyledRootContainer
+        sx={(theme) => ({
+          [theme.breakpoints.down('md')]: {
+            alignItems: 'flex-start',
+            flexDirection: 'column',
+          },
+        })}
         alignItems="flex-end"
         display="flex"
         justifyContent="space-between"
@@ -114,7 +120,6 @@ export const TimezoneForm = (props: Props) => {
             },
           }}
           sx={{
-            margin: 0,
             padding: 0,
           }}
         />

From 02ba17eeda12721e02f0632d54e8e86889e4f141 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 23:00:16 -0500
Subject: [PATCH 4/8] Minor changes

---
 .../src/components/SingleTextFieldForm/SingleTextFieldForm.tsx  | 2 +-
 .../features/Profile/DisplaySettings/DisplaySettings.test.tsx   | 1 -
 .../src/features/Profile/DisplaySettings/TimezoneForm.tsx       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index f2b1ae4c748..8885597501a 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -99,7 +99,7 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
             loading: submitting,
             onClick: handleSubmit,
             sx: () => ({
-              margin: '0 !important', // Investigate why I can't override without `!important`
+              margin: '0 !important', // TODO: Investigate why I can't override without `!important`
               minWidth: 180,
             }),
             tooltipText:
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
index 6177be0b25a..1d79b10607b 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
@@ -5,7 +5,6 @@ import { profileFactory } from 'src/factories/profile';
 import { DisplaySettings } from 'src/features/Profile/DisplaySettings/DisplaySettings';
 import { renderWithTheme } from 'src/utilities/testHelpers';
 
-// Mock the useProfile hooks to immediately return the expected data, circumventing the HTTP request and loading state.
 const queryMocks = vi.hoisted(() => ({
   useProfile: vi.fn().mockReturnValue({}),
 }));
diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index de9e706ceaa..546a752c839 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -114,7 +114,7 @@ export const TimezoneForm = (props: Props) => {
             loading: isLoading,
             onClick: onSubmit,
             sx: {
-              margin: '0 !important', // Investigate why I can't override without `!important`
+              margin: '0 !important', // TODO: Investigate why I can't override without `!important`
               marginTop: (theme: Theme) => (theme.breakpoints.up('md') ? 2 : 0),
               minWidth: 180,
             },

From 6c8f6552c9314509c68dad70d2b0e341bcb2c053 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 23:03:13 -0500
Subject: [PATCH 5/8] Found the culprit

---
 .../manager/src/components/ActionsPanel/ActionsPanel.tsx     | 5 +----
 .../components/SingleTextFieldForm/SingleTextFieldForm.tsx   | 2 +-
 .../src/features/Profile/DisplaySettings/TimezoneForm.tsx    | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/manager/src/components/ActionsPanel/ActionsPanel.tsx b/packages/manager/src/components/ActionsPanel/ActionsPanel.tsx
index 6437d6f315b..e612986a2c3 100644
--- a/packages/manager/src/components/ActionsPanel/ActionsPanel.tsx
+++ b/packages/manager/src/components/ActionsPanel/ActionsPanel.tsx
@@ -8,8 +8,8 @@ import { Box, BoxProps } from '../Box';
 
 interface ActionButtonsProps extends ButtonProps {
   'data-node-idx'?: number;
-  'data-testid'?: string;
   'data-qa-form-data-loading'?: boolean;
+  'data-testid'?: string;
   label: string;
 }
 
@@ -78,9 +78,6 @@ const StyledBox = styled(Box)(({ theme: { spacing } }) => ({
   '& > :only-child': {
     marginRight: 0,
   },
-  '& > button': {
-    marginBottom: spacing(1),
-  },
   justifyContent: 'flex-end',
   marginTop: spacing(1),
   paddingBottom: spacing(1),
diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index 8885597501a..172b2daa376 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -99,7 +99,7 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
             loading: submitting,
             onClick: handleSubmit,
             sx: () => ({
-              margin: '0 !important', // TODO: Investigate why I can't override without `!important`
+              margin: '0',
               minWidth: 180,
             }),
             tooltipText:
diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index 546a752c839..37b82794e1d 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -114,7 +114,7 @@ export const TimezoneForm = (props: Props) => {
             loading: isLoading,
             onClick: onSubmit,
             sx: {
-              margin: '0 !important', // TODO: Investigate why I can't override without `!important`
+              margin: '0',
               marginTop: (theme: Theme) => (theme.breakpoints.up('md') ? 2 : 0),
               minWidth: 180,
             },

From f7efaaef05b381b45b6cf5aafc739352477027d2 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 23:04:59 -0500
Subject: [PATCH 6/8] Minor...

---
 .../components/SingleTextFieldForm/SingleTextFieldForm.tsx    | 4 ++--
 .../src/features/Profile/DisplaySettings/TimezoneForm.tsx     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index 172b2daa376..1da9de3b922 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -98,10 +98,10 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
             label: `Update ${label}`,
             loading: submitting,
             onClick: handleSubmit,
-            sx: () => ({
+            sx: {
               margin: '0',
               minWidth: 180,
-            }),
+            },
             tooltipText:
               tooltipText && typeof tooltipText === 'string'
                 ? tooltipText
diff --git a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
index 37b82794e1d..65c41cc514e 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/TimezoneForm.tsx
@@ -1,4 +1,4 @@
-import { Theme, styled } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import { DateTime } from 'luxon';
 import { useSnackbar } from 'notistack';
 import * as React from 'react';
@@ -115,7 +115,6 @@ export const TimezoneForm = (props: Props) => {
             onClick: onSubmit,
             sx: {
               margin: '0',
-              marginTop: (theme: Theme) => (theme.breakpoints.up('md') ? 2 : 0),
               minWidth: 180,
             },
           }}

From 0ae754ffc940b8c770b8071288bc36ff598d125a Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Tue, 23 Jan 2024 23:06:39 -0500
Subject: [PATCH 7/8] Added changeset: Restrict proxy users from updating
 username/email

---
 .../.changeset/pr-10103-upcoming-features-1706069199851.md   | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/manager/.changeset/pr-10103-upcoming-features-1706069199851.md

diff --git a/packages/manager/.changeset/pr-10103-upcoming-features-1706069199851.md b/packages/manager/.changeset/pr-10103-upcoming-features-1706069199851.md
new file mode 100644
index 00000000000..3312b8cbfbf
--- /dev/null
+++ b/packages/manager/.changeset/pr-10103-upcoming-features-1706069199851.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Restrict proxy users from updating username/email ([#10103](https://github.com/linode/manager/pull/10103))

From a2549944960a709a3aacc72f331bf50059cd4939 Mon Sep 17 00:00:00 2001
From: Jaalah Ramos <jaalah.ramos@gmail.com>
Date: Fri, 26 Jan 2024 11:41:27 -0500
Subject: [PATCH 8/8] Update tests and fix input length

---
 .../SingleTextFieldForm.tsx                   | 10 ++---
 .../DisplaySettings/DisplaySettings.test.tsx  | 38 +++++++++++++++++++
 .../DisplaySettings/DisplaySettings.tsx       |  3 +-
 packages/manager/src/mocks/serverHandlers.ts  |  2 +-
 4 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
index 1da9de3b922..45ca372bdf8 100644
--- a/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
+++ b/packages/manager/src/components/SingleTextFieldForm/SingleTextFieldForm.tsx
@@ -78,12 +78,11 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
       >
         <TextField
           {...textFieldProps}
-          sx={(theme) => ({
-            minWidth: 415,
-            [theme.breakpoints.down('md')]: {
-              minWidth: 'auto',
+          containerProps={{
+            sx: {
+              width: '100%',
             },
-          })}
+          }}
           disabled={disabled}
           errorText={fieldError}
           label={label}
@@ -108,6 +107,7 @@ export const SingleTextFieldForm = React.memo((props: Props) => {
                 : undefined,
           }}
           sx={{
+            flexShrink: 0,
             padding: 0,
           }}
         />
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
index 1d79b10607b..3a692af57b3 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.test.tsx
@@ -31,4 +31,42 @@ describe('DisplaySettings component', () => {
     const emailInput = screen.getByLabelText('Email');
     expect(emailInput).toHaveAttribute('disabled');
   });
+
+  it('Should only disable the SingleTextFieldForm components if the user is not a proxy user.', () => {
+    queryMocks.useProfile.mockReturnValue({
+      data: profileFactory.build({ user_type: 'child' }),
+    });
+
+    renderWithTheme(<DisplaySettings />);
+
+    const usernameInput = screen.getByLabelText('Username');
+    expect(usernameInput).not.toHaveAttribute('disabled');
+
+    const emailInput = screen.getByLabelText('Email');
+    expect(emailInput).not.toHaveAttribute('disabled');
+  });
+
+  it('should disable the "Update Username" and "Update Email" buttons if the user is a proxy user.', async () => {
+    queryMocks.useProfile.mockReturnValue({
+      data: profileFactory.build({ user_type: 'proxy' }),
+    });
+
+    renderWithTheme(<DisplaySettings />);
+
+    const updateUsernameButton = screen
+      .getByText('Update Username')
+      .closest('button');
+
+    const updateEmailButton = screen
+      .getByText('Update Email')
+      .closest('button');
+
+    expect(updateUsernameButton).not.toHaveAttribute('disabled');
+    expect(updateUsernameButton).toHaveAttribute('aria-disabled', 'true');
+    expect(updateEmailButton).toHaveAttribute('data-qa-tooltip');
+
+    expect(updateEmailButton).not.toHaveAttribute('disabled');
+    expect(updateEmailButton).toHaveAttribute('aria-disabled', 'true');
+    expect(updateEmailButton).toHaveAttribute('data-qa-tooltip');
+  });
 });
diff --git a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
index 28e16b2f852..cd45bec69f9 100644
--- a/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
+++ b/packages/manager/src/features/Profile/DisplaySettings/DisplaySettings.tsx
@@ -65,7 +65,8 @@ export const DisplaySettings = () => {
     </>
   );
 
-  const restrictedProxyUserTooltip = 'Proxy users cannot update this field.';
+  const restrictedProxyUserTooltip =
+    'This account type cannot update this field.';
 
   return (
     <Paper>
diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
index c0007de8687..c7947bb0400 100644
--- a/packages/manager/src/mocks/serverHandlers.ts
+++ b/packages/manager/src/mocks/serverHandlers.ts
@@ -551,7 +551,7 @@ export const handlers = [
     const profile = profileFactory.build({
       restricted: false,
       // Parent/Child: switch the `user_type` depending on what account view you need to mock.
-      user_type: 'parent',
+      user_type: 'proxy',
     });
     return res(ctx.json(profile));
   }),