diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart index f8919251..3d10df4e 100644 --- a/lib/core/api/api_client.dart +++ b/lib/core/api/api_client.dart @@ -4,6 +4,7 @@ import 'dart:developer'; import 'dart:io'; import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:hmg_patient_app_new/core/api/http_client_manager.dart'; import 'package:hmg_patient_app_new/core/api_consts.dart'; @@ -243,10 +244,13 @@ class ApiClientImp implements ApiClient { // Handle body encoding based on isBodyPlainText flag final dynamic requestBody = isBodyPlainText ? body : json.encode(body); - debugPrint("uri: ${Uri.parse(url.trim())}"); - var requestBodyJSON = json.encode(body); - // debugPrint("body: $requestBodyJSON", wrapWidth: 2048); - log("body: $requestBodyJSON"); + + if (kDebugMode) { + debugPrint("uri: ${Uri.parse(url.trim())}"); + var requestBodyJSON = json.encode(body); + debugPrint("body: $requestBodyJSON", wrapWidth: 2048); + // log("body: $requestBodyJSON"); + } http.Response response; try { @@ -255,7 +259,7 @@ class ApiClientImp implements ApiClient { body: requestBody, headers: headers, ); - log("response: ${response.body.toString()}"); + // log("response: ${response.body.toString()}"); } on SocketException catch (e) { final message = e.message.contains('Connection reset by peer') ? LocaleKeys.networkConnectionReset.tr() : LocaleKeys.networkErrorMessage.tr(); onFailure(message, -1, failureType: ConnectivityFailure(message)); diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart index db257e45..542a169c 100644 --- a/lib/core/api_consts.dart +++ b/lib/core/api_consts.dart @@ -4,7 +4,7 @@ import 'package:hmg_patient_app_new/core/enums.dart'; class ApiConsts { static const maxSmallScreen = 660; - static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat; + static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod; // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT diff --git a/lib/core/app_state.dart b/lib/core/app_state.dart index f256321e..aae2d03b 100644 --- a/lib/core/app_state.dart +++ b/lib/core/app_state.dart @@ -50,6 +50,7 @@ class AppState { void setIsPaytabsEnabled(bool value) { isPaytabsEnabled = value; + // isPaytabsEnabled = false; } int? _superUserID; diff --git a/lib/core/utils/date_util.dart b/lib/core/utils/date_util.dart index 5aa48b07..eab4c4f1 100644 --- a/lib/core/utils/date_util.dart +++ b/lib/core/utils/date_util.dart @@ -18,7 +18,7 @@ class DateUtil { final endIndex = date.indexOf(end, startIndex + start.length); return DateTime.fromMillisecondsSinceEpoch(int.parse( date.substring(startIndex + start.length, endIndex), - )); + ), isUtc: true).add(Duration(hours: 3)); } static DateTime convertStringToDateSaudiTimezone(String date, int projectId) { diff --git a/lib/features/habib_wallet/models/lakum_inquiry_information_response_model.dart b/lib/features/habib_wallet/models/lakum_inquiry_information_response_model.dart index 621434fe..1e49ef61 100644 --- a/lib/features/habib_wallet/models/lakum_inquiry_information_response_model.dart +++ b/lib/features/habib_wallet/models/lakum_inquiry_information_response_model.dart @@ -99,7 +99,7 @@ class LakumInquiryInformationResponseModel { memberName = json['MemberName']; memberUniversalId = json['MemberUniversalId']; mobileNumber = json['MobileNumber']; - pointsBalance = json['PointsBalance']; + pointsBalance = json['PointsBalance'] ?? 0; pointsBalanceAmount = json['PointsBalanceAmount']; pointsWillBeExpired = json['PointsWillBeExpired']; prefLang = json['PrefLang']; diff --git a/lib/main.dart b/lib/main.dart index ae7f7036..0119cd1c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -96,7 +96,7 @@ Future callAppStateInitializations() async { PlatformDispatcher.instance.onError = (error, stack) { if (!kDebugMode) { FirebaseCrashlytics.instance.recordError(error, stack, - fatal: true, + fatal: false, printDetails: true, reason: "${appState.isAuthenticated ? "Authenticated User ID: ${appState.getAuthenticatedUser()!.patientId} - ${appState.getAuthenticatedUser()!.mobileNumber}" : "Unauthenticated User"} - Uncaught asynchronous error"); diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart index b8e58fa6..9a1d1fd7 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart @@ -197,7 +197,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State