Add eslint (#1369)

src/app/accounts/environment.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { EnvironmentComponent as BaseEnvironmentComponent } from "jslib-angular/components/environment.component";
-
 @Component({
   selector: "app-environment",
   templateUrl: "environment.component.html",

src/app/accounts/hint.component.ts

@@ -1,13 +1,12 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
+import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { HintComponent as BaseHintComponent } from "jslib-angular/components/hint.component";
-
 @Component({
   selector: "app-hint",
   templateUrl: "hint.component.html",

src/app/accounts/lock.component.ts

@@ -2,6 +2,7 @@ import { Component, NgZone, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { ipcRenderer } from "electron";
 
+import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
@@ -14,8 +15,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { StateService } from "jslib-common/abstractions/state.service";
 import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
 
-import { LockComponent as BaseLockComponent } from "jslib-angular/components/lock.component";
-
 const BroadcasterSubscriptionId = "LockComponent";
 
 @Component({

src/app/accounts/login.component.ts

@@ -1,9 +1,8 @@
 import { Component, NgZone, OnDestroy, ViewChild, ViewContainerRef } from "@angular/core";
-
 import { Router } from "@angular/router";
 
-import { EnvironmentComponent } from "./environment.component";
-
+import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
+import { ModalService } from "jslib-angular/services/modal.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
@@ -16,9 +15,7 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 
-import { ModalService } from "jslib-angular/services/modal.service";
-
-import { LoginComponent as BaseLoginComponent } from "jslib-angular/components/login.component";
+import { EnvironmentComponent } from "./environment.component";
 
 const BroadcasterSubscriptionId = "LoginComponent";
 
@@ -32,7 +29,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy {
 
   showingModal = false;
 
-  protected alwaysRememberEmail: boolean = true;
+  protected alwaysRememberEmail = true;
 
   private deferFocus: boolean = null;
 

src/app/accounts/premium.component.ts

@@ -1,13 +1,12 @@
 import { Component } from "@angular/core";
 
+import { PremiumComponent as BasePremiumComponent } from "jslib-angular/components/premium.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { PremiumComponent as BasePremiumComponent } from "jslib-angular/components/premium.component";
-
 @Component({
   selector: "app-premium",
   templateUrl: "premium.component.html",

src/app/accounts/register.component.ts

@@ -1,6 +1,7 @@
 import { Component, NgZone, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 
+import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
@@ -12,8 +13,6 @@ import { PasswordGenerationService } from "jslib-common/abstractions/passwordGen
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { RegisterComponent as BaseRegisterComponent } from "jslib-angular/components/register.component";
-
 const BroadcasterSubscriptionId = "RegisterComponent";
 
 @Component({

src/app/accounts/set-password.component.ts

@@ -1,7 +1,7 @@
 import { Component, NgZone, OnDestroy } from "@angular/core";
-
 import { ActivatedRoute, Router } from "@angular/router";
 
+import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
@@ -15,8 +15,6 @@ import { SyncService } from "jslib-common/abstractions/sync.service";
 
 const BroadcasterSubscriptionId = "SetPasswordComponent";
 
-import { SetPasswordComponent as BaseSetPasswordComponent } from "jslib-angular/components/set-password.component";
-
 @Component({
   selector: "app-set-password",
   templateUrl: "set-password.component.html",

src/app/accounts/settings.component.ts

@@ -2,24 +2,20 @@ import { Component, OnInit } from "@angular/core";
 import { FormControl } from "@angular/forms";
 import { debounceTime } from "rxjs/operators";
 
-import { DeviceType } from "jslib-common/enums/deviceType";
-import { ThemeType } from "jslib-common/enums/themeType";
-
+import { ModalService } from "jslib-angular/services/modal.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-
-import { SetPinComponent } from "../components/set-pin.component";
-
+import { DeviceType } from "jslib-common/enums/deviceType";
+import { StorageLocation } from "jslib-common/enums/storageLocation";
+import { ThemeType } from "jslib-common/enums/themeType";
 import { Utils } from "jslib-common/misc/utils";
 import { isWindowsStore } from "jslib-electron/utils";
 
-import { StorageLocation } from "jslib-common/enums/storageLocation";
+import { SetPinComponent } from "../components/set-pin.component";
 
 @Component({
   selector: "app-settings",
@@ -28,15 +24,15 @@ import { StorageLocation } from "jslib-common/enums/storageLocation";
 export class SettingsComponent implements OnInit {
   vaultTimeoutAction: string;
   pin: boolean = null;
-  disableFavicons: boolean = false;
-  enableBrowserIntegration: boolean = false;
-  enableBrowserIntegrationFingerprint: boolean = false;
-  enableMinToTray: boolean = false;
-  enableCloseToTray: boolean = false;
-  enableTray: boolean = false;
-  showMinToTray: boolean = false;
-  startToTray: boolean = false;
-  minimizeOnCopyToClipboard: boolean = false;
+  disableFavicons = false;
+  enableBrowserIntegration = false;
+  enableBrowserIntegrationFingerprint = false;
+  enableMinToTray = false;
+  enableCloseToTray = false;
+  enableTray = false;
+  showMinToTray = false;
+  startToTray = false;
+  minimizeOnCopyToClipboard = false;
   locale: string;
   vaultTimeouts: any[];
   localeOptions: any[];
@@ -50,9 +46,9 @@ export class SettingsComponent implements OnInit {
   noAutoPromptBiometrics: boolean;
   noAutoPromptBiometricsText: string;
   alwaysShowDock: boolean;
-  showAlwaysShowDock: boolean = false;
+  showAlwaysShowDock = false;
   openAtLogin: boolean;
-  requireEnableTray: boolean = false;
+  requireEnableTray = false;
 
   enableTrayText: string;
   enableTrayDescText: string;
@@ -65,9 +61,9 @@ export class SettingsComponent implements OnInit {
 
   vaultTimeout: FormControl = new FormControl(null);
 
-  showSecurity: boolean = true;
-  showAccountPreferences: boolean = true;
-  showAppPreferences: boolean = true;
+  showSecurity = true;
+  showAccountPreferences = true;
+  showAppPreferences = true;
 
   currentUserEmail: string;
 

src/app/accounts/sso.component.ts

@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
-
 import { ActivatedRoute, Router } from "@angular/router";
 
+import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
@@ -13,8 +13,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 
-import { SsoComponent as BaseSsoComponent } from "jslib-angular/components/sso.component";
-
 @Component({
   selector: "app-sso",
   templateUrl: "sso.component.html",

src/app/accounts/two-factor-options.component.ts

@@ -1,12 +1,11 @@
 import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
+import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
 
-import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "jslib-angular/components/two-factor-options.component";
-
 @Component({
   selector: "app-two-factor-options",
   templateUrl: "two-factor-options.component.html",

src/app/accounts/two-factor.component.ts

@@ -1,11 +1,8 @@
 import { Component, ViewChild, ViewContainerRef } from "@angular/core";
-
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { TwoFactorOptionsComponent } from "./two-factor-options.component";
-
-import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
-
+import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component";
+import { ModalService } from "jslib-angular/services/modal.service";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
@@ -15,10 +12,9 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
+import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
 
-import { ModalService } from "jslib-angular/services/modal.service";
-
-import { TwoFactorComponent as BaseTwoFactorComponent } from "jslib-angular/components/two-factor.component";
+import { TwoFactorOptionsComponent } from "./two-factor-options.component";
 
 @Component({
   selector: "app-two-factor",

src/app/accounts/update-temp-password.component.ts

@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";
 
+import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -11,8 +12,6 @@ import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { SyncService } from "jslib-common/abstractions/sync.service";
 
-import { UpdateTempPasswordComponent as BaseUpdateTempPasswordComponent } from "jslib-angular/components/update-temp-password.component";
-
 interface MasterPasswordScore {
   Color: string;
   Text: string;

src/app/app-routing.module.ts

@@ -3,6 +3,7 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
 import { LockGuardService } from "jslib-angular/services/lock-guard.service";
+
 import { LoginGuardService } from "../services/loginGuard.service";
 
 import { HintComponent } from "./accounts/hint.component";
@@ -14,9 +15,7 @@ import { SetPasswordComponent } from "./accounts/set-password.component";
 import { SsoComponent } from "./accounts/sso.component";
 import { TwoFactorComponent } from "./accounts/two-factor.component";
 import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
-
 import { SendComponent } from "./send/send.component";
-
 import { VaultComponent } from "./vault/vault.component";
 
 const routes: Routes = [

src/app/app.component.ts

@@ -11,10 +11,8 @@ import { DomSanitizer } from "@angular/platform-browser";
 import { Router } from "@angular/router";
 import { IndividualConfig, ToastrService } from "ngx-toastr";
 
-import { PremiumComponent } from "./accounts/premium.component";
-import { SettingsComponent } from "./accounts/settings.component";
-import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component";
-
+import { ModalRef } from "jslib-angular/components/modal/modal.ref";
+import { ModalService } from "jslib-angular/services/modal.service";
 import { AuthService } from "jslib-common/abstractions/auth.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
@@ -37,18 +35,17 @@ import { SyncService } from "jslib-common/abstractions/sync.service";
 import { SystemService } from "jslib-common/abstractions/system.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
 import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
-
 import { CipherType } from "jslib-common/enums/cipherType";
 
+import { MenuUpdateRequest } from "src/main/menu.updater";
+
+import { PremiumComponent } from "./accounts/premium.component";
+import { SettingsComponent } from "./accounts/settings.component";
 import { ExportComponent } from "./vault/export.component";
 import { FolderAddEditComponent } from "./vault/folder-add-edit.component";
+import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component";
 import { PasswordGeneratorComponent } from "./vault/password-generator.component";
 
-import { ModalRef } from "jslib-angular/components/modal/modal.ref";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-import { MenuUpdateRequest } from "src/main/menu.updater";
-
 const BroadcasterSubscriptionId = "AppComponent";
 const IdleTimeout = 60000 * 10; // 10 minutes
 const SyncInterval = 6 * 60 * 60 * 1000; // 6 hours
@@ -208,7 +205,7 @@ export class AppComponent implements OnInit {
           case "openPremium":
             await this.openModal<PremiumComponent>(PremiumComponent, this.premiumRef);
             break;
-          case "showFingerprintPhrase":
+          case "showFingerprintPhrase": {
             const fingerprint = await this.cryptoService.getFingerprint(
               await this.stateService.getUserId()
             );
@@ -222,6 +219,7 @@ export class AppComponent implements OnInit {
               this.platformUtilsService.launchUri("https://bitwarden.com/help/fingerprint-phrase/");
             }
             break;
+          }
           case "openPasswordHistory":
             await this.openModal<PasswordGeneratorHistoryComponent>(
               PasswordGeneratorHistoryComponent,
@@ -241,7 +239,7 @@ export class AppComponent implements OnInit {
               queryParams: { code: message.code, state: message.state },
             });
             break;
-          case "premiumRequired":
+          case "premiumRequired": {
             const premiumConfirmed = await this.platformUtilsService.showDialog(
               this.i18nService.t("premiumRequiredDesc"),
               this.i18nService.t("premiumRequired"),
@@ -252,7 +250,8 @@ export class AppComponent implements OnInit {
               await this.openModal<PremiumComponent>(PremiumComponent, this.premiumRef);
             }
             break;
-          case "emailVerificationRequired":
+          }
+          case "emailVerificationRequired": {
             const emailVerificationConfirmed = await this.platformUtilsService.showDialog(
               this.i18nService.t("emailVerificationRequiredDesc"),
               this.i18nService.t("emailVerificationRequired"),
@@ -265,6 +264,7 @@ export class AppComponent implements OnInit {
               );
             }
             break;
+          }
           case "syncVault":
             try {
               await this.syncService.fullSync(true, true);
@@ -326,7 +326,7 @@ export class AppComponent implements OnInit {
           case "convertAccountToKeyConnector":
             this.router.navigate(["/remove-password"]);
             break;
-          case "switchAccount":
+          case "switchAccount": {
             if (message.userId != null) {
               await this.stateService.setActiveUser(message.userId);
             }
@@ -341,12 +341,16 @@ export class AppComponent implements OnInit {
               this.router.navigate(["vault"]);
             }
             break;
+          }
           case "systemSuspended":
             await this.checkForSystemTimeout(systemTimeoutOptions.onSuspend);
+            break;
           case "systemLocked":
             await this.checkForSystemTimeout(systemTimeoutOptions.onLock);
+            break;
           case "systemIdle":
             await this.checkForSystemTimeout(systemTimeoutOptions.onIdle);
+            break;
         }
       });
     });

src/app/app.module.ts

@@ -4,85 +4,7 @@ import { A11yModule } from "@angular/cdk/a11y";
 import { DragDropModule } from "@angular/cdk/drag-drop";
 import { OverlayModule } from "@angular/cdk/overlay";
 import { ScrollingModule } from "@angular/cdk/scrolling";
-import { DatePipe } from "@angular/common";
-import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { BrowserModule } from "@angular/platform-browser";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import "zone.js/dist/zone";
-
-import { AppRoutingModule } from "./app-routing.module";
-import { ServicesModule } from "./services.module";
-
-import { AppComponent } from "./app.component";
-
-import { EnvironmentComponent } from "./accounts/environment.component";
-import { HintComponent } from "./accounts/hint.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginComponent } from "./accounts/login.component";
-import { PremiumComponent } from "./accounts/premium.component";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
-import { SettingsComponent } from "./accounts/settings.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
-import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component";
-
-import { AvatarComponent } from "jslib-angular/components/avatar.component";
-import { CalloutComponent } from "jslib-angular/components/callout.component";
-import { IconComponent } from "jslib-angular/components/icon.component";
-import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
-
-import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
-import { ApiActionDirective } from "jslib-angular/directives/api-action.directive";
-import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive";
-import { BlurClickDirective } from "jslib-angular/directives/blur-click.directive";
-import { BoxRowDirective } from "jslib-angular/directives/box-row.directive";
-import { CipherListVirtualScroll } from "jslib-angular/directives/cipherListVirtualScroll.directive";
-import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive";
-import { InputVerbatimDirective } from "jslib-angular/directives/input-verbatim.directive";
-import { SelectCopyDirective } from "jslib-angular/directives/select-copy.directive";
-import { StopClickDirective } from "jslib-angular/directives/stop-click.directive";
-import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive";
-import { TrueFalseValueDirective } from "jslib-angular/directives/true-false-value.directive";
-
-import { ColorPasswordPipe } from "jslib-angular/pipes/color-password.pipe";
-import { I18nPipe } from "jslib-angular/pipes/i18n.pipe";
-import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe";
-
-import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component";
-import { AddEditComponent } from "./vault/add-edit.component";
-import { AttachmentsComponent } from "./vault/attachments.component";
-import { CiphersComponent } from "./vault/ciphers.component";
-import { CollectionsComponent } from "./vault/collections.component";
-import { ExportComponent } from "./vault/export.component";
-import { FolderAddEditComponent } from "./vault/folder-add-edit.component";
-import { GroupingsComponent } from "./vault/groupings.component";
-import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component";
-import { PasswordGeneratorComponent } from "./vault/password-generator.component";
-import { PasswordHistoryComponent } from "./vault/password-history.component";
-import { ShareComponent } from "./vault/share.component";
-import { VaultComponent } from "./vault/vault.component";
-import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component";
-import { ViewComponent } from "./vault/view.component";
-
-import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.component";
-import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
-import { SendComponent } from "./send/send.component";
-
-import { AccountSwitcherComponent } from "./layout/account-switcher.component";
-import { HeaderComponent } from "./layout/header.component";
-import { NavComponent } from "./layout/nav.component";
-import { SearchComponent } from "./layout/search/search.component";
-
-import { PasswordRepromptComponent } from "./components/password-reprompt.component";
-import { SetPinComponent } from "./components/set-pin.component";
-import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component";
-
-import { registerLocaleData } from "@angular/common";
+import { DatePipe, registerLocaleData } from "@angular/common";
 import localeAf from "@angular/common/locales/af";
 import localeAz from "@angular/common/locales/az";
 import localeBe from "@angular/common/locales/be";
@@ -127,6 +49,73 @@ import localeUk from "@angular/common/locales/uk";
 import localeVi from "@angular/common/locales/vi";
 import localeZhCn from "@angular/common/locales/zh-Hans";
 import localeZhTw from "@angular/common/locales/zh-Hant";
+import { NgModule } from "@angular/core";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { BrowserModule } from "@angular/platform-browser";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+
+import { AvatarComponent } from "jslib-angular/components/avatar.component";
+import { CalloutComponent } from "jslib-angular/components/callout.component";
+import { IconComponent } from "jslib-angular/components/icon.component";
+import { BitwardenToastModule } from "jslib-angular/components/toastr.component";
+import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive";
+import { ApiActionDirective } from "jslib-angular/directives/api-action.directive";
+import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive";
+import { BlurClickDirective } from "jslib-angular/directives/blur-click.directive";
+import { BoxRowDirective } from "jslib-angular/directives/box-row.directive";
+import { CipherListVirtualScroll } from "jslib-angular/directives/cipherListVirtualScroll.directive";
+import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive";
+import { InputVerbatimDirective } from "jslib-angular/directives/input-verbatim.directive";
+import { SelectCopyDirective } from "jslib-angular/directives/select-copy.directive";
+import { StopClickDirective } from "jslib-angular/directives/stop-click.directive";
+import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive";
+import { TrueFalseValueDirective } from "jslib-angular/directives/true-false-value.directive";
+import { ColorPasswordPipe } from "jslib-angular/pipes/color-password.pipe";
+import { I18nPipe } from "jslib-angular/pipes/i18n.pipe";
+import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe";
+
+import { EnvironmentComponent } from "./accounts/environment.component";
+import { HintComponent } from "./accounts/hint.component";
+import { LockComponent } from "./accounts/lock.component";
+import { LoginComponent } from "./accounts/login.component";
+import { PremiumComponent } from "./accounts/premium.component";
+import { RegisterComponent } from "./accounts/register.component";
+import { RemovePasswordComponent } from "./accounts/remove-password.component";
+import { SetPasswordComponent } from "./accounts/set-password.component";
+import { SettingsComponent } from "./accounts/settings.component";
+import { SsoComponent } from "./accounts/sso.component";
+import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
+import { TwoFactorComponent } from "./accounts/two-factor.component";
+import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
+import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component";
+import { AppRoutingModule } from "./app-routing.module";
+import { AppComponent } from "./app.component";
+import { PasswordRepromptComponent } from "./components/password-reprompt.component";
+import { SetPinComponent } from "./components/set-pin.component";
+import { VerifyMasterPasswordComponent } from "./components/verify-master-password.component";
+import { AccountSwitcherComponent } from "./layout/account-switcher.component";
+import { HeaderComponent } from "./layout/header.component";
+import { NavComponent } from "./layout/nav.component";
+import { SearchComponent } from "./layout/search/search.component";
+import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.component";
+import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
+import { SendComponent } from "./send/send.component";
+import { ServicesModule } from "./services.module";
+import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component";
+import { AddEditComponent } from "./vault/add-edit.component";
+import { AttachmentsComponent } from "./vault/attachments.component";
+import { CiphersComponent } from "./vault/ciphers.component";
+import { CollectionsComponent } from "./vault/collections.component";
+import { ExportComponent } from "./vault/export.component";
+import { FolderAddEditComponent } from "./vault/folder-add-edit.component";
+import { GroupingsComponent } from "./vault/groupings.component";
+import { PasswordGeneratorHistoryComponent } from "./vault/password-generator-history.component";
+import { PasswordGeneratorComponent } from "./vault/password-generator.component";
+import { PasswordHistoryComponent } from "./vault/password-history.component";
+import { ShareComponent } from "./vault/share.component";
+import { VaultComponent } from "./vault/vault.component";
+import { ViewCustomFieldsComponent } from "./vault/view-custom-fields.component";
+import { ViewComponent } from "./vault/view.component";
 
 registerLocaleData(localeAf, "af");
 registerLocaleData(localeAz, "az");

src/app/layout/account-switcher.component.ts

@@ -5,10 +5,8 @@ import { Component, OnInit } from "@angular/core";
 import { MessagingService } from "jslib-common/abstractions/messaging.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 import { VaultTimeoutService } from "jslib-common/abstractions/vaultTimeout.service";
-
 import { AuthenticationStatus } from "jslib-common/enums/authenticationStatus";
 import { Utils } from "jslib-common/misc/utils";
-
 import { Account } from "jslib-common/models/domain/account";
 
 export class SwitcherAccount extends Account {
@@ -51,7 +49,7 @@ export class SwitcherAccount extends Account {
   ],
 })
 export class AccountSwitcherComponent implements OnInit {
-  isOpen: boolean = false;
+  isOpen = false;
   accounts: { [userId: string]: SwitcherAccount } = {};
   activeAccountEmail: string;
   serverUrl: string;

src/app/layout/nav.component.ts

@@ -1,4 +1,5 @@
 import { Component } from "@angular/core";
+
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 
 @Component({

src/app/send/add-edit.component.ts

@@ -1,7 +1,7 @@
 import { DatePipe } from "@angular/common";
-
 import { Component } from "@angular/core";
 
+import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/send/add-edit.component";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
@@ -11,8 +11,6 @@ import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { SendService } from "jslib-common/abstractions/send.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/send/add-edit.component";
-
 @Component({
   selector: "app-send-add-edit",
   templateUrl: "add-edit.component.html",

src/app/send/efflux-dates.component.ts

@@ -1,14 +1,11 @@
 import { DatePipe } from "@angular/common";
-
 import { Component, OnChanges } from "@angular/core";
-
 import { ControlContainer, NgForm } from "@angular/forms";
 
+import { EffluxDatesComponent as BaseEffluxDatesComponent } from "jslib-angular/components/send/efflux-dates.component";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { EffluxDatesComponent as BaseEffluxDatesComponent } from "jslib-angular/components/send/efflux-dates.component";
-
 @Component({
   selector: "app-send-efflux-dates",
   templateUrl: "efflux-dates.component.html",

src/app/send/send.component.ts

@@ -1,5 +1,6 @@
 import { Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core";
 
+import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { EnvironmentService } from "jslib-common/abstractions/environment.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -8,14 +9,11 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { SearchService } from "jslib-common/abstractions/search.service";
 import { SendService } from "jslib-common/abstractions/send.service";
-
-import { SendComponent as BaseSendComponent } from "jslib-angular/components/send/send.component";
-
+import { SendView } from "jslib-common/models/view/sendView";
 import { invokeMenu, RendererMenuItem } from "jslib-electron/utils";
 
-import { SendView } from "jslib-common/models/view/sendView";
-
 import { SearchBarService } from "../layout/search/search-bar.service";
+
 import { AddEditComponent } from "./add-edit.component";
 
 enum Action {

src/app/services.module.ts

@@ -1,28 +1,6 @@
 import { APP_INITIALIZER, NgModule } from "@angular/core";
 
-import { ElectronLogService } from "jslib-electron/services/electronLog.service";
-import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service";
-import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service";
-import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service";
-import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service";
-
-import { I18nService } from "../services/i18n.service";
-import { LoginGuardService } from "../services/loginGuard.service";
-import { NativeMessagingService } from "../services/nativeMessaging.service";
-import { PasswordRepromptService } from "../services/passwordReprompt.service";
-import { StateService } from "../services/state.service";
-
-import { SearchBarService } from "./layout/search/search-bar.service";
-
 import { JslibServicesModule } from "jslib-angular/services/jslib-services.module";
-
-import { ContainerService } from "jslib-common/services/container.service";
-import { EventService } from "jslib-common/services/event.service";
-import { SystemService } from "jslib-common/services/system.service";
-import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service";
-
-import { ElectronCryptoService } from "jslib-electron/services/electronCrypto.service";
-
 import { BroadcasterService as BroadcasterServiceAbstraction } from "jslib-common/abstractions/broadcaster.service";
 import { CryptoService as CryptoServiceAbstraction } from "jslib-common/abstractions/crypto.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "jslib-common/abstractions/cryptoFunction.service";
@@ -41,15 +19,29 @@ import { SyncService as SyncServiceAbstraction } from "jslib-common/abstractions
 import { SystemService as SystemServiceAbstraction } from "jslib-common/abstractions/system.service";
 import { TwoFactorService as TwoFactorServiceAbstraction } from "jslib-common/abstractions/twoFactor.service";
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "jslib-common/abstractions/vaultTimeout.service";
-
 import { ThemeType } from "jslib-common/enums/themeType";
+import { StateFactory } from "jslib-common/factories/stateFactory";
+import { GlobalState } from "jslib-common/models/domain/globalState";
+import { ContainerService } from "jslib-common/services/container.service";
+import { EventService } from "jslib-common/services/event.service";
+import { StateMigrationService } from "jslib-common/services/stateMigration.service";
+import { SystemService } from "jslib-common/services/system.service";
+import { VaultTimeoutService } from "jslib-common/services/vaultTimeout.service";
+import { ElectronCryptoService } from "jslib-electron/services/electronCrypto.service";
+import { ElectronLogService } from "jslib-electron/services/electronLog.service";
+import { ElectronPlatformUtilsService } from "jslib-electron/services/electronPlatformUtils.service";
+import { ElectronRendererMessagingService } from "jslib-electron/services/electronRendererMessaging.service";
+import { ElectronRendererSecureStorageService } from "jslib-electron/services/electronRendererSecureStorage.service";
+import { ElectronRendererStorageService } from "jslib-electron/services/electronRendererStorage.service";
 
 import { Account } from "../models/account";
+import { I18nService } from "../services/i18n.service";
+import { LoginGuardService } from "../services/loginGuard.service";
+import { NativeMessagingService } from "../services/nativeMessaging.service";
+import { PasswordRepromptService } from "../services/passwordReprompt.service";
+import { StateService } from "../services/state.service";
 
-import { GlobalState } from "jslib-common/models/domain/globalState";
-
-import { StateFactory } from "jslib-common/factories/stateFactory";
-import { StateMigrationService } from "jslib-common/services/stateMigration.service";
+import { SearchBarService } from "./layout/search/search-bar.service";
 
 export function initFactory(
   window: Window,
@@ -64,7 +56,7 @@ export function initFactory(
   stateService: StateServiceAbstraction,
   cryptoService: CryptoServiceAbstraction,
   nativeMessagingService: NativeMessagingService
-): Function {
+): () => Promise<void> {
   return async () => {
     nativeMessagingService.init();
     await stateService.init();

src/app/vault/add-edit-custom-fields.component.ts

@@ -1,7 +1,6 @@
 import { Component } from "@angular/core";
 
 import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "jslib-angular/components/add-edit-custom-fields.component";
-
 import { EventService } from "jslib-common/abstractions/event.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 

src/app/vault/add-edit.component.ts

@@ -1,6 +1,7 @@
 import { Component, NgZone, OnChanges, OnDestroy, ViewChild } from "@angular/core";
 import { NgForm } from "@angular/forms";
 
+import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/add-edit.component";
 import { AuditService } from "jslib-common/abstractions/audit.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
@@ -16,8 +17,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { AddEditComponent as BaseAddEditComponent } from "jslib-angular/components/add-edit.component";
-
 const BroadcasterSubscriptionId = "AddEditComponent";
 
 @Component({

src/app/vault/attachments.component.ts

@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";
 
+import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
@@ -8,8 +9,6 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { AttachmentsComponent as BaseAttachmentsComponent } from "jslib-angular/components/attachments.component";
-
 @Component({
   selector: "app-vault-attachments",
   templateUrl: "attachments.component.html",

src/app/vault/ciphers.component.ts

@@ -2,7 +2,6 @@ import { Component } from "@angular/core";
 
 import { CiphersComponent as BaseCiphersComponent } from "jslib-angular/components/ciphers.component";
 import { SearchService } from "jslib-common/abstractions/search.service";
-
 import { CipherView } from "jslib-common/models/view/cipherView";
 
 import { SearchBarService } from "../layout/search/search-bar.service";

src/app/vault/collections.component.ts

@@ -1,13 +1,12 @@
 import { Component } from "@angular/core";
 
+import { CollectionsComponent as BaseCollectionsComponent } from "jslib-angular/components/collections.component";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
 import { CollectionService } from "jslib-common/abstractions/collection.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { CollectionsComponent as BaseCollectionsComponent } from "jslib-angular/components/collections.component";
-
 @Component({
   selector: "app-vault-collections",
   templateUrl: "collections.component.html",

src/app/vault/export.component.ts

@@ -1,8 +1,9 @@
+import * as os from "os";
+
 import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 
-import * as os from "os";
-
+import { ExportComponent as BaseExportComponent } from "jslib-angular/components/export.component";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
 import { CryptoService } from "jslib-common/abstractions/crypto.service";
 import { EventService } from "jslib-common/abstractions/event.service";
@@ -13,8 +14,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { PolicyService } from "jslib-common/abstractions/policy.service";
 import { UserVerificationService } from "jslib-common/abstractions/userVerification.service";
 
-import { ExportComponent as BaseExportComponent } from "jslib-angular/components/export.component";
-
 const BroadcasterSubscriptionId = "ExportComponent";
 
 @Component({

src/app/vault/folder-add-edit.component.ts

@@ -1,12 +1,11 @@
 import { Component } from "@angular/core";
 
+import { FolderAddEditComponent as BaseFolderAddEditComponent } from "jslib-angular/components/folder-add-edit.component";
 import { FolderService } from "jslib-common/abstractions/folder.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { LogService } from "jslib-common/abstractions/log.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { FolderAddEditComponent as BaseFolderAddEditComponent } from "jslib-angular/components/folder-add-edit.component";
-
 @Component({
   selector: "app-folder-add-edit",
   templateUrl: "folder-add-edit.component.html",

src/app/vault/groupings.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { GroupingsComponent as BaseGroupingsComponent } from "jslib-angular/components/groupings.component";
 import { CollectionService } from "jslib-common/abstractions/collection.service";
 import { FolderService } from "jslib-common/abstractions/folder.service";
 import { StateService } from "jslib-common/abstractions/state.service";
 
-import { GroupingsComponent as BaseGroupingsComponent } from "jslib-angular/components/groupings.component";
-
 @Component({
   selector: "app-vault-groupings",
   templateUrl: "groupings.component.html",

src/app/vault/password-generator-history.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "jslib-angular/components/password-generator-history.component";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "jslib-angular/components/password-generator-history.component";
-
 @Component({
   selector: "app-password-generator-history",
   templateUrl: "password-generator-history.component.html",

src/app/vault/password-generator.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { PasswordGeneratorComponent as BasePasswordGeneratorComponent } from "jslib-angular/components/password-generator.component";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { PasswordGeneratorComponent as BasePasswordGeneratorComponent } from "jslib-angular/components/password-generator.component";
-
 @Component({
   selector: "app-password-generator",
   templateUrl: "password-generator.component.html",

src/app/vault/password-history.component.ts

@@ -1,11 +1,10 @@
 import { Component } from "@angular/core";
 
+import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "jslib-angular/components/password-history.component";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "jslib-angular/components/password-history.component";
-
 @Component({
   selector: "app-password-history",
   templateUrl: "password-history.component.html",

src/app/vault/share.component.ts

@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";
 
+import { ShareComponent as BaseShareComponent } from "jslib-angular/components/share.component";
 import { CipherService } from "jslib-common/abstractions/cipher.service";
 import { CollectionService } from "jslib-common/abstractions/collection.service";
 import { I18nService } from "jslib-common/abstractions/i18n.service";
@@ -7,8 +8,6 @@ import { LogService } from "jslib-common/abstractions/log.service";
 import { OrganizationService } from "jslib-common/abstractions/organization.service";
 import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
 
-import { ShareComponent as BaseShareComponent } from "jslib-angular/components/share.component";
-
 @Component({
   selector: "app-vault-share",
   templateUrl: "share.component.html",

src/app/vault/vault.component.ts

@@ -8,10 +8,28 @@ import {
   ViewContainerRef,
 } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-
 import { first } from "rxjs/operators";
 
+import { ModalRef } from "jslib-angular/components/modal/modal.ref";
+import { ModalService } from "jslib-angular/services/modal.service";
+import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
+import { EventService } from "jslib-common/abstractions/event.service";
+import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { MessagingService } from "jslib-common/abstractions/messaging.service";
+import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service";
+import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { StateService } from "jslib-common/abstractions/state.service";
+import { SyncService } from "jslib-common/abstractions/sync.service";
+import { TotpService } from "jslib-common/abstractions/totp.service";
+import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType";
+import { CipherType } from "jslib-common/enums/cipherType";
+import { EventType } from "jslib-common/enums/eventType";
+import { CipherView } from "jslib-common/models/view/cipherView";
+import { FolderView } from "jslib-common/models/view/folderView";
+import { invokeMenu, RendererMenuItem } from "jslib-electron/utils";
+
 import { SearchBarService } from "../layout/search/search-bar.service";
+
 import { AddEditComponent } from "./add-edit.component";
 import { AttachmentsComponent } from "./attachments.component";
 import { CiphersComponent } from "./ciphers.component";
@@ -23,29 +41,6 @@ import { PasswordHistoryComponent } from "./password-history.component";
 import { ShareComponent } from "./share.component";
 import { ViewComponent } from "./view.component";
 
-import { CipherRepromptType } from "jslib-common/enums/cipherRepromptType";
-import { CipherType } from "jslib-common/enums/cipherType";
-import { EventType } from "jslib-common/enums/eventType";
-
-import { CipherView } from "jslib-common/models/view/cipherView";
-import { FolderView } from "jslib-common/models/view/folderView";
-
-import { ModalRef } from "jslib-angular/components/modal/modal.ref";
-
-import { ModalService } from "jslib-angular/services/modal.service";
-
-import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
-import { EventService } from "jslib-common/abstractions/event.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { SyncService } from "jslib-common/abstractions/sync.service";
-import { TotpService } from "jslib-common/abstractions/totp.service";
-
-import { invokeMenu, RendererMenuItem } from "jslib-electron/utils";
-
 const BroadcasterSubscriptionId = "VaultComponent";
 
 @Component({
@@ -71,7 +66,7 @@ export class VaultComponent implements OnInit, OnDestroy {
 
   action: string;
   cipherId: string = null;
-  favorites: boolean = false;
+  favorites = false;
   type: CipherType = null;
   folderId: string = null;
   collectionId: string = null;
@@ -140,7 +135,7 @@ export class VaultComponent implements OnInit, OnDestroy {
           case "modalClosed":
             this.showingModal = false;
             break;
-          case "copyUsername":
+          case "copyUsername": {
             const uComponent =
               this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
             const uCipher = uComponent != null ? uComponent.cipher : null;
@@ -154,7 +149,8 @@ export class VaultComponent implements OnInit, OnDestroy {
               this.copyValue(uCipher, uCipher.login.username, "username", "Username");
             }
             break;
-          case "copyPassword":
+          }
+          case "copyPassword": {
             const pComponent =
               this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
             const pCipher = pComponent != null ? pComponent.cipher : null;
@@ -169,7 +165,8 @@ export class VaultComponent implements OnInit, OnDestroy {
               this.copyValue(pCipher, pCipher.login.password, "password", "Password");
             }
             break;
-          case "copyTotp":
+          }
+          case "copyTotp": {
             const tComponent =
               this.addEditComponent == null ? this.viewComponent : this.addEditComponent;
             const tCipher = tComponent != null ? tComponent.cipher : null;
@@ -184,6 +181,8 @@ export class VaultComponent implements OnInit, OnDestroy {
               const value = await this.totpService.getCode(tCipher.login.totp);
               this.copyValue(tCipher, value, "verificationCodeTotp", "TOTP");
             }
+            break;
+          }
           default:
             detectChanges = false;
             break;
@@ -735,7 +734,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     });
   }
 
-  private functionWithChangeDetection(func: Function) {
+  private functionWithChangeDetection(func: () => void) {
     this.ngZone.run(() => {
       func();
       this.changeDetectorRef.detectChanges();

src/app/vault/view-custom-fields.component.ts

@@ -1,8 +1,7 @@
 import { Component } from "@angular/core";
 
-import { EventService } from "jslib-common/abstractions/event.service";
-
 import { ViewCustomFieldsComponent as BaseViewCustomFieldsComponent } from "jslib-angular/components/view-custom-fields.component";
+import { EventService } from "jslib-common/abstractions/event.service";
 
 @Component({
   selector: "app-vault-view-custom-fields",

src/app/vault/view.component.ts

@@ -7,6 +7,7 @@ import {
   Output,
 } from "@angular/core";
 
+import { ViewComponent as BaseViewComponent } from "jslib-angular/components/view.component";
 import { ApiService } from "jslib-common/abstractions/api.service";
 import { AuditService } from "jslib-common/abstractions/audit.service";
 import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
@@ -21,9 +22,6 @@ import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.se
 import { StateService } from "jslib-common/abstractions/state.service";
 import { TokenService } from "jslib-common/abstractions/token.service";
 import { TotpService } from "jslib-common/abstractions/totp.service";
-
-import { ViewComponent as BaseViewComponent } from "jslib-angular/components/view.component";
-
 import { CipherView } from "jslib-common/models/view/cipherView";
 
 const BroadcasterSubscriptionId = "ViewComponent";