From 41e49b2c38f44221fe05a26678e4f1d9d233dcde Mon Sep 17 00:00:00 2001
From: Lachlan Kermode <lachiekermode@gmail.com>
Date: Sun, 13 Jan 2019 11:53:08 +0100
Subject: [PATCH] fix merge break

---
 src/components/presentational/TimelineEvents.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/presentational/TimelineEvents.js b/src/components/presentational/TimelineEvents.js
index 035ab64..8c9678f 100644
--- a/src/components/presentational/TimelineEvents.js
+++ b/src/components/presentational/TimelineEvents.js
@@ -35,7 +35,15 @@ const TimelineEvents = ({
   function renderDatetime(datetime) {
     if (narrative) {
       const { steps } = narrative
-      const isInNarrative = steps.map(s => s.id).includes(event.id)
+      // check all events in the datetime before rendering in narrative
+      let isInNarrative = false
+      for (let i = 0; i < datetime.events.length; i++) {
+        const event = datetime.events[i]
+        if (steps.map(s => s.id).includes(event.id)) {
+          isInNarrative = true
+          break;
+        }
+      }
 
       if (!isInNarrative) {
         return null