From 270a3dee15c2ce95d67b0e543fdb34cea1b03a83 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Tue, 14 Jul 2020 00:27:34 -0500
Subject: [PATCH] Updated StatusList keys and promotion implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- StatusList keys and promotion implementation
---
 app/javascript/gabsocial/components/status_list.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/gabsocial/components/status_list.js b/app/javascript/gabsocial/components/status_list.js
index f26c9c70..3648a406 100644
--- a/app/javascript/gabsocial/components/status_list.js
+++ b/app/javascript/gabsocial/components/status_list.js
@@ -260,11 +260,11 @@ class StatusList extends ImmutablePureComponent {
           )
         } else {
           if (Array.isArray(promotions)) {
-            const promotionBlock = promotions.find(p => p.position === i)
+            const promotionBlock = promotions.find(p => (p.position === i && p.timeline_id === timelineId))
             if (promotionBlock) {
               scrollableContent.push(
                 <StatusContainer
-                  key={promotionBlock.status_id}
+                  key={`promotion-${i}-${promotionBlock.status_id}`}
                   id={promotionBlock.status_id}
                   onMoveUp={this.handleMoveUp}
                   onMoveDown={this.handleMoveDown}
@@ -277,7 +277,7 @@ class StatusList extends ImmutablePureComponent {
           }
           scrollableContent.push(
             <StatusContainer
-              key={statusId}
+              key={`${statusId}-${i}`}
               id={statusId}
               onMoveUp={this.handleMoveUp}
               onMoveDown={this.handleMoveDown}