From cf4387a28014b6edf9579c87d07abed9887a9672 Mon Sep 17 00:00:00 2001 From: poka Date: Tue, 6 Dec 2022 22:42:30 +0100 Subject: [PATCH] fix: null username on search_result screen --- lib/screens/search_result.dart | 8 ++++---- lib/widgets/wallet_name.dart | 4 ++-- lib/widgets/wallet_name_controller.dart | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/screens/search_result.dart b/lib/screens/search_result.dart index bd2b34a..e4b3a71 100644 --- a/lib/screens/search_result.dart +++ b/lib/screens/search_result.dart @@ -127,10 +127,10 @@ class SearchResultScreen extends StatelessWidget { ]), subtitle: Row(children: [ NameByAddress( - address: g1Wallet.address, - wallet: WalletData( - address: g1Wallet.address), - canEdit: false) + address: g1Wallet.address, + wallet: WalletData( + address: g1Wallet.address), + ), ]), dense: false, isThreeLine: false, diff --git a/lib/widgets/wallet_name.dart b/lib/widgets/wallet_name.dart index 2944ec8..b1a2b63 100644 --- a/lib/widgets/wallet_name.dart +++ b/lib/widgets/wallet_name.dart @@ -16,11 +16,11 @@ class WalletName extends StatelessWidget { @override Widget build(BuildContext context) { - double newSize = wallet.name!.length <= 15 ? size : size - 2; + double newSize = (wallet.name?.length ?? 0) <= 15 ? size : size - 2; return Row(mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - truncate(wallet.name!, 20), + truncate(wallet.name ?? '', 20), textAlign: TextAlign.center, style: TextStyle( fontSize: isTall ? newSize : newSize * 0.9, diff --git a/lib/widgets/wallet_name_controller.dart b/lib/widgets/wallet_name_controller.dart index 8148a93..e5bf0ba 100644 --- a/lib/widgets/wallet_name_controller.dart +++ b/lib/widgets/wallet_name_controller.dart @@ -48,8 +48,6 @@ class WalletNameController extends StatelessWidget { child: InkWell( key: keyRenameWallet, onTap: () async { - // _isNewNameValid = - // walletProvider.editWalletName(wallet.id(), isCesium: false); await walletOptions.editWalletName(context, wallet.id()); await Future.delayed(const Duration(milliseconds: 30)); walletNameFocus.requestFocus();