From 1b7e780b756b3a64db5f20d03678fc7aadc3d1d6 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Apr 2021 17:51:18 -0400
Subject: toggled off gif

---
 src/components/messages/ChatInput.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/messages/ChatInput.tsx b/src/components/messages/ChatInput.tsx
index bde5fc12..142c935e 100644
--- a/src/components/messages/ChatInput.tsx
+++ b/src/components/messages/ChatInput.tsx
@@ -84,12 +84,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 +135,8 @@ const styles = StyleSheet.create({
     justifyContent: 'space-evenly',
     alignItems: 'center',
     marginRight: 10,
-    width: 100,
+    width: 50,
+    // width: 100,
     alignSelf: 'flex-end',
   },
 });
-- 
cgit v1.2.3-70-g09d2


From d1048d1a24416f6b0f9e951817de8c2740506f51 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Apr 2021 18:06:06 -0400
Subject: fixed linter

---
 src/components/messages/ChatInput.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/messages/ChatInput.tsx b/src/components/messages/ChatInput.tsx
index 142c935e..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,
-- 
cgit v1.2.3-70-g09d2


From 9d94778e4667993d3c6f67393c75e4627971216f Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Apr 2021 18:08:02 -0400
Subject: fixed linter

---
 src/components/common/BadgeDetailView.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 437b1914..13064517 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, badgeName, 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: badgeName,
             badge_img: badgeImage,
           });
         }}>
@@ -119,7 +119,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
           {isEditable && (
             <TouchableOpacity
               onPress={() => {
-                removeBadgeCell(name);
+                removeBadgeCell(badgeName);
               }}>
               <CloseIcon height={25} width={25} color="gray" />
             </TouchableOpacity>
-- 
cgit v1.2.3-70-g09d2


From 6f65b7f194073222640d26d1582be69349f1c340 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Apr 2021 18:10:17 -0400
Subject: fixed issue

---
 src/components/common/BadgeDetailView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 13064517..2c9678b4 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, badgeName, badgeImage}}) => {
+  const badgeEditCell = ({item: {id, name: badgeName, badgeImage}}) => {
     return (
       <TouchableOpacity
         style={styles.badgeCellContainerStyles}
@@ -126,7 +126,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
           )}
         </View>
         <View style={styles.userNameContainerStyles}>
-          <Text style={styles.badgeCellTextStyles}>{name}</Text>
+          <Text style={styles.badgeCellTextStyles}>{badgeName}</Text>
         </View>
       </TouchableOpacity>
     );
-- 
cgit v1.2.3-70-g09d2


From 7d2414c756a2edb9393161d439ce2deb3e96b5c4 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 23 Apr 2021 18:12:00 -0400
Subject: better fix

---
 src/components/common/BadgeDetailView.tsx | 14 +++++++-------
 src/components/profile/ProfileHeader.tsx  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index 2c9678b4..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,
 }) => {
@@ -87,7 +87,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
     fetchBadges();
   };
 
-  const badgeEditCell = ({item: {id, name: badgeName, badgeImage}}) => {
+  const badgeEditCell = ({item: {id, name, 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: badgeName,
+            badge_title: name,
             badge_img: badgeImage,
           });
         }}>
@@ -119,14 +119,14 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
           {isEditable && (
             <TouchableOpacity
               onPress={() => {
-                removeBadgeCell(badgeName);
+                removeBadgeCell(name);
               }}>
               <CloseIcon height={25} width={25} color="gray" />
             </TouchableOpacity>
           )}
         </View>
         <View style={styles.userNameContainerStyles}>
-          <Text style={styles.badgeCellTextStyles}>{badgeName}</Text>
+          <Text style={styles.badgeCellTextStyles}>{name}</Text>
         </View>
       </TouchableOpacity>
     );
@@ -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/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}
               />
             )}
-- 
cgit v1.2.3-70-g09d2