devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Merge branch 'main' into autofill/pm-7663-update-build-pipeline-for-beta-labeling

This commit is contained in:
Cesar Gonzalez 2024-04-25 16:38:44 -05:00 committed by GitHub
parent 3e6d2d11ba 2ff3fa92fb
commit e90cc68648
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/autofill/services/autofill.service.ts
View File

@ -130,7 +130,9 @@ export default class AutofillService implements AutofillServiceInterface {
if (triggeringOnPageLoad && autoFillOnPageLoadIsEnabled) {
injectedScripts.push("autofiller.js");
} else {
}
if (!triggeringOnPageLoad) {
await this.scriptInjectorService.inject({
tabId: tab.id,
injectDetails: { file: "content/content-message-handler.js", runAt: "document_start" },

5
libs/angular/src/vault/components/add-edit.component.ts
View File

@ -184,8 +184,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
FeatureFlag.FlexibleCollectionsV1,
false,
);
this.writeableCollections = await this.loadCollections();
this.canUseReprompt = await this.passwordRepromptService.enabled();
this.policyService
.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
@ -197,6 +195,9 @@ export class AddEditComponent implements OnInit, OnDestroy {
takeUntil(this.destroy$),
)
.subscribe();
this.writeableCollections = await this.loadCollections();
this.canUseReprompt = await this.passwordRepromptService.enabled();
}
ngOnDestroy() {