From 5a8cf7bb6e956867b9c33333e5faaa61e026c227 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 27 Sep 2022 14:53:33 +0700
Subject: [PATCH] Fix build test failed on `CI`

---
 forward/lib/forward/set/set_forward_response.dart     | 11 ++++++-----
 .../lib/rule_filter/set/set_rule_filter_response.dart | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/forward/lib/forward/set/set_forward_response.dart b/forward/lib/forward/set/set_forward_response.dart
index ae1a3e178..dea522387 100644
--- a/forward/lib/forward/set/set_forward_response.dart
+++ b/forward/lib/forward/set/set_forward_response.dart
@@ -1,7 +1,6 @@
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/http/converter/account_id_converter.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
-import 'package:jmap_dart_client/http/converter/state_converter.dart';
 import 'package:jmap_dart_client/http/converter/state_nullable_converter.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
@@ -13,7 +12,8 @@ class SetForwardResponse extends SetResponse<TMailForward> {
 
   SetForwardResponse(
     AccountId accountId,
-    State newState, {
+    {
+      State? newState,
       State? oldState,
       Map<Id, TMailForward>? created,
       Map<Id, TMailForward?>? updated,
@@ -21,9 +21,10 @@ class SetForwardResponse extends SetResponse<TMailForward> {
       Map<Id, SetError>? notCreated,
       Map<Id, SetError>? notUpdated,
       Map<Id, SetError>? notDestroyed
-  }) : super(
+    }
+  ) : super(
     accountId,
-    newState,
+    newState: newState,
     oldState: oldState,
     created: created,
     updated: updated,
@@ -36,7 +37,7 @@ class SetForwardResponse extends SetResponse<TMailForward> {
   static SetForwardResponse deserialize(Map<String, dynamic> json) {
     return SetForwardResponse(
       const AccountIdConverter().fromJson(json['accountId'] as String),
-      const StateConverter().fromJson(json['newState'] as String),
+      newState: const StateNullableConverter().fromJson(json['newState'] as String?),
       oldState: const StateNullableConverter().fromJson(json['oldState'] as String?),
       created: (json['created'] as Map<String, dynamic>?)
         ?.map((key, value) => MapEntry(
diff --git a/rule_filter/lib/rule_filter/set/set_rule_filter_response.dart b/rule_filter/lib/rule_filter/set/set_rule_filter_response.dart
index 4c382a346..fd65d7918 100644
--- a/rule_filter/lib/rule_filter/set/set_rule_filter_response.dart
+++ b/rule_filter/lib/rule_filter/set/set_rule_filter_response.dart
@@ -1,6 +1,5 @@
 import 'package:jmap_dart_client/http/converter/account_id_converter.dart';
 import 'package:jmap_dart_client/http/converter/id_converter.dart';
-import 'package:jmap_dart_client/http/converter/state_converter.dart';
 import 'package:jmap_dart_client/http/converter/state_nullable_converter.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/error/set_error.dart';
@@ -12,7 +11,8 @@ import 'package:rule_filter/rule_filter/tmail_rule.dart';
 class SetRuleFilterResponse extends SetResponse<TMailRule> {
   SetRuleFilterResponse(
       AccountId accountId,
-      State newState, {
+      {
+        State? newState,
         State? oldState,
         Map<Id, TMailRule>? created,
         Map<Id, TMailRule?>? updated,
@@ -20,9 +20,10 @@ class SetRuleFilterResponse extends SetResponse<TMailRule> {
         Map<Id, SetError>? notCreated,
         Map<Id, SetError>? notUpdated,
         Map<Id, SetError>? notDestroyed
-      }) : super(
+      }
+  ) : super(
       accountId,
-      newState,
+      newState: newState,
       oldState: oldState,
       created: created,
       updated: updated,
@@ -35,7 +36,7 @@ class SetRuleFilterResponse extends SetResponse<TMailRule> {
   static SetRuleFilterResponse deserialize(Map<String, dynamic> json) {
     return SetRuleFilterResponse(
       const AccountIdConverter().fromJson(json['accountId'] as String),
-      const StateConverter().fromJson(json['newState'] as String),
+      newState: const StateNullableConverter().fromJson(json['newState'] as String?),
       oldState: const StateNullableConverter().fromJson(json['oldState'] as String?),
       created: (json['created'] as Map<String, dynamic>?)
           ?.map((key, value) => MapEntry(