Skip to content
Merged
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
4 changes: 2 additions & 2 deletions lib/shared/utils/formatters.dart
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,10 @@ String truncateMiddleSymbols(
String formatTransactionDateTime(Transaction tx) {
if (tx.timestamp == DateTime.fromMillisecondsSinceEpoch(0) &&
tx.confirmations == 0) {
return 'unconfirmed';
return 'Unconfirmed';
} else if (tx.timestamp == DateTime.fromMillisecondsSinceEpoch(0) &&
tx.confirmations > 0) {
return 'confirmed';
return 'Now';
} else {
return DateFormat('dd MMM yyyy HH:mm').format(tx.timestamp);
}
Expand Down
25 changes: 12 additions & 13 deletions lib/shared/widgets/copied_text.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:komodo_ui_kit/komodo_ui_kit.dart';
import 'package:web_dex/shared/utils/utils.dart';
import 'package:web_dex/shared/widgets/truncate_middle_text.dart';

Expand Down Expand Up @@ -68,15 +69,15 @@ class CopiedText extends StatelessWidget {
),
),
)
: Text(
copiedValue,
maxLines: maxLines,
softWrap: softWrap,
style: TextStyle(
fontSize: fontSize,
fontWeight: fontWeight,
color: fontColor,
height: height,
: Flexible(
child: AutoScrollText(
text: copiedValue,
style: TextStyle(
fontSize: fontSize,
fontWeight: fontWeight,
color: fontColor,
height: height,
),
),
),
),
Expand Down Expand Up @@ -162,10 +163,8 @@ class CopiedTextV2 extends StatelessWidget {
color: textColor ?? const Color(0xFFADAFC4)),
),
)
: Text(
copiedValue,
maxLines: maxLines,
softWrap: softWrap,
: AutoScrollText(
text: copiedValue,
style: TextStyle(
fontSize: fontSize,
fontWeight: FontWeight.w700,
Expand Down
12 changes: 0 additions & 12 deletions lib/views/support/missing_coins_dialog.dart
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:web_dex/app_config/app_config.dart';
import 'package:web_dex/bloc/auth_bloc/auth_bloc.dart';
import 'package:web_dex/bloc/coins_bloc/coins_bloc.dart';
import 'package:web_dex/common/screen.dart';
import 'package:web_dex/generated/codegen_loader.g.dart';
import 'package:web_dex/dispatchers/popup_dispatcher.dart';
import 'package:web_dex/model/authorize_mode.dart';
import 'package:web_dex/model/wallet.dart';
import 'package:web_dex/views/wallets_manager/wallets_manager_events_factory.dart';
import 'package:web_dex/views/wallets_manager/wallets_manager_wrapper.dart';
import 'package:app_theme/app_theme.dart';

Future<void> showMissingCoinsDialog(BuildContext context) {
return showDialog(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class AddressCard extends StatelessWidget {
children: [
AddressIcon(address: address.address),
const SizedBox(width: 8),
AddressText(address: address.address),
Flexible(child: AddressText(address: address.address)),
const SizedBox(width: 8),
if (coin.hasFaucet)
ConstrainedBox(
Expand All @@ -249,7 +249,7 @@ class AddressCard extends StatelessWidget {
),
),
SwapAddressTag(address: address),
const Spacer(),
const SizedBox(width: 8),
AddressCopyButton(
address: address.address,
coinAbbr: coin.abbr,
Expand All @@ -269,7 +269,7 @@ class AddressCard extends StatelessWidget {
width: double.infinity,
child: Row(
children: [
AddressText(address: address.address),
Flexible(child: AddressText(address: address.address)),
const SizedBox(width: 8),
AddressCopyButton(
address: address.address,
Expand Down
118 changes: 57 additions & 61 deletions lib/views/wallet/coin_details/transactions/transaction_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import 'package:web_dex/model/coin.dart';
import 'package:web_dex/shared/utils/formatters.dart';
import 'package:web_dex/shared/utils/utils.dart';
import 'package:web_dex/shared/widgets/copied_text.dart';
import 'package:web_dex/views/wallet/common/address_copy_button.dart';

class TransactionDetails extends StatelessWidget {
const TransactionDetails({
Expand Down Expand Up @@ -112,9 +113,22 @@ class TransactionDetails extends StatelessWidget {
title: LocaleKeys.transactionHash.tr(),
value: transaction.txHash ?? '',
isCopied: true,
isTruncated: true,
),
const SizedBox(height: 20),
_buildAddresses(isMobile, context),
SizedBox(height: 16),
_buildSimpleData(
context,
title: LocaleKeys.from.tr(),
value: transaction.from.first,
isCopied: true,
),
_buildSimpleData(
context,
title: LocaleKeys.to.tr(),
value: transaction.to.first,
isCopied: true,
),
SizedBox(height: 16),
_buildControls(context, isMobile),
],
),
Expand All @@ -131,27 +145,34 @@ class TransactionDetails extends StatelessWidget {
required String title,
required String address,
}) {
return Padding(
padding: const EdgeInsets.only(bottom: 20),
return Container(
margin: const EdgeInsets.only(bottom: 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
title,
style:
Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
// Title with fixed flex
Expanded(
flex: 2,
child: Text(
title,
style:
Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
),
),
const SizedBox(width: 8),
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 200),
child: CopiedText(
copiedValue: address,
isTruncated: true,
padding: const EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
),
fontSize: 14,
// Address and copy button
Expanded(
flex: 5,
child: Row(
children: [
Expanded(
child: AutoScrollText(
text: address,
style: const TextStyle(fontSize: 14),
),
),
const SizedBox(width: 8),
AddressCopyButton(address: address),
],
),
),
],
Expand All @@ -163,47 +184,21 @@ class TransactionDetails extends StatelessWidget {
return Container(
width: double.infinity,
padding: const EdgeInsets.only(bottom: 10),
child: isMobile
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildAddress(
context,
title: LocaleKeys.from.tr(),
address: transaction.from.first,
),
_buildAddress(
context,
title: LocaleKeys.to.tr(),
address: transaction.to.first,
),
],
)
: Row(
children: [
Expanded(
child: Container(
alignment: Alignment.centerLeft,
child: _buildAddress(
context,
title: LocaleKeys.from.tr(),
address: transaction.from.first,
),
),
),
const SizedBox(width: 10),
Expanded(
child: Container(
alignment: Alignment.centerLeft,
child: _buildAddress(
context,
title: LocaleKeys.to.tr(),
address: transaction.to.first,
),
),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildAddress(
context,
title: LocaleKeys.from.tr(),
address: transaction.from.first,
),
_buildAddress(
context,
title: LocaleKeys.to.tr(),
address: transaction.to.first,
),
],
),
);
}

Expand Down Expand Up @@ -352,6 +347,7 @@ class TransactionDetails extends StatelessWidget {
required String value,
bool hasBackground = false,
bool isCopied = false,
bool isTruncated = false,
}) {
return Padding(
padding: const EdgeInsets.only(bottom: 10.0),
Expand All @@ -376,7 +372,7 @@ class TransactionDetails extends StatelessWidget {
constraints: const BoxConstraints(maxHeight: 340),
child: CopiedText(
copiedValue: value,
isTruncated: true,
isTruncated: isTruncated,
padding: const EdgeInsets.symmetric(
vertical: 8,
horizontal: 16,
Expand Down
43 changes: 18 additions & 25 deletions lib/views/wallet/coin_details/transactions/transaction_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,28 @@ class _List extends StatelessWidget {
child: Column(
children: [
if (transactions.isNotEmpty && !isMobile) const HistoryTitle(),
Card(
margin: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0),
),
color: theme.custom.dexPageTheme.frontPlate,
child: Padding(
padding: EdgeInsets.all(isMobile ? 16.0 : 24.0),
child: isMobile
? HistoryListContent(
Padding(
padding: EdgeInsets.all(isMobile ? 16.0 : 0),
child: isMobile
? HistoryListContent(
transactions: transactions,
coinAbbr: coinAbbr,
setTransaction: setTransaction,
isInProgress: isInProgress,
)
: Card(
margin: const EdgeInsets.symmetric(vertical: 6),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0),
),
color: Theme.of(context).colorScheme.onSurface,
child: HistoryListContent(
transactions: transactions,
coinAbbr: coinAbbr,
setTransaction: setTransaction,
isInProgress: isInProgress,
)
: Card(
margin: const EdgeInsets.symmetric(vertical: 6),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16.0),
),
color: Theme.of(context).colorScheme.onSurface,
child: HistoryListContent(
transactions: transactions,
coinAbbr: coinAbbr,
setTransaction: setTransaction,
isInProgress: isInProgress,
),
),
),
),
),
],
),
Expand Down Expand Up @@ -144,7 +137,7 @@ class HistoryTitle extends StatelessWidget {
child: Align(
alignment: Alignment.centerLeft,
child: Text(
LocaleKeys.lastTransactions.tr(),
LocaleKeys.transactions.tr(),
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: isMobile ? 16 : 24,
Expand Down
Loading
Loading