diff --git a/package.json b/package.json
index edfced1..13c62de 100644
--- a/package.json
+++ b/package.json
@@ -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": {
diff --git a/src/fields/date/index.js b/src/fields/date/index.js
index b5d8e01..bcc7432 100644
--- a/src/fields/date/index.js
+++ b/src/fields/date/index.js
@@ -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';
 
@@ -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>
             }
@@ -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>
             }
@@ -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>
             }
@@ -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>
             }
@@ -205,4 +205,4 @@ export default class DatePickerField extends Component {
       </View>
     );
   }
-}
\ No newline at end of file
+}