diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 9aa6745faaf..6e010d1b7ed 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -76,3 +76,4 @@ jobs:
-Dsonar.projectKey=${{ github.repository_owner }}_${{ github.event.repository.name }}
-Dsonar.test.inclusions=**/*.spec.ts
-Dsonar.tests=.
+ -Dsonar.sources=.
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 462a33a1b8e..77f5d4f000e 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -24,7 +24,7 @@
"**/node_modules/argon2/package.json",
"**/node_modules/argon2/lib/binding/napi-v3/argon2.node"
],
- "electronVersion": "30.1.1",
+ "electronVersion": "30.1.2",
"generateUpdatesFilesForAllChannels": true,
"publish": {
"provider": "generic",
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index d0589116fb6..7c72ea58fb8 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -573,18 +573,18 @@
}
}
},
- "masterPassDoesntMatch": {
- "message": "Master password confirmation does not match."
- },
- "newAccountCreated": {
- "message": "Your new account has been created! You may now log in."
- },
"youSuccessfullyLoggedIn": {
"message": "You successfully logged in"
},
"youMayCloseThisWindow": {
"message": "You may close this window"
},
+ "masterPassDoesntMatch": {
+ "message": "Master password confirmation does not match."
+ },
+ "newAccountCreated": {
+ "message": "Your new account has been created! You may now log in."
+ },
"masterPassSent": {
"message": "We've sent you an email with your master password hint."
},
diff --git a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
index e82849a9056..f4685a69c01 100644
--- a/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
+++ b/apps/web/src/app/admin-console/settings/sponsored-families.component.ts
@@ -64,7 +64,7 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy {
true,
),
],
- updateOn: "blur",
+ updateOn: "change",
}),
});
}
diff --git a/apps/web/src/app/auth/two-factor.component.ts b/apps/web/src/app/auth/two-factor.component.ts
index 741037cc302..b3241a92425 100644
--- a/apps/web/src/app/auth/two-factor.component.ts
+++ b/apps/web/src/app/auth/two-factor.component.ts
@@ -149,17 +149,6 @@ export class TwoFactorComponent extends BaseTwoFactorComponent implements OnDest
await this.submit();
};
- override async launchDuoFrameless() {
- const duoHandOffMessage = {
- title: this.i18nService.t("youSuccessfullyLoggedIn"),
- message: this.i18nService.t("thisWindowWillCloseIn5Seconds"),
- buttonText: this.i18nService.t("close"),
- isCountdown: true,
- };
- document.cookie = `duoHandOffMessage=${JSON.stringify(duoHandOffMessage)}; SameSite=strict;`;
- this.platformUtilsService.launchUri(this.duoFramelessUrl);
- }
-
async ngOnDestroy() {
super.ngOnDestroy();
diff --git a/apps/web/src/app/tools/send/add-edit.component.html b/apps/web/src/app/tools/send/add-edit.component.html
index 3225b61350e..cc96908eaa9 100644
--- a/apps/web/src/app/tools/send/add-edit.component.html
+++ b/apps/web/src/app/tools/send/add-edit.component.html
@@ -100,7 +100,7 @@
-