Merge branch 'master_mohemm_flutter'

# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml

lib/api/api_client.dart

@@ -94,6 +94,12 @@ class ApiClient {
       if (jsonData["IsAuthenticated"] != null) {
         AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
       }
+
+      // if(url.contains("GetOfferDiscountsConfigData")) {
+      //   jsonData["ErrorMessage"] = "Service Not Available";
+      //   jsonData["ErrorEndUserMessage"] = "Service Not Available";
+      // }
+
       if (jsonData["ErrorMessage"] == null) {
         return factoryConstructor(jsonData);
       } else {

lib/app_state/app_state.dart

@@ -90,7 +90,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 8.8, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 8.9, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;

lib/ui/work_list/worklist_detail_screen.dart

@@ -297,7 +297,8 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                   ],
                 ).expanded,
                 if (isApproveAvailable || isRejectAvailable || isCloseAvailable)
-                  Container(
+                  SafeArea(
+                    child: Container(
                       padding: const EdgeInsets.only(top: 14, bottom: 14, left: 21, right: 21),
                       decoration: const BoxDecoration(
                         color: Colors.white,
@@ -342,6 +343,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
                           })
                         ],
                       ),
+                    ),
                   )
               ],
             ),
@@ -679,8 +681,13 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
   }
 
   void performAction(String actionMode, {String? title}) {
-    GetActionHistoryList? object = actionHistoryList.firstWhere((element) => element.aCTIONCODE == "REQUEST_INFO");
-    String question = "${object.aCTION}: ${object.nOTE}";
+    String question = "";
+    if (actionMode == "ANSWER_INFO") {
+      List<GetActionHistoryList> list = actionHistoryList.where((element) => element.aCTIONCODE == "REQUEST_INFO").toList();
+      if (list.isNotEmpty) {
+        question = "${list.first.aCTION}: ${list.first.nOTE}";
+      }
+    }
     showDialog(
       context: context,
       builder: (BuildContext cxt) => AcceptRejectInputDialog(