From 1ce64cd1577e810517f5ee99deaf8bce4f8b8c4d Mon Sep 17 00:00:00 2001 From: likho Date: Wed, 5 Jul 2023 18:18:49 +0200 Subject: [PATCH] Fix on chain notes showing for other coins --- .../send_view/confirm_transaction_view.dart | 8 +++-- lib/pages/send_view/send_view.dart | 3 ++ .../transaction_details_view.dart | 33 ++++++------------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/pages/send_view/confirm_transaction_view.dart b/lib/pages/send_view/confirm_transaction_view.dart index 80a59c8fd..4d358329d 100644 --- a/lib/pages/send_view/confirm_transaction_view.dart +++ b/lib/pages/send_view/confirm_transaction_view.dart @@ -497,6 +497,7 @@ class _ConfirmTransactionViewState const SizedBox( height: 12, ), + if (coin == Coin.epicCash) RoundedWhiteContainer( child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, @@ -515,9 +516,10 @@ class _ConfirmTransactionViewState ], ), ), - const SizedBox( - height: 12, - ), + if (coin == Coin.epicCash) + const SizedBox( + height: 12, + ), RoundedWhiteContainer( child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart index 382567c59..e9a855c7b 100644 --- a/lib/pages/send_view/send_view.dart +++ b/lib/pages/send_view/send_view.dart @@ -1806,9 +1806,11 @@ class _SendViewState extends ConsumerState { style: STextStyles.smallMed12(context), textAlign: TextAlign.left, ), + if (coin == Coin.epicCash) const SizedBox( height: 8, ), + if (coin == Coin.epicCash) ClipRRect( borderRadius: BorderRadius.circular( Constants.size.circularBorderRadius, @@ -1849,6 +1851,7 @@ class _SendViewState extends ConsumerState { ), ), ), + if (coin == Coin.epicCash) const SizedBox( height: 12, ), diff --git a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart index 32d83e641..e8ccf98de 100644 --- a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart +++ b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart @@ -783,6 +783,7 @@ class _TransactionDetailsViewState : const SizedBox( height: 12, ), + if (coin == Coin.epicCash) RoundedWhiteContainer( padding: isDesktop ? const EdgeInsets.all(16) @@ -797,33 +798,20 @@ class _TransactionDetailsViewState crossAxisAlignment: CrossAxisAlignment.start, children: [ - ConditionalParent( - condition: kDebugMode, - builder: (child) { - return Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - child, - ], - ); - }, - child: Text( - "On chain note", - style: isDesktop - ? STextStyles - .desktopTextExtraExtraSmall( - context) - : STextStyles.itemSubtitle( - context), - ), + Text( + "On chain note", + style: isDesktop + ? STextStyles + .desktopTextExtraExtraSmall( + context) + : STextStyles.itemSubtitle( + context), ), const SizedBox( height: 8, ), SelectableText( - _transaction.otherData!, + _transaction.otherData ?? "", style: isDesktop ? STextStyles .desktopTextExtraExtraSmall( @@ -854,7 +842,6 @@ class _TransactionDetailsViewState : const SizedBox( height: 12, ), - RoundedWhiteContainer( padding: isDesktop ? const EdgeInsets.all(16)