Merge pull request #402 from kumulynja/check-current-send-pj-on-failure

fix: only show error for current send pj session
SatoshiPortal · Dec 27, 2024 · afdd073 · afdd073
2 parents a118d9a + 526a79f
commit afdd073
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/_pkg/payjoin/event.dart b/lib/_pkg/payjoin/event.dart
@@ -35,9 +35,10 @@ class PayjoinSenderPostMessageASuccessEvent extends PayjoinEvent {
   PayjoinSenderPostMessageASuccessEvent({required this.pjUri});
 }
 
-class PayjoinFailureEvent extends PayjoinEvent {
+class PayjoinSendFailureEvent extends PayjoinEvent {
+  final String pjUri;
   final Object? error;
-  PayjoinFailureEvent({this.error});
+  PayjoinSendFailureEvent({required this.pjUri, this.error});
 }
 
 class PayjoinEventListener extends StatefulWidget {

diff --git a/lib/_pkg/payjoin/manager.dart b/lib/_pkg/payjoin/manager.dart
@@ -125,7 +125,7 @@ class PayjoinManager {
           }
         } else if (message is Err) {
           PayjoinEventBus().emit(
-            PayjoinFailureEvent(error: message),
+            PayjoinSendFailureEvent(pjUri: pjUri, error: message),
           );
           await _cleanupSession(pjUri);
           completer.complete(message);

diff --git a/lib/send/bloc/send_cubit.dart b/lib/send/bloc/send_cubit.dart
@@ -77,7 +77,8 @@ class SendCubit extends Cubit<SendState> {
         );
       } else if (event is PayjoinBroadcastEvent) {
         state.selectedWalletBloc!.add(SyncWallet());
-      } else if (event is PayjoinFailureEvent) {
+      } else if (event is PayjoinSendFailureEvent &&
+          event.pjUri == state.payjoinEndpoint.toString()) {
         emit(
           state.copyWith(
             errSending: event.error.toString(),