Merge pull request #18894 from mozilla/fix-signin-heading-sync-no-password

fix(settings): Show correct heading for sync signin with no password set

Author: vpomerleau

packages/fxa-settings/src/pages/Signin/index.test.tsx

@@ -763,6 +763,19 @@ describe('Signin component', () => {
           screen.queryByRole('button', { name: 'Sign in' })
         ).not.toBeInTheDocument();
       });
+
+      it('renders third party auth options for sync with linked account', () => {
+        const integration = createMockSigninOAuthNativeSyncIntegration();
+        render({ integration, hasPassword: false, hasLinkedAccount: true });
+
+        signInHeaderRendered();
+        expect(
+          screen.queryByRole('button', { name: /Continue with Google/ })
+        ).toBeInTheDocument();
+        expect(
+          screen.queryByRole('button', { name: /Continue with Apple/ })
+        ).toBeInTheDocument();
+      });
     });
   });
 

packages/fxa-settings/src/pages/Signin/index.tsx

@@ -339,7 +339,7 @@ const Signin = ({
           }}
         />
       )}
-      {isPasswordNeededRef.current ? (
+      {isPasswordNeededRef.current && hasPassword ? (
         <CardHeader
           headingText="Enter your password"
           headingAndSubheadingFtlId="signin-password-needed-header-2"