Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
const decoded = await Mime.decode(Buf.fromBase64UrlStr(raw));
const headers = {
subject: decoded.subject,
date: String(decoded.headers.date),
date: decoded.headers.date as string,
from: decoded.from,
to: decoded.to,
cc: decoded.cc,
references: String(decoded.headers.references || ''),
'message-id': String(decoded.headers['message-id'] || ''),
references: (decoded.headers.references as string) || '',
'message-id': (decoded.headers['message-id'] as string) || '',
};
const message = decoded.rawSignedContent ? await Mime.process(Buf.fromUtfStr(decoded.rawSignedContent)) : Mime.processDecoded(decoded);
const readableBlockTypes = ['encryptedMsg', 'plainText', 'plainHtml', 'signedMsg'];
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/popups/default.htm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="/css/browser-popup.css" />
</head>

<body style="zoom: reset">
<body style="zoom: 1">
<div id="set_up_account" style="display: none; width: 156px; padding: 1px">
<span class="button green action_set_up_account">Setup FlowCrypt</span>
</div>
Expand Down
3 changes: 1 addition & 2 deletions extension/css/cryptup.css
Original file line number Diff line number Diff line change
Expand Up @@ -3321,7 +3321,7 @@ body#select_account {
width: 340px;
padding: 0;
font-size: 14px;
zoom: reset;
zoom: 1;
}

body#select_account #title {
Expand Down Expand Up @@ -3362,7 +3362,6 @@ body#select_account .emails li a {
text-transform: none;
color: #337ab7;
transition: 0.5s;
letter-spacing: 0.35;
font-weight: 600;
}

Expand Down
1 change: 0 additions & 1 deletion extension/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ a.gray_link {
cursor: pointer;
height: auto;
border: 1px solid #f3f3f3;
letter-spacing: 0.35;
}

#alt-accounts.accounts-row .row.alt-accounts .contains_email {
Expand Down
2 changes: 1 addition & 1 deletion extension/js/common/core/mime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export class Mime {
}
}
const headers = Mime.headerGetAddress(mimeContent, ['from', 'to', 'cc', 'bcc']);
mimeContent.subject = String(mimeContent.subject || mimeContent.headers.subject || '');
mimeContent.subject = mimeContent.subject || (mimeContent.headers.subject as string) || '';
mimeContent = Object.assign(mimeContent, headers);
resolve(mimeContent);
} catch (e) {
Expand Down
Loading
Loading