aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/onboarding/BirthDatePicker.tsx4
-rw-r--r--src/components/onboarding/RegistrationWizard.tsx22
-rw-r--r--src/components/profile/ProfilePreview.tsx7
-rw-r--r--src/components/suggestedPeople/MutualFriends.tsx1
4 files changed, 11 insertions, 23 deletions
diff --git a/src/components/onboarding/BirthDatePicker.tsx b/src/components/onboarding/BirthDatePicker.tsx
index 6bef5798..c3a975dc 100644
--- a/src/components/onboarding/BirthDatePicker.tsx
+++ b/src/components/onboarding/BirthDatePicker.tsx
@@ -46,7 +46,7 @@ const BirthDatePicker = React.forwardRef(
{...props}>
{(updated || props.showPresetdate) && date
? moment(date).format('MM-DD-YYYY')
- : 'Date of Birth'}
+ : 'Birthday'}
</Text>
</TouchableOpacity>
<Modal visible={!hidden} transparent={true} animationType="fade">
@@ -92,7 +92,7 @@ const styles = StyleSheet.create({
input: {
height: 40,
fontSize: 16,
- paddingTop: '2%',
+ paddingTop: 8,
fontWeight: '600',
borderColor: '#fffdfd',
borderWidth: 2,
diff --git a/src/components/onboarding/RegistrationWizard.tsx b/src/components/onboarding/RegistrationWizard.tsx
index 437e7cfb..3c6ca80e 100644
--- a/src/components/onboarding/RegistrationWizard.tsx
+++ b/src/components/onboarding/RegistrationWizard.tsx
@@ -37,16 +37,6 @@ const RegistrationWizard = (props: RegistrationWizardProps) => {
<View
style={props.step === 'three' ? stepActiveStyle : stepStyle}
/>
- <View style={styles.progress} />
- <View style={props.step === 'four' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View style={props.step === 'five' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View style={props.step === 'six' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View
- style={props.step === 'seven' ? stepActiveStyle : stepStyle}
- />
</View>
</Animatable.View>
)}
@@ -60,16 +50,6 @@ const RegistrationWizard = (props: RegistrationWizardProps) => {
<View
style={props.step === 'three' ? stepActiveStyle : stepStyle}
/>
- <View style={styles.progress} />
- <View style={props.step === 'four' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View style={props.step === 'five' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View style={props.step === 'six' ? stepActiveStyle : stepStyle} />
- <View style={styles.progress} />
- <View
- style={props.step === 'seven' ? stepActiveStyle : stepStyle}
- />
</View>
</Animatable.View>
)}
@@ -94,7 +74,7 @@ const styles = StyleSheet.create({
backgroundColor: '#e1f0ff',
},
progress: {
- width: '10%',
+ width: '35%',
height: 2,
backgroundColor: '#e1f0ff',
},
diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx
index 02ab94e7..0021b1c6 100644
--- a/src/components/profile/ProfilePreview.tsx
+++ b/src/components/profile/ProfilePreview.tsx
@@ -37,12 +37,14 @@ interface ProfilePreviewProps extends ViewProps {
profilePreview: ProfilePreviewType;
previewType: PreviewType;
screenType: ScreenType;
+ setMFDrawer?: Function;
}
const ProfilePreview: React.FC<ProfilePreviewProps> = ({
profilePreview: {username, first_name, last_name, id, thumbnail_url},
previewType,
screenType,
+ setMFDrawer,
}) => {
const navigation = useNavigation();
const {user: loggedInUser} = useSelector((state: RootState) => state.user);
@@ -139,6 +141,11 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({
);
}
+ // Close Mutual Friends drawer on suggested people upon navigation
+ if (setMFDrawer) {
+ setMFDrawer(false);
+ }
+
navigation.push('Profile', {
userXId,
screenType,
diff --git a/src/components/suggestedPeople/MutualFriends.tsx b/src/components/suggestedPeople/MutualFriends.tsx
index fdda104a..f72104d4 100644
--- a/src/components/suggestedPeople/MutualFriends.tsx
+++ b/src/components/suggestedPeople/MutualFriends.tsx
@@ -70,6 +70,7 @@ const MutualFriends: React.FC<MutualFriendsProps> = ({
previewType={'Suggested People Drawer'}
screenType={ScreenType.SuggestedPeople}
profilePreview={profilePreview}
+ setMFDrawer={setDrawerVisible}
/>
))}
</ScrollView>