]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix frontend crash when deleting announcements
authorDaniel Sockwell <dsockwell@gmail.com>
Sat, 21 Mar 2020 02:10:42 +0000 (22:10 -0400)
committerThibaut Girka <thib@sitedethib.com>
Sun, 22 Mar 2020 15:31:01 +0000 (16:31 +0100)
Port 8758221e7344645bc1357578ec1789aa7d46da08 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/getting_started/components/announcements.js

index 48e1766e2083c8238e3b15926ec0d379cc0a7c17..5f6e6d84c372fe2f25f36b6b9d0d5d1fbafa6c19 100644 (file)
@@ -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;