Skip to content

Fix icon placement for two step login scenario where username is hidden #2960

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

Open
JanSvoboda wants to merge 3 commits into
base: develop
Choose a base branch
from
+5 −4
Open

Fix icon placement for two step login scenario where username is hidden #2960

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1ad678
Fix icon placement for two step login scenario where username is hidden
JanSvoboda Apr 29, 2026
88d124a
Improve username visibility check to avoid redundant DOM passes
JanSvoboda May 4, 2026
a80be78
Merge branch 'keepassxreboot:develop' into fix/username-input-hidden
JanSvoboda May 4, 2026
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
6 changes: 3 additions & 3 deletions keepassxc-browser/content/icon-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ kpxcIcons.addIconsFromForm = async function(form) {
}
}

if (c.username && !c.username.readOnly) {
if (c.username && !c.username.readOnly && kpxcFields.isVisible(c.username)) {
Copy link
Copy Markdown
Member

@varjolintu varjolintu May 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use:
const usernameFieldVisible = c.username && kpxcFields.isVisible(c.username);

kpxcIcons.addIcon(c.username, kpxcIcons.iconTypes.DEFAULT);
} else if (c.password && (!c.username || (c.username && c.username.readOnly))) {
// Single password field
} else if (c.password && (!c.username || c.username.readOnly || !kpxcFields.isVisible(c.username))) {
Copy link
Copy Markdown
Member

@varjolintu varjolintu May 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be:
} else if (c.password && (!c.username || (c.username && (c.username.readOnly || !usernameFieldVisible)))) {

So the single password field applies if:

  • Password field is defined
  • Usename field is not found OR
  • Username field is found, but is readOnly or not visible

// Single password field, or username field is hidden (e.g. two-step login)
Comment thread
varjolintu marked this conversation as resolved.
Outdated
kpxcIcons.addIcon(c.password, kpxcIcons.iconTypes.DEFAULT);
}
}
Expand Down
Loading