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

jslib

@@ -1 +1 @@
-Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d
+Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587

src/_locales/en/messages.json

@@ -498,7 +498,7 @@
     "message": "Edited item"
   },
   "deleteItemConfirmation": {
-    "message": "Are you sure you want to delete this item?"
+    "message": "Do you really want to send to the trash?"
   },
   "deletedItem": {
     "message": "Sent item to trash"

src/background/main.background.ts

@@ -26,6 +26,7 @@ import { ExportService } from 'jslib/services/export.service';
 import { NotificationsService } from 'jslib/services/notifications.service';
 import { PolicyService } from 'jslib/services/policy.service';
 import { SearchService } from 'jslib/services/search.service';
+import { SendService } from 'jslib/services/send.service';
 import { SystemService } from 'jslib/services/system.service';
 import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.service';
 
@@ -58,6 +59,7 @@ import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/ex
 import { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service';
 import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service';
 import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service';
+import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service';
 import { SystemService as SystemServiceAbstraction } from 'jslib/abstractions/system.service';
 
 import { Analytics } from 'jslib/misc';
@@ -119,6 +121,7 @@ export default class MainBackground {
     policyService: PolicyServiceAbstraction;
     analytics: Analytics;
     popupUtilsService: PopupUtilsService;
+    sendService: SendServiceAbstraction;
 
     onUpdatedRan: boolean;
     onReplacedRan: boolean;
@@ -178,6 +181,8 @@ export default class MainBackground {
         this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService,
             this.i18nService);
         this.searchService = new SearchService(this.cipherService);
+        this.sendService = new SendService(this.cryptoService, this.userService, this.apiService, this.storageService,
+            this.i18nService, this.cryptoFunctionService);
         this.stateService = new StateService();
         this.policyService = new PolicyService(this.userService, this.storageService);
         this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService,
@@ -196,7 +201,7 @@ export default class MainBackground {
             }, async () => await this.logout(false));
         this.syncService = new SyncService(this.userService, this.apiService, this.settingsService,
             this.folderService, this.cipherService, this.cryptoService, this.collectionService,
-            this.storageService, this.messagingService, this.policyService,
+            this.storageService, this.messagingService, this.policyService, this.sendService,
             async (expired: boolean) => await this.logout(expired));
         this.eventService = new EventService(this.storageService, this.apiService, this.userService,
             this.cipherService);

src/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "__MSG_appName__",
-  "version": "1.46.2",
+  "version": "1.47.0",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",

src/popup/accounts/register.component.html

@@ -82,7 +82,7 @@
         </div>
         <div class="box last" *ngIf="showTerms">
             <div class="box-content">
-                <div class="box-footer box-content-row checkbox">
+                <div class="box-content-row box-content-row-checkbox box-content-row-checkbox-left" appBoxRow>
                     <input type="checkbox" id="acceptPolicies" [(ngModel)]="acceptPolicies" name="AcceptPolicies">
                     <label for="acceptPolicies">
                         {{'acceptPolicies' | i18n}}<br>

src/popup/app.module.ts

@@ -102,6 +102,7 @@ import localePtPt from '@angular/common/locales/pt-PT';
 import localeRo from '@angular/common/locales/ro';
 import localeRu from '@angular/common/locales/ru';
 import localeSk from '@angular/common/locales/sk';
+import localeSr from '@angular/common/locales/sr';
 import localeSv from '@angular/common/locales/sv';
 import localeTh from '@angular/common/locales/th';
 import localeTr from '@angular/common/locales/tr';
@@ -138,6 +139,7 @@ registerLocaleData(localePtPt, 'pt-PT');
 registerLocaleData(localeRo, 'ro');
 registerLocaleData(localeRu, 'ru');
 registerLocaleData(localeSk, 'sk');
+registerLocaleData(localeSr, 'sr');
 registerLocaleData(localeSv, 'sv');
 registerLocaleData(localeTh, 'th');
 registerLocaleData(localeTr, 'tr');

src/popup/scss/box.scss

@@ -293,6 +293,14 @@
         }
     }
 
+    &.box-content-row-checkbox-left {
+        justify-content: flex-start;
+
+        > input {
+            margin: 0 15px 0 0;
+        }
+    }
+
     &.box-content-row-input {
         label {
             white-space: nowrap;

src/popup/scss/misc.scss

@@ -307,19 +307,3 @@ app-vault-icon {
 input[type="password"]::-ms-reveal {
     display: none;
 }
-
-.checkbox {
-        position: relative;
-        display: block;
-        padding-left: 18px;
-
-        label {
-            margin-bottom: 0;
-        }
-
-        input[type="checkbox"] {
-            position: absolute;
-            margin-top: 4px;
-            margin-left: -18px;
-        }
-    }

src/popup/services/services.module.ts

@@ -33,6 +33,7 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { PolicyService } from 'jslib/abstractions/policy.service';
 import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service';
+import { SendService } from 'jslib/abstractions/send.service';
 import { SettingsService } from 'jslib/abstractions/settings.service';
 import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
@@ -156,6 +157,7 @@ export function initFactory(i18nService: I18nService, storageService: StorageSer
         { provide: AppIdService, useFactory: getBgService<AppIdService>('appIdService'), deps: [] },
         { provide: AutofillService, useFactory: getBgService<AutofillService>('autofillService'), deps: [] },
         { provide: ExportService, useFactory: getBgService<ExportService>('exportService'), deps: [] },
+        { provide: SendService, useFactory: getBgService<SendService>('sendService'), deps: [] },
         {
             provide: VaultTimeoutService,
             useFactory: getBgService<VaultTimeoutService>('vaultTimeoutService'),

src/services/i18n.service.ts

@@ -18,8 +18,8 @@ export default class I18nService extends BaseI18nService {
 
         this.supportedTranslationLocales = [
             'en', 'be', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hr', 'hu',
-            'id', 'it', 'ja', 'ko', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi',
+            'id', 'it', 'ja', 'ko', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk',
-            'zh-CN', 'zh-TW',
+            'vi', 'zh-CN', 'zh-TW',
         ];
     }