From ce5bf93fef3f5108e0dca35bf24accb4d9d654bb Mon Sep 17 00:00:00 2001
From: Shravya Ramesh <shravs1208@gmail.com>
Date: Fri, 23 Apr 2021 14:39:46 -0700
Subject: selective visibility, disabled gifs

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

(limited to 'src/components/messages/ChatInput.tsx')

diff --git a/src/components/messages/ChatInput.tsx b/src/components/messages/ChatInput.tsx
index bde5fc12..2ae220c6 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>
@@ -132,7 +132,7 @@ const styles = StyleSheet.create({
   actionButtons: {
     height: normalize(30) + 10,
     flexDirection: 'row',
-    justifyContent: 'space-evenly',
+    justifyContent: 'flex-end',
     alignItems: 'center',
     marginRight: 10,
     width: 100,
-- 
cgit v1.2.3-70-g09d2


From 86ba18fdc495e0519b91eb9c9f826a6a9ed15e88 Mon Sep 17 00:00:00 2001
From: Shravya Ramesh <shravs1208@gmail.com>
Date: Fri, 23 Apr 2021 15:28:44 -0700
Subject: circle ci errors

---
 src/components/common/BadgeDetailView.tsx                          | 4 ++--
 src/components/messages/ChatInput.tsx                              | 3 +--
 src/components/profile/ProfileHeader.tsx                           | 7 ++++---
 .../SuggestedPeopleUploadPictureScreen.tsx                         | 1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/components/messages/ChatInput.tsx')

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(' ')];
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 50e53367..af5fd579 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -13,7 +13,6 @@ import ImagePicker from 'react-native-image-crop-picker';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import {useDispatch, useSelector} from 'react-redux';
 import {MainStackParams} from '../../routes';
-import {UniversityType} from '../../types';
 import {TaggSquareButton} from '../../components';
 import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator';
 import {SP_HEIGHT, SP_WIDTH} from '../../constants';
-- 
cgit v1.2.3-70-g09d2