From 7f32e6f239cd1458f2e81668f7c940ff103319f4 Mon Sep 17 00:00:00 2001
From: ankit-thanekar007 <ankit.thanekar007@gmail.com>
Date: Fri, 19 Mar 2021 10:47:10 -0700
Subject: UAT bug fixes'

---
 src/components/moments/CaptionScreenHeader.tsx      | 7 ++-----
 src/components/moments/IndividualMomentTitleBar.tsx | 8 +++++++-
 src/components/moments/Moment.tsx                   | 1 +
 src/screens/main/NotificationsScreen.tsx            | 1 +
 src/screens/onboarding/OnboardingStepTwo.tsx        | 2 +-
 src/screens/onboarding/RegistrationTwo.tsx          | 2 +-
 src/screens/profile/CaptionScreen.tsx               | 6 ++----
 7 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/components/moments/CaptionScreenHeader.tsx b/src/components/moments/CaptionScreenHeader.tsx
index 46dfddfe..0638c128 100644
--- a/src/components/moments/CaptionScreenHeader.tsx
+++ b/src/components/moments/CaptionScreenHeader.tsx
@@ -21,18 +21,15 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    height: '5%',
   },
   headerContainer: {
-    position: 'absolute',
-    left: '50%',
+    width: '90%',
   },
   header: {
-    position: 'relative',
-    right: '50%',
     fontSize: 20,
     fontWeight: 'bold',
     color: 'white',
+    textAlign: 'center',
   },
 });
 export default CaptionScreenHeader;
diff --git a/src/components/moments/IndividualMomentTitleBar.tsx b/src/components/moments/IndividualMomentTitleBar.tsx
index 6cdfe0e8..88e0c308 100644
--- a/src/components/moments/IndividualMomentTitleBar.tsx
+++ b/src/components/moments/IndividualMomentTitleBar.tsx
@@ -18,7 +18,9 @@ const IndividualMomentTitleBar: React.FC<IndividualMomentTitleBarProps> = ({
       <TouchableOpacity style={styles.closeButton} onPress={close}>
         <CloseIcon height={'100%'} width={'100%'} color={'white'} />
       </TouchableOpacity>
-      <Text style={styles.header}>{title}</Text>
+      <View style={styles.headerContainer}>
+        <Text style={styles.header}>{title}</Text>
+      </View>
     </View>
   );
 };
@@ -30,6 +32,10 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     height: '5%',
   },
