Merge pull request #387 from IvanIFChen/hotfix-toggle-off-gif

[HOTFIX] Toggled off gif

3 files changed, 9 insertions, 9 deletions

diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 437b1914..f3e92bd4 100644
--- a/src/components/common/BadgeDetailView.tsx
+++ b/src/components/common/BadgeDetailView.tsx
@@ -23,11 +23,11 @@ import {getUniversityBadge, normalize} from '../../utils';
 interface BadgeDetailModalProps {
   isEditable: boolean;
   setBadgeViewVisible: Function;
-  name?: string;
+  userName?: string;
 }
 
 const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
-  name,
+  userName,
   isEditable = true,
   setBadgeViewVisible,
 }) => {
@@ -146,7 +146,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
   };
 
   const modalHeader = () => {
-    const heading = isEditable ? 'Edit your badges!' : name;
+    const heading = isEditable ? 'Edit your badges!' : userName;
     const subheading = isEditable
       ? 'Add or delete your badges'
       : 'View badges to discover groups!';
diff --git a/src/components/messages/ChatInput.tsx b/src/components/messages/ChatInput.tsx
index bde5fc12..a4ed675b 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,
@@ -84,12 +83,12 @@ const ChatInput: React.FC<
               source={require('../../assets/images/camera.png')}
             />
           </TouchableOpacity> */}
-          <TouchableOpacity onPress={() => setText('/')}>
+          {/* <TouchableOpacity onPress={() => setText('/')}>
             <Image
               style={{width: normalize(23), height: normalize(23)}}
               source={require('../../assets/images/gif.png')}
             />
-          </TouchableOpacity>
+          </TouchableOpacity> */}
           <ChatInputSubmit onPress={sendMessage} outlined={text.length === 0} />
         </View>
       </View>
@@ -135,7 +134,8 @@ const styles = StyleSheet.create({
     justifyContent: 'space-evenly',
     alignItems: 'center',
     marginRight: 10,
-    width: 100,
+    width: 50,
+    // width: 100,
     alignSelf: 'flex-end',
   },
 });
diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index 494b33bd..9e11b8d5 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -82,7 +82,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
             {showBadgeView && (
               <BadgeDetailView
                 isEditable={userXName === username}
-                name={name}
+                userName={name}
                 setBadgeViewVisible={setBadgeViewVisible}
               />
             )}