inline email message into markup

bitwarden · Dec 18, 2024 · 2ac259d · 2ac259d
1 parent 072c58f
commit 2ac259d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/...nts/new-device-verification-notice/new-device-verification-notice-page-one.component.html b/...nts/new-device-verification-notice/new-device-verification-notice-page-one.component.html
@@ -10,7 +10,9 @@
       'md:tw-flex md:tw-flex-col md:tw-items-center md:!tw-rounded-b-none': !isDesktop,
     }"
   >
-    <p bitTypography="body2" class="text-muted md:tw-w-9/12">{{ formMessage }}</p>
+    <p bitTypography="body2" class="text-muted md:tw-w-9/12">
+      {{ "newDeviceVerificationNoticePageOneFormContent" | i18n: this.currentEmail }}
+    </p>
 
     <bit-radio-group formControlName="hasEmailAccess" class="md:tw-w-9/12">
       <bit-radio-button id="option_A" [value]="0">

diff --git a/...nents/new-device-verification-notice/new-device-verification-notice-page-one.component.ts b/...nents/new-device-verification-notice/new-device-verification-notice-page-one.component.ts
@@ -7,7 +7,6 @@ import { firstValueFrom, Observable } from "rxjs";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ClientType } from "@bitwarden/common/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import {
@@ -38,17 +37,15 @@ import { NewDeviceVerificationNoticeService } from "./../../services/new-device-
   ],
 })
 export class NewDeviceVerificationNoticePageOneComponent implements OnInit {
-  protected formMessage: string | null = "";
   protected formGroup = this.formBuilder.group({
     hasEmailAccess: new FormControl(0),
   });
   protected isDesktop: boolean;
   readonly currentAcct$: Observable<Account | null> = this.accountService.activeAccount$;
-  private currentEmail: string = "";
+  protected currentEmail: string = "";
   private currentUserId: UserId | null = null;
 
   constructor(
-    private i18nService: I18nService,
     private formBuilder: FormBuilder,
     private router: Router,
     private accountService: AccountService,
@@ -65,10 +62,6 @@ export class NewDeviceVerificationNoticePageOneComponent implements OnInit {
     }
     this.currentEmail = currentAcct.email;
     this.currentUserId = currentAcct.id;
-    this.formMessage = this.i18nService.t(
-      "newDeviceVerificationNoticePageOneFormContent",
-      this.currentEmail,
-    );
   }
 
   submit = async () => {