From 330dc0b9ad73d04586271a3342172fd593f2a72b Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 30 Jun 2022 11:13:14 -0400
Subject: [PATCH] Do not show expired custom status in userItem (#6439)

---
 app/components/user_item/user_item.tsx | 5 +++--
 app/utils/user/index.ts                | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/components/user_item/user_item.tsx b/app/components/user_item/user_item.tsx
index 315ea4a1fc..ffbf9d24c7 100644
--- a/app/components/user_item/user_item.tsx
+++ b/app/components/user_item/user_item.tsx
@@ -14,7 +14,7 @@ import {General} from '@constants';
 import {useTheme} from '@context/theme';
 import {makeStyleSheetFromTheme, changeOpacity} from '@utils/theme';
 import {typography} from '@utils/typography';
-import {getUserCustomStatus, isBot, isGuest, isShared} from '@utils/user';
+import {getUserCustomStatus, isBot, isCustomStatusExpired, isGuest, isShared} from '@utils/user';
 
 import type UserModel from '@typings/database/models/servers/user';
 
@@ -107,6 +107,7 @@ const UserItem = ({
     const isCurrentUser = currentUserId === user?.id;
     const name = getName(user, showFullName, isCurrentUser, intl);
     const customStatus = getUserCustomStatus(user);
+    const customStatusExpired = isCustomStatusExpired(user);
 
     const userItemTestId = `${testID}.${user?.id}`;
 
@@ -154,7 +155,7 @@ const UserItem = ({
                 </Text>
                 }
             </View>
-            {Boolean(isCustomStatusEnabled && !bot && customStatus?.emoji) && (
+            {Boolean(isCustomStatusEnabled && !bot && customStatus?.emoji && !customStatusExpired) && (
                 <CustomStatusEmoji
                     customStatus={customStatus!}
                     style={style.icon}
diff --git a/app/utils/user/index.ts b/app/utils/user/index.ts
index 9b2ca6fc2c..2ea0fbd502 100644
--- a/app/utils/user/index.ts
+++ b/app/utils/user/index.ts
@@ -116,11 +116,11 @@ export const getUserTimezoneProps = (currentUser: UserModel) => {
     };
 };
 
-export const getUserTimezone = (user: UserModel) => {
+export const getUserTimezone = (user: UserModel | UserProfile) => {
     return getTimezone(user.timezone);
 };
 
-export const getTimezone = (timezone: UserTimezone | null) => {
+export const getTimezone = (timezone?: UserTimezone | null) => {
     if (!timezone) {
         return '';
     }
@@ -161,7 +161,7 @@ export const getUserCustomStatus = (user?: UserModel | UserProfile): UserCustomS
     }
 };
 
-export function isCustomStatusExpired(user?: UserModel) {
+export function isCustomStatusExpired(user?: UserModel | UserProfile) {
     if (!user) {
         return true;
     }