Skip to content

support multiple sessions in recent activity #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 9, 2017
Merged

support multiple sessions in recent activity #332

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14d1d2a
support multiple sessions in recent activity
ele828 Aug 7, 2017
b48e4ed
ensure values always defined
ele828 Aug 7, 2017
2a7ba9e
pass contact to cleanUpCalls
ele828 Aug 8, 2017
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
22 changes: 17 additions & 5 deletions src/containers/RecentActivityContainer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ function getTabs({
recentCalls,
currentContact,
}) {
let messages = [];
let calls = [];
let unreadMessageCounts = 0;
if (currentContact && currentContact.id) {
const contactId = currentContact.id;
if (recentMessages.messages[contactId])
messages = recentMessages.messages[contactId];
if (recentCalls.calls[contactId])
calls = recentCalls.calls[contactId];
if (recentMessages.unreadMessageCounts[contactId])
unreadMessageCounts = recentMessages.unreadMessageCounts[contactId];
}
return [
{
icon: <VoicemailIcon width={23} height={23} />,
Expand All @@ -31,11 +43,11 @@ function getTabs({
icon: <span className={dynamicsFont.composeText} />,
label: i18n.getString('text', currentLocale),
path: 'recentMessages',
noticeCounts: recentMessages.unreadMessageCounts || 0,
noticeCounts: unreadMessageCounts,
isActive: path => path === 'recentMessages',
view: (
<RecentActivityMessages
messages={recentMessages.messages}
messages={messages}
navigateTo={navigateTo}
dateTimeFormatter={dateTimeFormatter}
currentLocale={currentLocale}
Expand All @@ -45,7 +57,7 @@ function getTabs({
getData: () => {
recentMessages.getMessages(currentContact);
},
cleanUp: () => recentMessages.cleanUpMessages()
cleanUp: () => recentMessages.cleanUpMessages(currentContact)
},
{
icon: <FaxIcon width={23} height={23} />,
Expand All @@ -63,7 +75,7 @@ function getTabs({
isActive: path => path === 'recentCalls',
view: (
<RecentActivityCalls
calls={recentCalls.calls}
calls={calls}
dateTimeFormatter={dateTimeFormatter}
currentLocale={currentLocale}
isCallsLoaded={recentCalls.isCallsLoaded}
Expand All @@ -72,7 +84,7 @@ function getTabs({
getData: () => {
recentCalls.getCalls(currentContact);
},
cleanUp: () => recentCalls.cleanUpCalls()
cleanUp: () => recentCalls.cleanUpCalls(currentContact)
},
];
}
Expand Down