changed places for save icon

src/components/basicHeader/view/basicHeaderStyles.js

@@ -19,7 +19,7 @@ export default EStyleSheet.create({
   saveIcon: {
     fontSize: 20,
     color: '$iconColor',
-    marginLeft: 15,
+    width: 50,
   },
   savedIcon: {
     color: '#a1c982',
@@ -36,7 +36,6 @@ export default EStyleSheet.create({
   quickTitle: {
     fontSize: 10,
     color: '$iconColor',
-    marginLeft: 24,
     alignSelf: 'center',
   },
   rightIcon: {

src/components/basicHeader/view/basicHeaderView.js

@@ -105,19 +105,11 @@ class BasicHeaderView extends Component {
               disabled={disabled}
             />
             {isHasIcons && !isReply && (
-              <View>
+              <DateTimePicker
-                {!isDraftSaving ? (
+                type="date-time"
-                  <IconButton
+                onSubmit={this._handleDatePickerChange}
-                    iconStyle={[styles.saveIcon, isDraftSaved && styles.savedIcon]}
+                disabled={!isFormValid}
-                    iconType="MaterialIcons"
-                    name="save"
-                    size={25}
-                    onPress={() => handleOnSaveButtonPress && handleOnSaveButtonPress()}
               />
-                ) : (
-                  <ActivityIndicator style={styles.textButtonWrapper} />
-                )}
-              </View>
             )}
 
             {!isInputVisible && (
@@ -184,11 +176,19 @@ class BasicHeaderView extends Component {
           {isHasIcons && (
             <Fragment>
               {!isReply && (
-                <DateTimePicker
+                <Fragment>
-                  type="date-time"
+                  {!isDraftSaving ? (
-                  onSubmit={this._handleDatePickerChange}
+                    <IconButton
-                  disabled={!isFormValid}
+                      iconStyle={[styles.saveIcon, isDraftSaved && styles.savedIcon]}
+                      iconType="MaterialIcons"
+                      name="save"
+                      size={25}
+                      onPress={() => handleOnSaveButtonPress && handleOnSaveButtonPress()}
                     />
+                  ) : (
+                    <ActivityIndicator style={styles.textButtonWrapper} />
+                  )}
+                </Fragment>
               )}
               <IconButton
                 style={styles.iconButton}

src/components/dateTimePicker/view/dateTimePickerStyles.js

@@ -35,5 +35,6 @@ export default EStyleSheet.create({
   },
   picker: {
     width: 50,
+    marginLeft: 20,
   },
 });

src/components/dateTimePicker/view/dateTimePickerView.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-wrap-multilines */
 import React, { PureComponent } from 'react';
 import DatePicker from 'react-native-datepicker';
 import moment from 'moment';