Avatar fix when empty

lib/ui/ui_helpers.dart

@@ -37,14 +37,14 @@ void copyPublicKeyToClipboard(BuildContext context) {
 const Color defAvatarBgColor = Colors.grey;
 const Color defAvatarColor = Colors.white;
 
-Widget avatar(bool hasAvatar, Uint8List? rawAvatar,
+Widget avatar(Uint8List? rawAvatar,
     {Color color = defAvatarColor, Color bgColor = defAvatarBgColor}) {
-  return hasAvatar
+  return rawAvatar != null && rawAvatar.isNotEmpty
       ? CircleAvatar(
           radius: 24,
           child: ClipOval(
               child: Image.memory(
-            rawAvatar!,
+            rawAvatar,
             fit: BoxFit.cover,
           )))
       : CircularIcon(

lib/ui/widgets/first_screen/pay_contact_search_page.dart

@@ -8,7 +8,6 @@ import 'package:http/http.dart';
 import 'package:simple_barcode_scanner/enum.dart';
 import 'package:simple_barcode_scanner/simple_barcode_scanner.dart';
 
-import '../../../cubit/bottom_nav_cubit.dart';
 import '../../../data/models/contact.dart';
 import '../../../data/models/contact_cubit.dart';
 import '../../../data/models/contact_state.dart';
@@ -76,7 +75,6 @@ class _PayContactSearchPageState extends State<PayContactSearchPage> {
   @override
   Widget build(BuildContext context) {
     final PaymentCubit paymentCubit = context.read<PaymentCubit>();
-    final BottomNavCubit nav = context.read<BottomNavCubit>();
     return Scaffold(
       appBar: AppBar(
         title: Text(tr('search_user_title')),
@@ -209,8 +207,7 @@ class _PayContactSearchPageState extends State<PayContactSearchPage> {
         Navigator.pop(context);
       },
       leading: avatar(
-        hasAvatar,
-        hasAvatar ? contact.avatar : null,
+        contact.avatar,
         bgColor: tileColor(index),
         color: tileColor(index, true),
       ),

lib/ui/widgets/first_screen/recipient_widget.dart

@@ -17,7 +17,7 @@ class RecipientWidget extends StatelessWidget {
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: <Widget>[
-                    avatar(state.avatar != null, state.avatar),
+                    avatar(state.avatar),
                     const SizedBox(width: 16.0),
                     Expanded(
                       child: Column(

lib/ui/widgets/third_screen/contacts_page.dart

@@ -139,7 +139,6 @@ class _ContactsPageState extends State<ContactsPage> {
                             ? humanizePubKeyAsWidget(contact.pubkey)
                             : null,
                         leading: avatar(
-                          contact.avatar != null,
                           contact.avatar,
                           bgColor: tileColor(index),
                           color: tileColor(index, true),