Merge remote-tracking branch 'origin/main' into auth/pm-8113/2fa-comp…

…s-ui-refresh

.github/workflows/build-browser.yml

@@ -200,22 +200,14 @@ jobs:
             npm_command: "dist:edge"
             archive_name: "dist-edge.zip"
             artifact_name: "dist-edge-MV3"
-          - name: "firefox"
-            npm_command: "dist:firefox"
-            archive_name: "dist-firefox.zip"
-            artifact_name: "dist-firefox"
           - name: "firefox-mv3"
             npm_command: "dist:firefox:mv3"
             archive_name: "dist-firefox.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-firefox-MV3"
-          - name: "opera"
-            npm_command: "dist:opera"
-            archive_name: "dist-opera.zip"
-            artifact_name: "dist-opera"
+            artifact_name: "dist-firefox-MV3"
           - name: "opera-mv3"
             npm_command: "dist:opera:mv3"
             archive_name: "dist-opera.zip"
-            artifact_name: "DO-NOT-USE-FOR-PROD-dist-opera-MV3"
+            artifact_name: "dist-opera-MV3"
     steps:
       - name: Check out repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/scan.yml

@@ -77,3 +77,4 @@ jobs:
             -Dsonar.sources=.
             -Dsonar.test.inclusions=**/*.spec.ts
             -Dsonar.exclusions=**/*.spec.ts
+            -Dsonar.pullrequest.key=${{ github.event.pull_request.number }}

apps/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2025.2.0",
+  "version": "2025.2.1",
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",

apps/browser/src/_locales/en/messages.json

@@ -2400,6 +2400,70 @@
   "autofillBlockedNoticeGuidance": {
     "message": "Change this in settings"
   },
+  "change": {
+    "message": "Change"
+  },
+  "changeButtonTitle": {
+    "message": "Change password - $ITEMNAME$",
+    "placeholders": {
+      "itemname": {
+        "content": "$1",
+        "example": "Secret Item"
+      }
+    }
+  },
+  "atRiskPasswords": {
+    "message": "At-risk passwords"
+  },
+  "atRiskPasswordsDescSingleOrg": {
+    "message": "$ORGANIZATION$ is requesting you change the $COUNT$ passwords because they are at risk.",
+    "placeholders": {
+      "organization": {
+        "content": "$1",
+        "example": "Acme Corp"
+      },
+      "count": {
+          "content": "$2",
+          "example": "2"
+      }
+    }
+  },
+  "atRiskPasswordsDescMultiOrg": {
+    "message": "Your organizations are requesting you change the $COUNT$ passwords because they are at risk.",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "reviewAndChangeAtRiskPassword": {
+    "message": "Review and change one at-risk password"
+  },
+  "reviewAndChangeAtRiskPasswordsPlural": {
+    "message": "Review and change $COUNT$ at-risk passwords",
+    "placeholders": {
+      "count": {
+        "content": "$1",
+        "example": "2"
+      }
+    }
+  },
+  "changeAtRiskPasswordsFaster": {
+    "message": "Change at-risk passwords faster"
+  },
+  "changeAtRiskPasswordsFasterDesc": {
+    "message": "Update your settings so you can quickly autofill your passwords and generate new ones"
+  },
+  "turnOnAutofill": {
+    "message": "Turn on autofill"
+  },
+  "turnedOnAutofill": {
+    "message": "Turned on autofill"
+  },
+  "dismiss": {
+    "message": "Dismiss"
+  },
   "websiteItemLabel": {
     "message": "Website $number$ (URI)",
     "placeholders": {

apps/browser/src/autofill/background/notification.background.spec.ts

@@ -825,6 +825,7 @@ describe("NotificationBackground", () => {
             queueMessage.newPassword,
             message.edit,
             sender.tab,
+            "testId",
           );
           expect(updateWithServerSpy).toHaveBeenCalled();
           expect(tabSendMessageSpy).toHaveBeenCalledWith(sender.tab, {
@@ -862,6 +863,7 @@ describe("NotificationBackground", () => {
             queueMessage.password,
             message.edit,
             sender.tab,
+            "testId",
           );
           expect(editItemSpy).not.toHaveBeenCalled();
           expect(createWithServerSpy).not.toHaveBeenCalled();
@@ -895,6 +897,7 @@ describe("NotificationBackground", () => {
             queueMessage.newPassword,
             message.edit,
             sender.tab,
+            "testId",
           );
           expect(editItemSpy).toHaveBeenCalled();
           expect(updateWithServerSpy).not.toHaveBeenCalled();
@@ -904,10 +907,13 @@ describe("NotificationBackground", () => {
           expect(tabSendMessageSpy).toHaveBeenCalledWith(sender.tab, {
             command: "editedCipher",
           });
-          expect(setAddEditCipherInfoSpy).toHaveBeenCalledWith({
-            cipher: cipherView,
-            collectionIds: cipherView.collectionIds,
-          });
+          expect(setAddEditCipherInfoSpy).toHaveBeenCalledWith(
+            {
+              cipher: cipherView,
+              collectionIds: cipherView.collectionIds,
+            },
+            "testId",
+          );
           expect(openAddEditVaultItemPopoutSpy).toHaveBeenCalledWith(sender.tab, {
             cipherId: cipherView.id,
           });
@@ -945,7 +951,7 @@ describe("NotificationBackground", () => {
             queueMessage,
             message.folder,
           );
-          expect(editItemSpy).toHaveBeenCalledWith(cipherView, sender.tab);
+          expect(editItemSpy).toHaveBeenCalledWith(cipherView, "testId", sender.tab);
           expect(tabSendMessageSpy).toHaveBeenCalledWith(sender.tab, {
             command: "closeNotificationBar",
           });