Merge pull request #809 from keepassxreboot/fix/hide_username_icon_properly

Bug fixes for 1.6.0.

keepassxc-browser/_locales/en/messages.json

@@ -1003,6 +1003,30 @@
         "message": "The value already exists in the list.",
         "description": "Error shown when trying to add a duplicate value to the list."
     },
+    "optionsUserInterfaceTitle": {
+      "message": "User interface",
+      "description": "User interface title in settings page"
+    },
+    "optionsFillingCredentialsTitle": {
+      "message": "Filling credentials",
+      "description": "Filling credentials title in settings page"
+    },
+    "optionsSavingCredentialsTitle": {
+      "message": "Saving credentials",
+      "description": "Saving credentials title in settings page"
+    },
+    "optionsUpdatesTitle": {
+      "message": "Updates",
+      "description": "Updates title in settings page"
+    },
+    "optionsAdvancedSettingsTitle": {
+      "message": "Advanced settings",
+      "description": "Advanced settings title in settings page"
+    },
+    "optionsExtensionTitle": {
+      "message": "Extension",
+      "description": "Extension title in settings page"
+    },
     "openNewTab": {
         "message": "Opens a new tab",
         "description": "Title attribute text."

keepassxc-browser/content/banner.js

@@ -146,8 +146,8 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
 
     // Only the Root group and no KeePassXC-Browser passwords -> save to default
     // Or when default group is not set and defaultGroupAskAlways is disabled -> save to default
-    if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0)) ||
-        (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) {
+    if ((result.groups === undefined || (result.groups.length > 0 && result.groups[0].children.length === 0))
+        || (!result.defaultGroupAlwaysAsk && (result.defaultGroup === '' || result.defaultGroup === DEFAULT_BROWSER_GROUP))) {
         const args = [ credentials.username, credentials.password, credentials.url ];
 
         // If root group is defined by the user, and there's no default browser group, save the credentials to the root group

keepassxc-browser/content/keepassxc-browser.js

@@ -1028,7 +1028,7 @@ kpxc.initPasswordGenerator = function(inputs) {
     }
 };
 
-kpxc.initOTPFields = function(inputs, databaseClosed) {
+kpxc.initOTPFields = function(inputs) {
     for (const i of inputs) {
         const id = i.getLowerCaseAttribute('id');
         const name = i.getLowerCaseAttribute('name');

keepassxc-browser/content/ui.js

@@ -104,7 +104,6 @@ kpxcUI.setIconPosition = function(icon, field) {
 kpxcUI.updateFromIntersectionObserver = function(iconClass, entries) {
     for (const entry of entries) {
         const rect = DOMRectToArray(entry.boundingClientRect);
-        const temp = entry.target.closest('.kpxc-username-icon');
 
         if ((entry.intersectionRatio === 0 && !entry.isIntersecting) || (rect.some(x => x < -10))) {
             iconClass.icon.style.display = 'none';

keepassxc-browser/content/username-field.js

@@ -41,7 +41,7 @@ class UsernameFieldIcon extends Icon {
 }
 
 UsernameFieldIcon.prototype.initField = function(field) {
-    if (!field || field.getAttribute('kpxc-username-field') === 'true') {
+    if (!field || field.getAttribute('kpxc-username-field') === 'true' || !kpxcFields.isVisible(field)) {
         return;
     }
 

keepassxc-browser/options/options.html

@@ -50,7 +50,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-television" aria-hidden="true"></i>
-                  User interface
+                  <span data-i18n="optionsUserInterfaceTitle"></span>
                 </div>
                 <div class="card-body">
                   <div class="form-group">
@@ -120,7 +120,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-pencil" aria-hidden="true"></i>
-                  Filling credentials
+                  <span data-i18n="optionsFillingCredentialsTitle"></span>
                 </div>
                 <div class="card-body">
                   <div class="form-group">
@@ -174,7 +174,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-save" aria-hidden="true"></i>
-                  Saving credentials
+                  <span data-i18n="optionsSavingCredentialsTitle"></span>
                 </div>
                 <div class="card-body">
                   <div class="form-group">
@@ -223,7 +223,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-clock-o" aria-hidden="true"></i>
-                  Updates
+                  <span data-i18n="optionsUpdatesTitle"></span>
                 </div>
                 <div class="card-body">
                   <div class="help-block kphVersion">
@@ -265,7 +265,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-pencil" aria-hidden="true"></i>
-                  Advanced settings
+                  <span data-i18n="optionsAdvancedSettingsTitle"></span>
                 </div>
                 <div class="card-body">
                   <div class="form-group">
@@ -546,7 +546,7 @@
               <div class="card my-4 shadow">
                 <div class="card-header h6 rounded-0">
                   <i class="fa fa-desktop" aria-hidden="true"></i>
-                  Extension
+                  <span data-i18n="optionsExtensionTitle"></span>
                 </div>
                 <div class="card-body">
                   <p>