From 45cba318ce81a1d9cafa4e493d75ba259c0d39f6 Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Tue, 2 Jun 2026 14:12:56 +0200 Subject: [PATCH] refactor: replace deprecated SVG resource, adjust device tap behavior, and improve wallet selection image rendering (#3276) * refactor: replace deprecated SVG resource, adjust device tap behavior, and improve wallet selection image rendering * fix: render wallet image and update text style on NewWalletTypePage --- .../screens/connect_device/connect_device_page.dart | 2 +- .../select_hardware_wallet_account_page.dart | 8 ++++---- lib/src/screens/new_wallet/new_wallet_type_page.dart | 12 +++++++++++- res/pictures/wallet-trezor.svg | 10 ---------- 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 res/pictures/wallet-trezor.svg diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index 22e466cf3..3e3bda042 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -7,7 +7,6 @@ import 'package:cake_wallet/main.dart'; import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; -import 'package:cake_wallet/src/screens/connect_device/widgets/device_tile.dart'; import 'package:cake_wallet/src/widgets/bottom_sheet/info_steps_bottom_sheet_widget.dart'; import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; @@ -250,6 +249,7 @@ class ConnectDevicePageBodyState extends State { final item = allDevices[index]; return GestureDetector( onTap: () => _connectToDevice(item), + behavior: HitTestBehavior.opaque, child: SizedBox( height: 48, child: Padding( diff --git a/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart b/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart index 678b5e3b8..98cb577ce 100644 --- a/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart +++ b/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart @@ -1,4 +1,5 @@ import 'package:cake_wallet/core/wallet_name_validator.dart'; +import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; import 'package:cw_core/generate_name.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; @@ -147,10 +148,9 @@ class _SelectHardwareWalletAccountFormState extends State { child: Column( spacing: 24, children: [ - const NewWalletTypePageHeader(), + widget.hardwareWalletType != null + ? const NewWalletTypePageHeader() + : const CakeImageWidget( + imageUrl: "assets/new-ui/wallet.svg", + width: 100, + height: 100, + ), Text( S.of(context).choose_wallet_currency, textAlign: TextAlign.center, + style: TextStyle( + color: Theme.of(context).colorScheme.onSurfaceVariant, + fontSize: 14, + ), ), Flexible( child: Padding( diff --git a/res/pictures/wallet-trezor.svg b/res/pictures/wallet-trezor.svg deleted file mode 100644 index d0747c444..000000000 --- a/res/pictures/wallet-trezor.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - -