From 91330b019937ef433aeb4165659a4cadde531136 Mon Sep 17 00:00:00 2001 From: Robert Malikowski Date: Mon, 24 Aug 2026 12:04:34 +0200 Subject: [PATCH] fix --- lib/new-ui/pages/buy_sell/buy_sell_amount_page.dart | 10 ++++++---- lib/new-ui/pages/buy_sell/buy_sell_provider_page.dart | 6 ++---- lib/new-ui/widgets/floating_amount_input.dart | 5 +++-- .../screens/connect_device/connect_device_page.dart | 5 ++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/new-ui/pages/buy_sell/buy_sell_amount_page.dart b/lib/new-ui/pages/buy_sell/buy_sell_amount_page.dart index 41c276cb3..f9fec1fd0 100644 --- a/lib/new-ui/pages/buy_sell/buy_sell_amount_page.dart +++ b/lib/new-ui/pages/buy_sell/buy_sell_amount_page.dart @@ -10,6 +10,8 @@ import "package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_args. import "package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_sheet.dart"; import "package:cake_wallet/new-ui/widgets/currency_picker/fiat_currency_picker_sheet.dart"; import "package:cake_wallet/new-ui/widgets/floating_amount_input.dart"; +import "package:cake_wallet/new-ui/widgets/money/currency_symbol_text.dart"; +import "package:cake_wallet/new-ui/widgets/money/money_text.dart"; import "package:cake_wallet/new-ui/widgets/new_primary_button.dart"; import "package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart"; import "package:cake_wallet/new-ui/widgets/token_chain_display.dart"; @@ -374,8 +376,8 @@ class BuySellAmountPill extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ if (amount != null) - Text( - amount!.toStringWithPrecision(fractionalDigits: 0), + MoneyText( + amount!, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600), ), Text( @@ -444,8 +446,8 @@ class BuySellCurrencyPickerPill extends StatelessWidget { Text( curr.fullName ?? curr.symbol, ), - Text( - curr.symbol, + CurrencySymbolText( + curr, style: TextStyle( fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant, diff --git a/lib/new-ui/pages/buy_sell/buy_sell_provider_page.dart b/lib/new-ui/pages/buy_sell/buy_sell_provider_page.dart index 4a563e3bf..99c91c13b 100644 --- a/lib/new-ui/pages/buy_sell/buy_sell_provider_page.dart +++ b/lib/new-ui/pages/buy_sell/buy_sell_provider_page.dart @@ -7,6 +7,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/new-ui/pages/buy_sell/buy_sell_confirmation_page.dart'; import 'package:cake_wallet/new-ui/pages/buy_sell/buy_sell_payment_method_page.dart'; import 'package:cake_wallet/new-ui/widgets/buy_sell/buy_sell_selector_modal.dart'; +import "package:cake_wallet/new-ui/widgets/money/money_text.dart"; import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart'; import 'package:cake_wallet/src/widgets/new_list_row/new_list_section.dart'; import 'package:cake_wallet/view_model/buy/buy_sell_view_model.dart'; @@ -160,10 +161,7 @@ class _BuySellProviderPageState extends State { mainAxisAlignment: MainAxisAlignment.center, spacing: 4, children: [ - Text(widget.buySellViewModel - .amountForQuote(quote) - ?.toStringWithSymbol(fractionalDigits: 8) ?? - ""), + MoneyText.optional(widget.buySellViewModel.amountForQuote(quote)), if (fiatAmount != null) Text( "= ${fiatAmount.toStringWithSymbol(fractionalDigits: 2, trimZeros: false)}", diff --git a/lib/new-ui/widgets/floating_amount_input.dart b/lib/new-ui/widgets/floating_amount_input.dart index 7fb230452..237f85825 100644 --- a/lib/new-ui/widgets/floating_amount_input.dart +++ b/lib/new-ui/widgets/floating_amount_input.dart @@ -1,3 +1,4 @@ +import "package:cake_wallet/new-ui/widgets/money/currency_symbol_text.dart"; import 'package:cw_core/currency.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -80,8 +81,8 @@ class _FloatingAmountInputState extends State { ), ), const SizedBox(width: 8), - Text( - widget.currency.symbol, + CurrencySymbolText( + widget.currency, maxLines: 1, overflow: TextOverflow.ellipsis, style: Theme.of(context).textTheme.displayMedium?.copyWith( diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index 4a049993a..746910348 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -195,9 +195,8 @@ class ConnectDevicePageBodyState extends State { final isConnected = await widget.hardwareWalletVM.connectDevice(device, widget.walletType); _isConnectPressed = false; - WidgetsBinding.instance.addPostFrameCallback((_) { - if (isConnected) - { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (isConnected) { widget.onConnectDevice(navigatorKey.currentContext!, widget.hardwareWalletVM); } });