Update pay contact after saving

lib/ui/widgets/first_screen/contact_fav_icon.dart

@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../data/models/contact.dart';
 import '../../../data/models/contact_cubit.dart';
+import '../../../data/models/payment_cubit.dart';
 import '../../contacts_cache.dart';
 import '../third_screen/contact_form_dialog.dart';
 
@@ -12,10 +13,12 @@ class ContactFavIcon extends StatelessWidget {
     super.key,
     required this.contact,
     required this.contactsCubit,
+    this.paymentCubit,
   });
 
   final ContactsCubit contactsCubit;
   final Contact contact;
+  final PaymentCubit? paymentCubit;
 
   @override
   Widget build(BuildContext context) {
@@ -41,6 +44,9 @@ class ContactFavIcon extends StatelessWidget {
                       contact: contact,
                       onSave: (Contact c) {
                         context.read<ContactsCubit>().updateContact(c);
+                        if (paymentCubit != null) {
+                          paymentCubit!.selectUser(c);
+                        }
                         ContactsCache().saveContact(c);
                       });
                 },

lib/ui/widgets/first_screen/pay_recipient_widget.dart

@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import '../../../data/models/contact_cubit.dart';
 import '../../../data/models/contact_state.dart';
 import '../../../data/models/payment_cubit.dart';
+import '../../../data/models/payment_state.dart';
 import '../../ui_helpers.dart';
 import 'contact_fav_icon.dart';
 
@@ -12,60 +13,64 @@ class PayRecipientWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final PaymentCubit paymentCubit = BlocProvider.of<PaymentCubit>(context);
-    final ContactsCubit contactsCubit = BlocProvider.of<ContactsCubit>(context);
-    return Card(
-        elevation: 4,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(10),
-        ),
-        child: Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: <Widget>[
-              avatar(paymentCubit.state.contact!.avatar),
-              const SizedBox(width: 16.0),
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    if (paymentCubit.state.contact!.title != null)
-                      Text(
-                        paymentCubit.state.contact!.title,
-                        style: const TextStyle(
-                          fontSize: 20.0,
-                          fontWeight: FontWeight.bold,
+    return BlocBuilder<PaymentCubit, PaymentState>(
+        builder: (BuildContext context, PaymentState state) {
+      final ContactsCubit contactsCubit =
+          BlocProvider.of<ContactsCubit>(context);
+      return Card(
+          elevation: 4,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(10),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                avatar(state.contact!.avatar),
+                const SizedBox(width: 16.0),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      if (state.contact!.title != null)
+                        Text(
+                          state.contact!.title,
+                          style: const TextStyle(
+                            fontSize: 20.0,
+                            fontWeight: FontWeight.bold,
+                          ),
                         ),
-                      ),
-                    if (paymentCubit.state.contact!.subtitle != null)
-                      Padding(
-                          padding: const EdgeInsets.fromLTRB(0, 2, 0, 0),
-                          child: Text(
-                            paymentCubit.state.contact!.subtitle!,
-                            style: const TextStyle(
-                              fontSize: 16.0,
-                            ),
-                          )),
-                  ],
+                      if (state.contact!.subtitle != null)
+                        Padding(
+                            padding: const EdgeInsets.fromLTRB(0, 2, 0, 0),
+                            child: Text(
+                              state.contact!.subtitle!,
+                              style: const TextStyle(
+                                fontSize: 16.0,
+                              ),
+                            )),
+                    ],
+                  ),
                 ),
-              ),
-              // Is not is contact, allow to add to contacts
-              if (!contactsCubit.isContact(paymentCubit.state.contact!.pubKey))
-                BlocBuilder<ContactsCubit, ContactsState>(
-                    builder: (BuildContext context, ContactsState state) {
+                // Is not is contact, allow to add to contacts
+                // if (!contactsCubit.isContact(state.contact!.pubKey))
+                BlocBuilder<ContactsCubit, ContactsState>(builder:
+                    (BuildContext context, ContactsState contactState) {
                   return ContactFavIcon(
-                      contact: paymentCubit.state.contact!,
-                      contactsCubit: context.read<ContactsCubit>());
+                      contact: state.contact!,
+                      contactsCubit: context.read<ContactsCubit>(),
+                      paymentCubit: context.watch<PaymentCubit>());
                 }),
-              IconButton(
-                icon: const Icon(Icons.cancel),
-                onPressed: () {
-                  context.read<PaymentCubit>().clearRecipient();
-                },
-              ),
-            ],
-          ),
-        ));
+                IconButton(
+                  icon: const Icon(Icons.cancel),
+                  onPressed: () {
+                    context.read<PaymentCubit>().clearRecipient();
+                  },
+                ),
+              ],
+            ),
+          ));
+    });
   }
 }