diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index 1de29ad0..1b7f3f78 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -117,7 +117,7 @@ class _UpdateDeviceTransferState extends State { child: Padding( padding: const EdgeInsets.all(8.0), child: Text( - "Edit Transfer Device", + "Edit Transfer Asset", style: Theme.of(context).textTheme.headline5.copyWith(color: Theme.of(context).primaryColor, fontSize: 28, fontWeight: FontWeight.bold), ), ), diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart index af485780..c2ca75af 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_details.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart @@ -170,19 +170,11 @@ class _GasRefillDetailsState extends State { ), RequestInfoRow( title: _subtitle.startDate, - info: _model.startDate == null ? null : DateFormat.yMd().format(_model.startDate), - ), - RequestInfoRow( - title: "Start Time", - info: _model.startDate == null ? null : DateFormat.Hms().format(_model.startDate), + info: _model.startDate == null ? null : "${DateFormat.yMd().format(_model.startDate)} ${DateFormat.Hms().format(_model.startDate)}", ), RequestInfoRow( title: _subtitle.endDate, - info: _model.endDate == null ? null : DateFormat.yMd().format(_model.endDate), - ), - RequestInfoRow( - title: "End Time", - info: _model.endDate == null ? null : DateFormat.Hms().format(_model.endDate), + info: _model.endDate == null ? null : "${DateFormat.yMd().format(_model.endDate)} ${DateFormat.Hms().format(_model.endDate)}", ), _enableEdit ? Column(