Merge main and add satisfies RouteDataProperties

apps/browser/src/popup/app-routing.module.ts

@@ -26,6 +26,7 @@ import {
   RegistrationStartSecondaryComponentData,
   SetPasswordJitComponent,
   UserLockIcon,
+  VaultIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
@@ -162,12 +163,6 @@ const routes: Routes = [
     canActivate: [fido2AuthGuard],
     data: { state: "fido2" } satisfies RouteDataProperties,
   }),
-  {
-    path: "login",
-    component: LoginComponent,
-    canActivate: [unauthGuardFn(unauthRouteOverrides)],
-    data: { state: "login" } satisfies RouteDataProperties,
-  },
   {
     path: "login-with-device",
     component: LoginViaAuthRequestComponent,
@@ -456,9 +451,11 @@ const routes: Routes = [
           path: "login",
           canActivate: [unauthGuardFn(unauthRouteOverrides)],
           data: {
+            pageIcon: VaultIcon,
             pageTitle: "logInToBitwarden",
             state: "login",
-          }, // TODO-rr-bw: add `satisfies DataProperties & ExtensionAnonLayoutWrapperData}
+            showAcctSwitcher: true,
+          } satisfies RouteDataProperties & ExtensionAnonLayoutWrapperData,
           children: [
             { path: "", component: LoginComponent },
             { path: "", component: LoginSecondaryContentComponent, outlet: "secondary" },

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

@@ -60,6 +60,9 @@
       }
     }
   },
+  "welcomeBack": {
+    "message": "Welcome back"
+  },
   "moveToOrgDesc": {
     "message": "Choose an organization that you wish to move this item to. Moving to an organization transfers ownership of the item to that organization. You will no longer be the direct owner of this item once it has been moved."
   },

apps/web/src/app/oss-routing.module.ts

@@ -201,7 +201,7 @@ const routes: Routes = [
       canActivate: [unauthGuardFn()],
       data: {
         pageTitle: "logInToBitwarden",
-      } satisfies DataProperties & AnonLayoutWrapperData,
+      } satisfies RouteDataProperties & AnonLayoutWrapperData,
       children: [
         {
           path: "",