From e65080181af82c14d3441a0890f2ba0a6fb9cd7e Mon Sep 17 00:00:00 2001 From: Rens Groothuijsen Date: Sun, 26 Dec 2021 19:22:05 +0100 Subject: Fix tag rendering error in hashtag column settings (#17184) * Flatten tags in configuration to regular array before converting to JSON * Render filter tags using toJS instead of toJSON --- .../mastodon/features/hashtag_timeline/components/column_settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js index de1127b0d..142118cef 100644 --- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js @@ -33,8 +33,8 @@ class ColumnSettings extends React.PureComponent { tags (mode) { let tags = this.props.settings.getIn(['tags', mode]) || []; - if (tags.toJSON) { - return tags.toJSON(); + if (tags.toJS) { + return tags.toJS(); } else { return tags; } -- cgit