diff --git a/jslib b/jslib index 5e50aa1a195..f44e99d74dc 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d +Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587 diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 3cc0ec787e1..e0147361287 100644 --- a/src/_locales/en/messages.json +++ b/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" diff --git a/src/background/main.background.ts b/src/background/main.background.ts index 96c4462d89f..47b7d5e76b0 100644 --- a/src/background/main.background.ts +++ b/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); diff --git a/src/manifest.json b/src/manifest.json index a3768d611c2..1141bbd1263 100644 --- a/src/manifest.json +++ b/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.", diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html index c673730d98e..8fc97f20c33 100644 --- a/src/popup/accounts/register.component.html +++ b/src/popup/accounts/register.component.html @@ -82,7 +82,7 @@
-