Skip to content

Commit 74a99f3

Browse files
authored
Merge branch 'master' into issue-5668-add-thunderbird-attachments-support
2 parents 7969a2c + b8aa4be commit 74a99f3

File tree

6 files changed

+784
-1234
lines changed

6 files changed

+784
-1234
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ updates:
3434
update-types: ["version-update:semver-major"]
3535
- dependency-name: "chai-as-promised"
3636
update-types: ["version-update:semver-major"]
37+
- dependency-name: "openpgp"
38+
update-types: ["version-update:semver-major"]
3739
- dependency-name: "filesize"
3840
versions: [ ">= 10.1.3" ]

extension/js/content_scripts/webmail/generic/setup-webmail-content-script.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi
463463
await webmailSpecific.start(acctEmail, clientConfiguration, inject, notifications, factory, relayManager);
464464
} catch (e) {
465465
if (e instanceof TabIdRequiredError) {
466-
console.error(`FlowCrypt cannot start: ${String(e)}`);
466+
console.error(`FlowCrypt cannot start: ${String(e.message)}`);
467467
} else if (e instanceof Error && e.message === 'Extension context invalidated.') {
468468
console.info(`FlowCrypt cannot start: extension context invalidated. Destroying.`);
469469
win.destroy();

0 commit comments

Comments
 (0)