From: Daniel Sockwell <dsockwell@gmail.com>
Date: Sat, 21 Mar 2020 02:10:42 +0000 (-0400)
Subject: [Glitch] Fix frontend crash when deleting announcements
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9da4bd098cac88c3e44157765adcff01445ba31a;p=mastodon.git

[Glitch] Fix frontend crash when deleting announcements

Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---

diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js
index 48e1766e2..5f6e6d84c 100644
--- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.js
+++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.js
@@ -389,7 +389,7 @@ class Announcements extends ImmutablePureComponent {
   _markAnnouncementAsRead () {
     const { dismissAnnouncement, announcements } = this.props;
     const { index } = this.state;
-    const announcement = announcements.get(index);
+    const announcement = announcements.get(index) || announcements.get(index - 1);
     if (!announcement.get('read')) dismissAnnouncement(announcement.get('id'));
   }
 
@@ -407,7 +407,7 @@ class Announcements extends ImmutablePureComponent {
 
   render () {
     const { announcements, intl } = this.props;
-    const { index } = this.state;
+    const index = this.state.index < announcements.size ? this.state.index : announcements.size - 1;
 
     if (announcements.isEmpty()) {
       return null;