diff --git a/lib/features/account/account_balance_card.dart b/lib/features/account/account_balance_card.dart index 24d19de2..e62e20f1 100644 --- a/lib/features/account/account_balance_card.dart +++ b/lib/features/account/account_balance_card.dart @@ -16,10 +16,12 @@ class AccountBalanceCard extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final pfis = ref.watch(pfisProvider); - final accountBalance = ref.watch(accountBalanceProvider); + // final accountBalance = ref.watch(accountBalanceProvider); - final accountTotal = accountBalance.asData?.value?.total ?? '0'; - final accountCurrency = accountBalance.asData?.value?.currencyCode ?? ''; + // final accountTotal = accountBalance.asData?.value?.total ?? '0'; + // final accountCurrency = accountBalance.asData?.value?.currencyCode ?? ''; + const accountTotal = '0'; + const accountCurrency = 'USD'; AccountBalanceNotifier getAccountBalanceNotifier() => ref.read(accountBalanceProvider.notifier); diff --git a/lib/features/payin/payin.dart b/lib/features/payin/payin.dart index 322820f5..e356880d 100644 --- a/lib/features/payin/payin.dart +++ b/lib/features/payin/payin.dart @@ -40,7 +40,7 @@ class Payin extends HookWidget { state: state, keyPress: keyPress, ), - const SizedBox(height: Grid.xs), + const SizedBox(height: Grid.half), _buildPayinLabel(context), ], ); diff --git a/lib/features/payment/payment_amount_page.dart b/lib/features/payment/payment_amount_page.dart index 7b8aa9bd..2c3618b7 100644 --- a/lib/features/payment/payment_amount_page.dart +++ b/lib/features/payment/payment_amount_page.dart @@ -91,9 +91,10 @@ class PaymentAmountPage extends HookConsumerWidget { child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: Grid.side, - vertical: Grid.xs, + padding: const EdgeInsets.only( + left: Grid.side, + right: Grid.side, + top: Grid.xxs, ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -108,7 +109,7 @@ class PaymentAmountPage extends HookConsumerWidget { transactionType: paymentState.transactionType, state: state, ), - const SizedBox(height: Grid.xl), + const SizedBox(height: Grid.lg), PaymentFeeDetails( transactionType: paymentState.transactionType, offering: state.value?.selectedOffering?.data, @@ -124,7 +125,7 @@ class PaymentAmountPage extends HookConsumerWidget { keyPress.value = NumberKeyPress(keyPress.value.count + 1, key), ), ), - const SizedBox(height: Grid.sm), + const SizedBox(height: Grid.xs), NextButton( onPressed: state.value?.payinAmount == null || state.value?.payinAmount == '0' @@ -182,7 +183,9 @@ class PaymentAmountPage extends HookConsumerWidget { state.value = AsyncData(offerings); } } on Exception catch (e) { - state.value = AsyncError(e, StackTrace.current); + if (context.mounted) { + state.value = AsyncError(e, StackTrace.current); + } } } } diff --git a/lib/features/payout/payout.dart b/lib/features/payout/payout.dart index 07dc0e86..aab08071 100644 --- a/lib/features/payout/payout.dart +++ b/lib/features/payout/payout.dart @@ -59,7 +59,7 @@ class Payout extends HookWidget { _buildPayoutCurrency(context), ], ), - const SizedBox(height: Grid.xs), + const SizedBox(height: Grid.half), _buildPayoutLabel(context), ], ); diff --git a/lib/features/send/send_page.dart b/lib/features/send/send_page.dart index 1cb1837a..6da1069f 100644 --- a/lib/features/send/send_page.dart +++ b/lib/features/send/send_page.dart @@ -83,7 +83,7 @@ class SendPage extends HookConsumerWidget { ? Padding( padding: const EdgeInsets.only(left: Grid.xxs), child: IconButton( - icon: const Icon(Icons.language, size: Grid.lg), + icon: const Icon(Icons.language, size: Grid.md), onPressed: () => Navigator.of(context).push( MaterialPageRoute( builder: (context) => const CountriesPage(), @@ -99,7 +99,7 @@ class SendPage extends HookConsumerWidget { Padding( padding: const EdgeInsets.only(right: Grid.xxs), child: IconButton( - icon: const Icon(Icons.deblur, size: Grid.lg), + icon: const Icon(Icons.deblur, size: Grid.md), onPressed: () => Navigator.of(context).push( MaterialPageRoute( builder: (context) => const LucidOfferingsPage(), diff --git a/lib/features/transaction/transaction.dart b/lib/features/transaction/transaction.dart index 43120c13..a34ac36d 100644 --- a/lib/features/transaction/transaction.dart +++ b/lib/features/transaction/transaction.dart @@ -56,6 +56,8 @@ class Transaction { ? status = TransactionStatus.payoutSuccess : status = TransactionStatus.payoutCanceled; break; + case MessageKind.cancel: + status = TransactionStatus.payoutCanceled; } if (createdAt.isAfter(latestCreatedAt)) { @@ -129,7 +131,7 @@ class Transaction { case TransactionStatus.payoutComplete: case TransactionStatus.orderSubmitted: case null: - return Theme.of(context).colorScheme.outline; + return Theme.of(context).colorScheme.surface; } } diff --git a/lib/features/transaction/transaction_tile.dart b/lib/features/transaction/transaction_tile.dart index 93b7bacb..e6b9977a 100644 --- a/lib/features/transaction/transaction_tile.dart +++ b/lib/features/transaction/transaction_tile.dart @@ -54,7 +54,13 @@ class TransactionTile extends HookConsumerWidget { ScaffoldMessenger.of(context).removeCurrentSnackBar(); ScaffoldMessenger.of(context).showSnackBar( SnackBar( - content: Text(transaction.value?.status.toString() ?? ''), + content: Text( + transaction.value?.status.toString() ?? '', + style: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of(context).colorScheme.onSurface, + ), + ), + behavior: SnackBarBehavior.floating, duration: const Duration(seconds: 1), backgroundColor: Transaction.getStatusColor( context, diff --git a/lib/shared/number/number_pad.dart b/lib/shared/number/number_pad.dart index ed191708..3a391693 100644 --- a/lib/shared/number/number_pad.dart +++ b/lib/shared/number/number_pad.dart @@ -60,8 +60,10 @@ class _NumberPadKey extends HookWidget { @override Widget build(BuildContext context) { final screenWidth = MediaQuery.of(context).size.width; - const keyHeight = 60.0; - final keyWidth = screenWidth / 4; + final screenHeight = MediaQuery.of(context).size.height; + + final keyHeight = screenHeight / 12; + final keyWidth = screenWidth / 3; const defaultFontSize = 24.0; const selectedFontSize = 44.0; diff --git a/test/features/home/home_page_test.dart b/test/features/home/home_page_test.dart index 0f7611c2..1ec868cf 100644 --- a/test/features/home/home_page_test.dart +++ b/test/features/home/home_page_test.dart @@ -81,7 +81,7 @@ void main() async { await tester.pumpWidget(homePageTestWidget()); await tester.pumpAndSettle(); - expect(find.widgetWithText(AccountBalanceCard, '101'), findsOneWidget); + expect(find.widgetWithText(AccountBalanceCard, '0'), findsOneWidget); expect(find.widgetWithText(AccountBalanceCard, 'USD'), findsOneWidget); });