Skip to content

Commit

Permalink
Merge pull request #29797 from tienifr/fix/29170
Browse files Browse the repository at this point in the history
Fix: Login page loads infinitely when logging in from `Another login page is open` page
  • Loading branch information
flodnv authored Oct 18, 2023
2 parents b64fd34 + ed21eb5 commit ee37ebe
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions src/pages/signin/SignInPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,16 +250,20 @@ function SignInPage({credentials, account, isInModal, activeClients, preferredLo
blurOnSubmit={account.validated === false}
scrollPageToTop={signInPageLayoutRef.current && signInPageLayoutRef.current.scrollPageToTop}
/>
{shouldShowValidateCodeForm && (
<ValidateCodeForm
isUsingRecoveryCode={isUsingRecoveryCode}
setIsUsingRecoveryCode={setIsUsingRecoveryCode}
setIsUsingMagicCode={setIsUsingMagicCode}
/>
{isClientTheLeader && (
<>
{shouldShowValidateCodeForm && (
<ValidateCodeForm
isUsingRecoveryCode={isUsingRecoveryCode}
setIsUsingRecoveryCode={setIsUsingRecoveryCode}
setIsUsingMagicCode={setIsUsingMagicCode}
/>
)}
{shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
{shouldShowChooseSSOOrMagicCode && <ChooseSSOOrMagicCode setIsUsingMagicCode={setIsUsingMagicCode} />}
{shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
</>
)}
{shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
{shouldShowChooseSSOOrMagicCode && <ChooseSSOOrMagicCode setIsUsingMagicCode={setIsUsingMagicCode} />}
{shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
</SignInPageLayout>
</View>
);
Expand Down

0 comments on commit ee37ebe

Please sign in to comment.