Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"dependencies": {
"fs-extra": "^3.0.1",
"lodash": "^4.17.4",
"moment": "^2.24.0",
"print-message": "^2.1.0",
"prop-types": "^15.6.0",
"react-native-i18n": "^2.0.0",
"react-native-keyboard-aware-scroll-view": "^0.8.0"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions src/fields/date/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { View, Text } from 'native-base';
import I18n from 'react-native-i18n';
import moment from 'moment';
import { Platform, DatePickerIOS, DatePickerAndroid, TouchableOpacity, TimePickerAndroid } from 'react-native';
import Panel from '../../components/panel';

Expand Down Expand Up @@ -113,7 +113,7 @@ export default class DatePickerField extends Component {
}}
>
<Text>
{ (value && I18n.strftime(value, '%d %b %Y')) || 'None' }
{ (value && moment(value).format('ll')) || 'None' }
</Text>
</View>
}
Expand All @@ -128,7 +128,7 @@ export default class DatePickerField extends Component {
}}
>
<Text>
{ (value && I18n.strftime(value, '%I:%M %p')) || 'None' }
{ (value && moment(value).format('LT')) || 'None' }
</Text>
</View>
}
Expand Down Expand Up @@ -180,7 +180,7 @@ export default class DatePickerField extends Component {
}}
>
<Text onPress={this.showDatePicker}>
{ (value && I18n.strftime(value, '%d %b %Y')) || 'Date' }
{ (value && moment(value).format('ll')) || 'Date' }
</Text>
</TouchableOpacity>
}
Expand All @@ -194,7 +194,7 @@ export default class DatePickerField extends Component {
}}
>
<Text onPress={this.showTimePicker}>
{ (value && I18n.strftime(value, '%I:%M %p')) || 'Time' }
{ (value && moment(value).format('LT')) || 'Time' }
</Text>
</TouchableOpacity>
}
Expand All @@ -205,4 +205,4 @@ export default class DatePickerField extends Component {
</View>
);
}
}
}