+  headerContainer: {
+    flexShrink: 1,
+    marginLeft: '11%',
+  },
   header: {
     color: 'white',
     fontSize: normalize(18),
diff --git a/src/components/moments/Moment.tsx b/src/components/moments/Moment.tsx
index 10cf6070..e972a1ca 100644
--- a/src/components/moments/Moment.tsx
+++ b/src/components/moments/Moment.tsx
@@ -171,6 +171,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   titleText: {
+    width: '80%',
     fontSize: normalize(16),
     fontWeight: 'bold',
     color: TAGG_LIGHT_BLUE,
diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index 501c44fc..57dea6f5 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -285,6 +285,7 @@ const NotificationsScreen: React.FC = () => {
         </View>
         <SectionList
           contentContainerStyle={styles.container}
+          stickySectionHeadersEnabled={false}
           sections={sectionedNotifications}
           keyExtractor={(_item, index) => index.toString()}
           renderItem={renderNotification}
diff --git a/src/screens/onboarding/OnboardingStepTwo.tsx b/src/screens/onboarding/OnboardingStepTwo.tsx
index 93342c3f..1014981d 100644
--- a/src/screens/onboarding/OnboardingStepTwo.tsx
+++ b/src/screens/onboarding/OnboardingStepTwo.tsx
@@ -247,7 +247,7 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
         <TaggInput
           accessibilityHint="Enter your email."
           accessibilityLabel="Email input field."
-          placeholder="Email"
+          placeholder="School Email"
           autoCompleteType="email"
           textContentType="emailAddress"
           autoCapitalize="none"
diff --git a/src/screens/onboarding/RegistrationTwo.tsx b/src/screens/onboarding/RegistrationTwo.tsx
index 707e621a..e21bade4 100644
--- a/src/screens/onboarding/RegistrationTwo.tsx
+++ b/src/screens/onboarding/RegistrationTwo.tsx
@@ -214,7 +214,7 @@ const RegistrationTwo: React.FC<RegistrationTwoProps> = ({
         <TaggInput
           accessibilityHint="Enter your email."
           accessibilityLabel="Email input field."
-          placeholder="Email"
+          placeholder="Student Email"
           autoCompleteType="email"
           textContentType="emailAddress"
           autoCapitalize="none"
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 01e859ba..998897e2 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -152,10 +152,8 @@ const styles = StyleSheet.create({
     position: 'relative',
     backgroundColor: 'white',
     width: '100%',
-    paddingLeft: '2%',
-    paddingRight: '2%',
-    paddingBottom: '1%',
-    paddingTop: '1%',
+    paddingHorizontal: '2%',
+    paddingVertical: '1%',
     height: 60,
   },
 });
-- 
cgit v1.2.3-70-g09d2


From 8a6660916ab472a83b24a03dbc77a480a45488bb Mon Sep 17 00:00:00 2001
From: ankit-thanekar007 <ankit.thanekar007@gmail.com>
Date: Fri, 19 Mar 2021 11:01:55 -0700
Subject: Typo fix

---
 src/screens/onboarding/OnboardingStepTwo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/screens/onboarding/OnboardingStepTwo.tsx b/src/screens/onboarding/OnboardingStepTwo.tsx
index 1014981d..06a4f49b 100644
--- a/src/screens/onboarding/OnboardingStepTwo.tsx
+++ b/src/screens/onboarding/OnboardingStepTwo.tsx
@@ -247,7 +247,7 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
         <TaggInput
           accessibilityHint="Enter your email."
           accessibilityLabel="Email input field."
-          placeholder="School Email"
+          placeholder="Student Email"
           autoCompleteType="email"
           textContentType="emailAddress"
           autoCapitalize="none"
-- 
cgit v1.2.3-70-g09d2


From b71263ae8d5cd0fdd30d8655bbf3526d9996b0f8 Mon Sep 17 00:00:00 2001
From: ankit-thanekar007 <ankit.thanekar007@gmail.com>
Date: Fri, 19 Mar 2021 11:03:35 -0700
Subject: Typo Typo fix

---
 src/screens/onboarding/OnboardingStepTwo.tsx | 2 +-
 src/screens/onboarding/RegistrationTwo.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/screens/onboarding/OnboardingStepTwo.tsx b/src/screens/onboarding/OnboardingStepTwo.tsx
index 06a4f49b..1014981d 100644
--- a/src/screens/onboarding/OnboardingStepTwo.tsx
+++ b/src/screens/onboarding/OnboardingStepTwo.tsx
@@ -247,7 +247,7 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
         <TaggInput
           accessibilityHint="Enter your email."
           accessibilityLabel="Email input field."
-          placeholder="Student Email"
+          placeholder="School Email"
           autoCompleteType="email"
           textContentType="emailAddress"
           autoCapitalize="none"
diff --git a/src/screens/onboarding/RegistrationTwo.tsx b/src/screens/onboarding/RegistrationTwo.tsx
index e21bade4..6d7b2226 100644
--- a/src/screens/onboarding/RegistrationTwo.tsx
+++ b/src/screens/onboarding/RegistrationTwo.tsx
@@ -214,7 +214,7 @@ const RegistrationTwo: React.FC<RegistrationTwoProps> = ({
         <TaggInput
           accessibilityHint="Enter your email."
           accessibilityLabel="Email input field."
-          placeholder="Student Email"
+          placeholder="School Email"
           autoCompleteType="email"
           textContentType="emailAddress"
           autoCapitalize="none"
-- 
cgit v1.2.3-70-g09d2