diff --git a/lib/api/api_mapper_class.dart b/lib/api/api_mapper_class.dart index 60a7525..6d05ca0 100644 --- a/lib/api/api_mapper_class.dart +++ b/lib/api/api_mapper_class.dart @@ -69,7 +69,7 @@ class ApiClassMapper { case 'CheckPublicActivationCode': return; case 'ChangePassword_Forget': - return ChangePasswordForgetModel.fromRawJson(jsonData); + return ChangePasswordForgetModel.fromJson(jsonData); case 'CheckMobileAppVersion': return CheckMobileAppVersionModel.fromRawJson(jsonData); case 'GET_MENU': diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart index c86590a..9555541 100644 --- a/lib/ui/login/login_screen.dart +++ b/lib/ui/login/login_screen.dart @@ -190,7 +190,7 @@ class _LoginScreenState extends State { void performLogin() async { Utils.showLoading(context); try { - _checkMobileAppVersion = await LoginApiClient().checkMobileAppVersion(); + _checkMobileAppVersion = await LoginApiClient().checkMobileAppVersion(); _memberLoginList = await LoginApiClient().memberLogin(username.text, password.text); AppState().setMemberLoginListModel = _memberLoginList; AppState().setUserName = username.text; diff --git a/lib/ui/login/new_password_screen.dart b/lib/ui/login/new_password_screen.dart index 70b7456..cdf8838 100644 --- a/lib/ui/login/new_password_screen.dart +++ b/lib/ui/login/new_password_screen.dart @@ -8,6 +8,7 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; +import 'package:mohem_flutter_app/models/chane_forgot_password_model.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/input_widget.dart'; @@ -39,7 +40,7 @@ class _NewPasswordScreenState extends State { void setNewPassword() async { Utils.showLoading(context); try { - var genericResponseModel = await LoginApiClient().changePasswordForget(AppState().getForgetPasswordTokenID ?? "", password.text, confirmPassword.text, userName); + ChangePasswordForgetModel? genericResponseModel = await LoginApiClient().changePasswordForget(AppState().getForgetPasswordTokenID ?? "", password.text, confirmPassword.text, userName); Utils.hideLoading(context); Utils.showToast(LocaleKeys.passwordChangedSuccessfully.tr()); Navigator.pop(context);