From f99e6306c3b52d0f13198a0b3f96f9dbb65e8422 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Tue, 24 Apr 2018 12:09:09 -0400
Subject: [PATCH] Simplify `withSection`

---
 .../media-gallery/groupMessagesByDate.ts      | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/ts/components/conversation/media-gallery/groupMessagesByDate.ts b/ts/components/conversation/media-gallery/groupMessagesByDate.ts
index 8f280d22f..67bfd1399 100644
--- a/ts/components/conversation/media-gallery/groupMessagesByDate.ts
+++ b/ts/components/conversation/media-gallery/groupMessagesByDate.ts
@@ -25,21 +25,10 @@ export const groupMessagesByDate = (
   messages: Array<Message>
 ): Array<Section> => {
   const referenceDateTime = moment.utc(timestamp);
-  const today = moment(referenceDateTime).startOf('day');
-  const yesterday = moment(referenceDateTime)
-    .subtract(1, 'day')
-    .startOf('day');
-  const thisWeek = moment(referenceDateTime).startOf('isoWeek');
-  const thisMonth = moment(referenceDateTime).startOf('month');
 
   const sortedMessages = sortBy(messages, message => -message.received_at);
   const messagesWithSection = sortedMessages.map(
-    withSection({
-      today,
-      yesterday,
-      thisWeek,
-      thisMonth,
-    })
+    withSection(referenceDateTime)
   );
   const groupedMessages = groupBy(messagesWithSection, 'type');
   const yearMonthMessages = Object.values(
@@ -110,17 +99,16 @@ type MessageWithSection =
   | MessageWithStaticSection
   | MessageWithYearMonthSection;
 
-const withSection = ({
-  today,
-  yesterday,
-  thisWeek,
-  thisMonth,
-}: {
-  today: moment.Moment;
-  yesterday: moment.Moment;
-  thisWeek: moment.Moment;
-  thisMonth: moment.Moment;
-}) => (message: Message): MessageWithSection => {
+const withSection = (referenceDateTime: moment.Moment) => (
+  message: Message
+): MessageWithSection => {
+  const today = moment(referenceDateTime).startOf('day');
+  const yesterday = moment(referenceDateTime)
+    .subtract(1, 'day')
+    .startOf('day');
+  const thisWeek = moment(referenceDateTime).startOf('isoWeek');
+  const thisMonth = moment(referenceDateTime).startOf('month');
+
   const messageReceivedDate = moment.utc(message.received_at);
   if (messageReceivedDate.isAfter(today)) {
     return {