Merge branch 'master' into tma-634-badge-selection-screen

# Conflicts:
#	src/components/taggs/SocialMediaInfo.tsx

3 files changed, 4 insertions, 24 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/LinkSocialMedia.tsx b/src/components/onboarding/LinkSocialMedia.tsx
index f3915752..eb3cf218 100644
--- a/src/components/onboarding/LinkSocialMedia.tsx
+++ b/src/components/onboarding/LinkSocialMedia.tsx
@@ -7,7 +7,7 @@ import {
   TouchableOpacity,
   TouchableOpacityProps,
 } from 'react-native';
-import {SocialLinkModal} from '..';
+import {SocialLinkModal} from '../common';
 import {
   INTEGRATED_SOCIAL_LIST,
   SOCIAL_FONT_COLORS,
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',
   },