From 533872010660917ae5cc5ae01e1ed5d4bf014276 Mon Sep 17 00:00:00 2001
From: xmflsct <me@xmflsct.com>
Date: Mon, 5 Dec 2022 21:30:19 +0100
Subject: [PATCH] Fix notification account info not shown

---
 src/components/Timeline/Shared/Actioned.tsx |  2 +-
 src/screens/Tabs/Shared/Search/Empty.tsx    | 22 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/Timeline/Shared/Actioned.tsx b/src/components/Timeline/Shared/Actioned.tsx
index fcc3a002..8d3dcb26 100644
--- a/src/components/Timeline/Shared/Actioned.tsx
+++ b/src/components/Timeline/Shared/Actioned.tsx
@@ -19,7 +19,7 @@ export interface Props {
 const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest }) => {
   const { status, reblogStatus } = useContext(StatusContext)
   const account = rest.account || (reblogStatus ? reblogStatus.account : status?.account)
-  if (!status || !account) return null
+  if (!account) return null
 
   const { t } = useTranslation('componentTimeline')
   const { colors } = useTheme()
diff --git a/src/screens/Tabs/Shared/Search/Empty.tsx b/src/screens/Tabs/Shared/Search/Empty.tsx
index 34b61b01..b43d3189 100644
--- a/src/screens/Tabs/Shared/Search/Empty.tsx
+++ b/src/screens/Tabs/Shared/Search/Empty.tsx
@@ -72,16 +72,18 @@ const SearchEmpty: React.FC<Props> = ({ isLoading, inputRef, setSearchTerm }) =>
             </CustomText>
           </View>
 
-          <CustomText
-            style={{
-              color: colors.primaryDefault,
-              marginTop: StyleConstants.Spacing.M,
-              paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
-            }}
-            fontWeight='Bold'
-          >
-            {t('shared.search.empty.trending.tags')}
-          </CustomText>
+          {trendsTags.data?.length ? (
+            <CustomText
+              style={{
+                color: colors.primaryDefault,
+                marginTop: StyleConstants.Spacing.M,
+                paddingHorizontal: StyleConstants.Spacing.Global.PagePadding
+              }}
+              fontWeight='Bold'
+            >
+              {t('shared.search.empty.trending.tags')}
+            </CustomText>
+          ) : null}
           <View>
             {trendsTags.data?.map((tag, index) => {
               const hashtag = tag as Mastodon.Tag