From 3dd4efdc14ee4730938440010e5b611a42684ae0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 29 Jan 2023 16:41:48 -0600 Subject: [PATCH 1/2] Fix pointless relationships conditional --- app/soapbox/reducers/relationships.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/reducers/relationships.ts b/app/soapbox/reducers/relationships.ts index 40bcbdfaa..2eb035ec4 100644 --- a/app/soapbox/reducers/relationships.ts +++ b/app/soapbox/reducers/relationships.ts @@ -57,7 +57,7 @@ const setDomainBlocking = (state: State, accounts: ImmutableList, blocki const importPleromaAccount = (state: State, account: APIEntity) => { const relationship = get(account, ['pleroma', 'relationship'], {}); - if (relationship.id && relationship !== {}) + if (relationship.id) return normalizeRelationships(state, [relationship]); return state; }; From 44fce6fbf39cd6b451b82eb487b5672edcdd6ef8 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Wed, 25 Jan 2023 10:06:03 -0500 Subject: [PATCH 2/2] Add 'key' to Link to fix react console error --- app/soapbox/components/status-reply-mentions.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/soapbox/components/status-reply-mentions.tsx b/app/soapbox/components/status-reply-mentions.tsx index 7cc2fe026..5d1374a69 100644 --- a/app/soapbox/components/status-reply-mentions.tsx +++ b/app/soapbox/components/status-reply-mentions.tsx @@ -50,7 +50,14 @@ const StatusReplyMentions: React.FC = ({ status, hoverable // The typical case with a reply-to and a list of mentions. const accounts = to.slice(0, 2).map(account => { const link = ( - e.stopPropagation()}>@{account.username} + e.stopPropagation()} + > + @{account.username} + ); if (hoverable) {