Merge branch 'main' into autofill/pm-8833-implement-on-page-autofill-menu-for-password-generation

apps/desktop/src/app/accounts/settings.component.html

@@ -382,7 +382,7 @@
                   </label>
                 </div>
                 <small id="enableBrowserIntegrationHelp" class="help-block">{{
-                  "enableBrowserIntegrationDesc" | i18n
+                  "enableBrowserIntegrationDesc1" | i18n
                 }}</small>
               </div>
               <div class="form-group">

apps/desktop/src/locales/en/messages.json

@@ -1775,8 +1775,8 @@
   "enableBrowserIntegration": {
     "message": "Allow browser integration"
   },
-  "enableBrowserIntegrationDesc": {
-    "message": "Used for biometrics in browser."
+  "enableBrowserIntegrationDesc1": {
+    "message": "Used to allow biometric unlock in browsers that are not Safari."
   },
   "enableDuckDuckGoBrowserIntegration": {
     "message": "Allow DuckDuckGo browser integration"

libs/angular/src/admin-console/components/collections.component.ts

@@ -72,7 +72,7 @@ export class CollectionsComponent implements OnInit {
         if (this.organization.canEditAllCiphers) {
           return !!(c as any).checked;
         } else {
-          return !!(c as any).checked && c.readOnly == null;
+          return !!(c as any).checked && !c.readOnly;
         }
       })
       .map((c) => c.id);