Skip to content

Commit 1a3bf40

Browse files
Add to and cc recipients in To detail from popover. Close #1084
1 parent 812c777 commit 1a3bf40

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

email_composer/src/components/DropfileField.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const DropfileField = props => (
3636
accept={props.accept}
3737
multiple={props.multiple}
3838
onChange={props.onDrop}
39-
webkitdirectory
4039
/>
4140
{props.isDragActive && (
4241
<div className="dropfilefiled-content">

email_mailbox/src/components/Email.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@ const renderEmailInfoExpand = props => (
121121
<div className="email-info-content-line">
122122
<div className="email-info-content-to">
123123
{renderEmailStatus(props.email.status)}
124-
<span>{`To ${showContacts(props.email.to)}`}</span>
124+
<span>{`To ${showContacts([
125+
...props.email.to,
126+
...props.email.cc
127+
])}`}</span>
125128
<div className="email-info-content-to-more">
126129
<span onClick={props.onTooglePopOverEmailMoreInfo}>
127130
{string.mailbox.more}
@@ -191,7 +194,7 @@ const renderEmailInfoExpand = props => (
191194
const showContacts = contacts => {
192195
return contacts.reduce((result, contact, index) => {
193196
if (contacts.length > 1) {
194-
const name = contact.name || contact.email;
197+
const name = contact.name || contact.email.split('@')[0];
195198
const firstname = `${index !== 0 ? ', ' : ''}${name.split(' ')[0]}`;
196199
return `${result}${firstname}`;
197200
}

email_mailbox/src/selectors/emails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const defineEmails = (emails, contacts, emailIds) => {
2121
const to = defineContact(contacts, toIds);
2222
const ccIds = email.cc;
2323
const cc = defineContact(contacts, ccIds);
24-
const bccIds = email.cc;
24+
const bccIds = email.bcc;
2525
const bcc = defineContact(contacts, bccIds);
2626
const subject = email.subject || `(${string.mailbox.empty_subject})`;
2727
return { ...email, from, to, toIds, cc, ccIds, bcc, bccIds, subject };

0 commit comments

Comments
 (0)