Merge branch 'master' of https://github.com/bitwarden/browser into feature/desktop-bridge

# Conflicts:
#	src/_locales/en/messages.json

src/popup/accounts/register.component.html

@@ -54,7 +54,7 @@
                 {{'masterPassDesc' | i18n}}
             </div>
         </div>
-        <div class="box last">
+        <div class="box">
             <div class="box-content">
                 <div class="box-content-row box-content-row-flex" appBoxRow>
                     <div class="row-main">
@@ -80,5 +80,19 @@
                 {{'masterPassHintDesc' | i18n}}
             </div>
         </div>
+        <div class="box last" *ngIf="showTerms">
+            <div class="box-content">
+                <div class="box-footer box-content-row checkbox">
+                    <input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
+                    <label for="acceptPolicies">
+                        {{'acceptPolicies' | i18n}}<br>
+                        <a href="https://bitwarden.com/terms/" target="_blank"
+                            rel="noopener">{{'termsOfService' | i18n}}</a>,
+                        <a href="https://bitwarden.com/privacy/" target="_blank"
+                            rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                    </label>
+                </div>
+            </div>
+        </div>
     </content>
 </form>

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

@@ -1,6 +1,9 @@
 import { Component } from '@angular/core';
 
-import { Router } from '@angular/router';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
 import { ApiService } from 'jslib/abstractions/api.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -25,9 +28,9 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         cryptoService: CryptoService, messagingService: MessagingService,
         userService: UserService, passwordGenerationService: PasswordGenerationService,
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router,
-        syncService: SyncService) {
+        syncService: SyncService, route: ActivatedRoute) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
-            platformUtilsService, policyService, router, apiService, syncService);
+            platformUtilsService, policyService, router, apiService, syncService, route);
     }
 
     get masterPasswordScoreWidth() {

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

@@ -4,7 +4,10 @@ import {
     NgZone,
 } from '@angular/core';
 
-import { Router } from '@angular/router';
+import {
+    ActivatedRoute,
+    Router,
+} from '@angular/router';
 
 import { TwoFactorProviderType } from 'jslib/enums/twoFactorProviderType';
 
@@ -38,9 +41,9 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
         environmentService: EnvironmentService, private ngZone: NgZone,
         private broadcasterService: BroadcasterService, private changeDetectorRef: ChangeDetectorRef,
         private popupUtilsService: PopupUtilsService, stateService: StateService,
-        storageService: StorageService) {
+        storageService: StorageService, route: ActivatedRoute) {
         super(authService, router, i18nService, apiService, platformUtilsService, window, environmentService,
-            stateService, storageService);
+            stateService, storageService, route);
         super.onSuccessfulLogin = () => {
             return syncService.fullSync(true);
         };