Fixed merge conflicts

.github/CODEOWNERS

@@ -126,6 +126,7 @@ apps/web/src/app/key-management @bitwarden/team-key-management-dev
 apps/browser/src/key-management @bitwarden/team-key-management-dev
 apps/cli/src/key-management @bitwarden/team-key-management-dev
 libs/key-management @bitwarden/team-key-management-dev
+libs/common/src/key-management @bitwarden/team-key-management-dev
 
 apps/desktop/destkop_native/core/src/biometric/ @bitwarden/team-key-management-dev
 apps/desktop/src/services/native-messaging.service.ts @bitwarden/team-key-management-dev

.github/renovate.json

@@ -75,10 +75,12 @@
     },
     {
       "matchPackageNames": [
+        "@emotion/css",
         "@webcomponents/custom-elements",
         "concurrently",
         "cross-env",
         "del",
+        "lit",
         "nord",
         "patch-package",
         "prettier",
@@ -102,6 +104,8 @@
       "matchPackageNames": [
         "@babel/core",
         "@babel/preset-env",
+        "@bitwarden/sdk-internal",
+        "@electron/fuses",
         "@electron/notarize",
         "@electron/rebuild",
         "@ngtools/webpack",
@@ -113,7 +117,7 @@
         "@types/node",
         "@types/node-forge",
         "@types/node-ipc",
-        "@yao-pkg",
+        "@yao-pkg/pkg",
         "babel-loader",
         "browserslist",
         "copy-webpack-plugin",
@@ -133,6 +137,7 @@
         "tsconfig-paths-webpack-plugin",
         "type-fest",
         "typescript",
+        "typescript-strict-plugin",
         "webpack",
         "webpack-cli",
         "webpack-dev-server",
@@ -149,21 +154,25 @@
         "@angular/cdk",
         "@angular/cli",
         "@angular/common",
-        "@angular/compiler",
         "@angular/compiler-cli",
+        "@angular/compiler",
         "@angular/core",
         "@angular/forms",
+        "@angular/platform-browser-dynamic",
+        "@angular/platform-browser",
         "@angular/platform",
-        "@angular/compiler",
         "@angular/router",
         "@compodoc/compodoc",
         "@ng-select/ng-select",
         "@storybook/addon-a11y",
         "@storybook/addon-actions",
         "@storybook/addon-designs",
         "@storybook/addon-essentials",
+        "@storybook/addon-interactions",
         "@storybook/addon-links",
         "@storybook/angular",
+        "@storybook/manager-api",
+        "@storybook/theming",
         "@types/react",
         "autoprefixer",
         "bootstrap",
@@ -186,7 +195,9 @@
       "matchPackageNames": [
         "@angular-eslint/eslint-plugin",
         "@angular-eslint/eslint-plugin-template",
+        "@angular-eslint/schematics",
         "@angular-eslint/template-parser",
+        "@angular/elements",
         "@types/jest",
         "@typescript-eslint/eslint-plugin",
         "@typescript-eslint/parser",
@@ -199,6 +210,7 @@
         "eslint-plugin-storybook",
         "eslint-plugin-tailwindcss",
         "husky",
+        "jest-extended",
         "jest-junit",
         "jest-mock-extended",
         "jest-preset-angular",

.github/workflows/build-desktop.yml

@@ -1196,6 +1196,8 @@ jobs:
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           channel-id: C074F5UESQ0
+          method: chat.postMessage
+          token: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           payload: |
             {
               "blocks": [
@@ -1209,7 +1211,6 @@ jobs:
               ]
             }
         env:
-          SLACK_BOT_TOKEN: ${{ steps.retrieve-slack-secret.outputs.slack-bot-token }}
           BUILD_NUMBER: ${{ needs.setup.outputs.build_number }}