diff --git a/lib/data/repository/auth_repository.dart b/lib/data/repository/auth_repository.dart
index 85974e9..965026f 100644
--- a/lib/data/repository/auth_repository.dart
+++ b/lib/data/repository/auth_repository.dart
@@ -145,9 +145,9 @@ class AuthRepository {
 
       startDate = Jalali(shamsiYear, shamsiMounth, 1);
       Jalali endDate = Jalali(
-              shamsiYear,
-              shamsiMounth + 1 > 12 ? 12 : shamsiMounth + 1,
-              shamsiMounth + 1 > 12 ? 30 : 1)
+              shamsiMounth == 12 ? shamsiYear + 1 : shamsiYear,
+              shamsiMounth == 12 ? 1 : shamsiMounth + 1,
+              1)
           .addDays(-1);
       Gregorian sMiladiDate = startDate.toGregorian();
       Gregorian eMiladiDate = endDate.toGregorian();
@@ -174,9 +174,9 @@ class AuthRepository {
 
       startDate = Jalali(shamsiYear, shamsiMounth, 1);
       Jalali endDate = Jalali(
-              shamsiYear,
-              shamsiMounth + 1 > 12 ? 12 : shamsiMounth + 1,
-              shamsiMounth + 1 > 12 ? 30 : 1)
+              shamsiMounth == 12 ? shamsiYear + 1 : shamsiYear,
+              shamsiMounth == 12 ? 1 : shamsiMounth + 1,
+              1)
           .addDays(-1);
 
       Gregorian sMiladiDate = startDate.toGregorian();