Skip to content

Unify datetime format in Orders & Transactions #1094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
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
17 changes: 17 additions & 0 deletions app/lib/helpers/transaction_helpers.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:decimal/decimal.dart';
// ignore: depend_on_referenced_packages
import 'package:intl/intl.dart';
import 'package:threebotlogin/helpers/logger.dart';

String formatAmount(String amount) {
double parsedAmount = roundAmount(amount).toDouble();
Expand All @@ -12,3 +13,19 @@ Decimal roundAmount(String amount) {
Decimal parsedAmount = Decimal.parse(amount).shift(2).floor().shift(-2);
return parsedAmount;
}

/// Formats an ISO date string to a user-friendly format
/// Uses the same format as the overview screen: yyyy-MM-dd HH:mm:ss
String formatDateTime(String isoString) {
try {
DateTime dateTime = DateTime.parse(isoString).toLocal();
return '${dateTime.year}-${_twoDigits(dateTime.month)}-${_twoDigits(dateTime.day)} '
'${_twoDigits(dateTime.hour)}:${_twoDigits(dateTime.minute)}:${_twoDigits(dateTime.second)}';
} catch (e) {
logger.e('Error formatting date: $e');
return 'Unknown date';
}
}

/// Helper function to pad single digits with leading zero
String _twoDigits(int n) => n.toString().padLeft(2, '0');
3 changes: 2 additions & 1 deletion app/lib/screens/market/order_details.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:stellar_client/models/exceptions.dart';
import 'package:threebotlogin/helpers/transaction_helpers.dart';
import 'package:threebotlogin/models/offer.dart';
import 'package:threebotlogin/models/wallet.dart';
import 'package:threebotlogin/services/stellar_service.dart' as Stellar;
Expand Down Expand Up @@ -327,7 +328,7 @@ class _OrderDetailsWidgetState extends State<OrderDetailsWidget> {
),
),
Text(
widget.offer.lastModifiedTime,
formatDateTime(widget.offer.lastModifiedTime),
style: Theme.of(context)
.textTheme
.bodyMedium!
Expand Down
13 changes: 3 additions & 10 deletions app/lib/screens/market/overview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/helpers/transaction_helpers.dart';
import 'package:threebotlogin/models/market_data.dart';
import 'package:threebotlogin/models/wallet.dart';
import 'package:threebotlogin/providers/wallets_provider.dart';
Expand Down Expand Up @@ -136,7 +137,7 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
marketData = data;
failed = false;
});
lastUpdated = _formattedDateTime();
lastUpdated = formatDateTime(DateTime.now().toIso8601String());
return data;
} catch (e) {
setState(() {
Expand All @@ -158,14 +159,6 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {
});
}

String _formattedDateTime() {
final now = DateTime.now();
return '${now.year}-${_twoDigits(now.month)}-${_twoDigits(now.day)} '
'${_twoDigits(now.hour)}:${_twoDigits(now.minute)}:${_twoDigits(now.second)}';
}

String _twoDigits(int n) => n.toString().padLeft(2, '0');

@override
void dispose() {
_timer.cancel();
Expand Down Expand Up @@ -572,7 +565,7 @@ class _OverviewWidgetState extends ConsumerState<OverviewWidget> {

setState(() {
this.marketData = marketData;
lastUpdated = _formattedDateTime();
lastUpdated = formatDateTime(DateTime.now().toIso8601String());
failed = false;
});
} catch (e) {
Expand Down
12 changes: 1 addition & 11 deletions app/lib/widgets/market/order_card.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:threebotlogin/helpers/logger.dart';
import 'package:threebotlogin/helpers/transaction_helpers.dart';
import 'package:threebotlogin/models/offer.dart';
import 'package:intl/intl.dart';
import 'package:threebotlogin/models/wallet.dart' as Wallet;
import 'package:threebotlogin/screens/market/order_details.dart';

Expand All @@ -21,16 +21,6 @@ class OrderCardWidget extends ConsumerStatefulWidget {
}

class _OrderCardWidgetState extends ConsumerState<OrderCardWidget> {
String formatDateTime(String isoString) {
try {
DateTime dateTime = DateTime.parse(isoString).toLocal();
return DateFormat('yyyy-MM-dd HH:mm:ss').format(dateTime);
} catch (e) {
logger.e('Error formatting date: $e');
return 'Unknown date';
}
}

@override
Widget build(BuildContext context) {
try {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/widgets/wallets/transaction.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class TransactionWidget extends StatelessWidget {
: Theme.of(context).colorScheme.error,
)),
),
Text(transaction.date,
Text(formatDateTime(transaction.date),
overflow: TextOverflow.ellipsis,
style: Theme.of(context)
.textTheme
Expand Down
2 changes: 1 addition & 1 deletion app/lib/widgets/wallets/transaction_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class TransactionDetails extends StatelessWidget {
const Divider(),
buildDetailRow('Asset', transaction.asset),
const Divider(),
buildDetailRow('Date', transaction.date),
buildDetailRow('Date', formatDateTime(transaction.date)),
const Divider(),
buildDetailRow('Memo', transaction.memo),
const Divider(),
Expand Down