Merge branch 'master' into TMA-546-Onboarding-Page

2 files changed, 11 insertions, 3 deletions

diff --git a/src/components/onboarding/BirthDatePicker.tsx b/src/components/onboarding/BirthDatePicker.tsx
index 0fc597c3..6bef5798 100644
--- a/src/components/onboarding/BirthDatePicker.tsx
+++ b/src/components/onboarding/BirthDatePicker.tsx
@@ -45,7 +45,7 @@ const BirthDatePicker = React.forwardRef(
             ref={ref}
             {...props}>
             {(updated || props.showPresetdate) && date
-              ? moment(date).format('YYYY-MM-DD')
+              ? moment(date).format('MM-DD-YYYY')
               : 'Date of Birth'}
           </Text>
         </TouchableOpacity>
diff --git a/src/components/onboarding/TaggBigInput.tsx b/src/components/onboarding/TaggBigInput.tsx
index 4e8e1ef7..0e42bd13 100644
--- a/src/components/onboarding/TaggBigInput.tsx
+++ b/src/components/onboarding/TaggBigInput.tsx
@@ -1,5 +1,11 @@
 import React from 'react';
-import {View, TextInput, StyleSheet, TextInputProps} from 'react-native';
+import {
+  View,
+  TextInput,
+  StyleSheet,
+  TextInputProps,
+  ViewStyle,
+} from 'react-native';
 import * as Animatable from 'react-native-animatable';
 import {TAGG_LIGHT_PURPLE} from '../../constants';
 
@@ -8,13 +14,15 @@ interface TaggBigInputProps extends TextInputProps {
   invalidWarning?: string;
   attemptedSubmit?: boolean;
   width?: number | string;
+  containerStyle?: ViewStyle;
 }
 /**
  * An input component that receives all props a normal TextInput component does. TaggInput components grow to 60% of their parent's width by default, but this can be set using the `width` prop.
  */
 const TaggBigInput = React.forwardRef((props: TaggBigInputProps, ref: any) => {
   return (
-    <View style={styles.container}>
+    <View
+      style={props.containerStyle ? props.containerStyle : styles.container}>
       <TextInput
         style={[{width: props.width}, styles.input]}
         placeholderTextColor="#ddd"