Skip to content

[3.21] Show last used bagde only if there are more than one login method #5948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kzuraw merged 3 commits into from
Oct 7, 2025
Merged

[3.21] Show last used bagde only if there are more than one login method #5948

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c9ceae
Show last used bagde only if there are more than one login method (#5…
kzuraw Oct 7, 2025
e512c1b
Add changeset
kzuraw Oct 7, 2025
0ec73f4
fix changset wording
kzuraw Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/smart-singers-open.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Show last used bagde only if there are more than one login method
4 changes: 3 additions & 1 deletion src/auth/components/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const LoginPage: React.FC<LoginCardProps> = props => {
const intl = useIntl();
const [showPassword, setShowPassword] = useState(false);
const [optimisticLoaderAuthId, setOptimisticLoaderAuthId] = useState<null | string>(null);
const showLastLoginIndicatorForPassword =
lastLoginMethod === "password" && externalAuthentications.length > 0;

return (
<LoginForm onSubmit={onSubmit}>
Expand Down Expand Up @@ -124,7 +126,7 @@ const LoginPage: React.FC<LoginCardProps> = props => {
data-test-id="submit"
position="relative"
>
{lastLoginMethod === "password" && <LastLoginIndicator />}
{showLastLoginIndicatorForPassword && <LastLoginIndicator />}
<FormattedMessage id="AubJ/S" defaultMessage="Sign in" description="button" />
</ButtonWithLoader>
</div>
Expand Down
Loading