Fix swap steps hanging (#99)

* fix some swap steps hanging forever * fix MakerPaymentSpentByWatcher seen as fail step
KomodoPlatform · Jan 24, 2024 · 06947f9 · 06947f9
1 parent 3a835dc
commit 06947f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/blocs/swap_history_bloc.dart b/lib/blocs/swap_history_bloc.dart
@@ -49,6 +49,9 @@ class SwapHistoryBloc implements BlocBase {
         case 'MakerPaymentSpent':
           status = Status.SWAP_SUCCESSFUL;
           break;
+        case 'MakerPaymentSpentByWatcher':
+          status = Status.SWAP_SUCCESSFUL;
+          break;
         case 'TakerPaymentSpent':
           status = Status.SWAP_SUCCESSFUL;
           break;

diff --git a/lib/model/recent_swaps.dart b/lib/model/recent_swaps.dart
@@ -225,7 +225,7 @@ class SwapEEL {
   });
 
   factory SwapEEL.fromJson(Map<String, dynamic> json) => SwapEEL(
-        data: json['data'] == null ? null : SwapEF.fromJson(json['data']),
+        data: json['data'] is Map ? SwapEF.fromJson(json['data']) : null,
         type: json['type'] ?? '',
       );
 

diff --git a/lib/screens/dex/orders/swap/detailed_swap_steps.dart b/lib/screens/dex/orders/swap/detailed_swap_steps.dart
@@ -69,8 +69,8 @@ class _DetailedSwapStepsState extends State<DetailedSwapSteps> {
         if (index + 1 > swap.result.successEvents.length) {
           return SwapStepStatus.failed;
         }
-        if (swap.result.events[index].event.type ==
-            swap.result.successEvents[index]) {
+        if (swap.result.successEvents
+            .any((String e) => e == swap.result.events[index].event.type)) {
           return SwapStepStatus.success;
         } else {
           return SwapStepStatus.failed;