3 files changed, 7 insertions, 7 deletions
diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 437b1914..1309fad5 100644
--- a/src/components/common/BadgeDetailView.tsx
+++ b/src/components/common/BadgeDetailView.tsx
@@ -87,7 +87,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
     fetchBadges();
   };
 
-  const badgeEditCell = ({item: {id, name, badgeImage}}) => {
+  const badgeEditCell = ({item: {id, nameLocal, badgeImage}}) => {
     return (
       <TouchableOpacity
         style={styles.badgeCellContainerStyles}
@@ -95,7 +95,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
           setBadgeViewVisible(false);
           navigation.navigate('MutualBadgeHolders', {
             badge_id: id,
-            badge_title: name,
+            badge_title: nameLocal,
             badge_img: badgeImage,
           });
         }}>
diff --git a/src/components/messages/ChatInput.tsx b/src/components/messages/ChatInput.tsx
index 2ae220c6..78c7529a 100644
--- a/src/components/messages/ChatInput.tsx
+++ b/src/components/messages/ChatInput.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import {Image, StyleSheet, View} from 'react-native';
-import {TouchableOpacity} from 'react-native-gesture-handler';
 import {useStore} from 'react-redux';
 import {
   AutoCompleteInput,
@@ -33,7 +32,7 @@ const ChatInput: React.FC<
 > = () => {
   const state: RootState = useStore().getState();
   const avatar = state.user.avatar;
-  const {sendMessage, text, setText} = useMessageInputContext();
+  const {sendMessage, text} = useMessageInputContext();
   // const {
   //   setSelectedImages,
   //   selectedImages,
diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index 82eda258..3e83d991 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -35,12 +35,13 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
     userXId ? state.userX[screenType][userXId] : state.user,
   );
 
-  const state: RootState = useStore().getState();
-  const loggedInUserId = state.user.user.userId;
-
   const {
     user: {username = ''},
   } = useSelector((state: RootState) => state.user);
+
+  const state: RootState = useStore().getState();
+  const loggedInUserId = state.user.user.userId;
+
   const [drawerVisible, setDrawerVisible] = useState(false);
   const [showBadgeView, setBadgeViewVisible] = useState(false);
   const [firstName, lastName] = [...name.split(' ')];