From 9ed2b59d819b3e9846d2bf33b618acc29707f2f8 Mon Sep 17 00:00:00 2001
From: Oqba <oqba@example.com>
Date: Thu, 29 Oct 2026 07:00:13 +0330
Subject: [PATCH] =?UTF-8?q?=D8=A7=D8=B1=D8=AA=D9=82=D8=A7=20=D8=A8=D9=87?=
 =?UTF-8?q?=20=D9=86=D8=B3=D8=AE=D9=87=201.1.5=20=D9=88=20=D9=85=D8=AD?=
 =?UTF-8?q?=D8=A7=D8=B3=D8=A8=D9=87=20=D9=85=D8=AC=D9=85=D9=88=D8=B9=20?=
 =?UTF-8?q?=D9=BE=D8=B1=D8=AF=D8=A7=D8=AE=D8=AA=DB=8C=E2=80=8C=D9=87=D8=A7?=
 =?UTF-8?q?=DB=8C=20=D8=AF=D9=88=D8=B1=D9=87=20=D8=AC=D8=A7=D8=B1=DB=8C=20?=
 =?UTF-8?q?=D8=A8=D8=B1=D8=A7=DB=8C=20=D9=87=D8=B1=20=D9=81=D8=B1=D8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                          | 4 ++--
 .../com/oqba26/monthlypaymentapp/viewmodel/PersonViewModel.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 05b0e24..9171ea5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,8 +30,8 @@ android {
         applicationId = "com.oqba26.monthlypaymentapp"
         minSdk = 25
         targetSdk = 34
-        versionCode = 15
-        versionName = "1.1.4"
+        versionCode = 16
+        versionName = "1.1.5"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
     }
diff --git a/app/src/main/java/com/oqba26/monthlypaymentapp/viewmodel/PersonViewModel.kt b/app/src/main/java/com/oqba26/monthlypaymentapp/viewmodel/PersonViewModel.kt
index 051ea18..52d3192 100644
--- a/app/src/main/java/com/oqba26/monthlypaymentapp/viewmodel/PersonViewModel.kt
+++ b/app/src/main/java/com/oqba26/monthlypaymentapp/viewmodel/PersonViewModel.kt
@@ -212,7 +212,7 @@ class PersonViewModel @Inject constructor(
                     }
                     val latestPayment = personCyclePayments.maxByOrNull { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
                     val lastPaymentTime = latestPayment?.let { if ((it.createdAt ?: 0L) > 0L) it.createdAt!! else it.timestamp }
-                    val lastPaymentAmount = latestPayment?.amount
+                    val lastPaymentAmount = if (personCyclePayments.isNotEmpty()) personCyclePayments.sumOf { it.amount } else null
                     
                     val unpaidResult = if (category == "mosque" || person.isAnonymous) {
                         Triple(0, 0.0, emptyList<String>() to emptyList())