From ca87e152cdc8aa2862be639c5d8de50ae43c20e7 Mon Sep 17 00:00:00 2001
From: Anugraha-sutara <Anugraha@sutara.org>
Date: Tue, 27 Jan 2026 10:40:05 +0530
Subject: [PATCH 1/2] fix bug

---
 .../viewmodel/person/manageaccount/ManageAccountViewModel.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/person/manageaccount/ManageAccountViewModel.kt b/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/person/manageaccount/ManageAccountViewModel.kt
index bb690af8b..e6e0fcb73 100644
--- a/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/person/manageaccount/ManageAccountViewModel.kt
+++ b/respect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/person/manageaccount/ManageAccountViewModel.kt
@@ -303,7 +303,9 @@ class ManageAccountViewModel(
                     listParams = PersonQrBadgeDataSource.GetListParams(
                         qrCodeUrl = url
                     )
-                ).dataOrNull()?.firstOrNull() != null
+                ).dataOrNull()?.firstOrNull { existingBadge ->
+                    existingBadge.personGuid != personGuid
+                } != null
 
             if (qrCodeAlreadyAssignedToAnotherPerson) {
                 _uiState.update { prev ->

From 375217197ef119bcd938b48374c540a06c640027 Mon Sep 17 00:00:00 2001
From: Anugraha-sutara <Anugraha@sutara.org>
Date: Tue, 27 Jan 2026 16:58:28 +0530
Subject: [PATCH 2/2] fix bug

---
 .../world/respect/app/view/scanqrcode/ScanQRCodeScreen.kt  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/respect-app-compose/src/commonMain/kotlin/world/respect/app/view/scanqrcode/ScanQRCodeScreen.kt b/respect-app-compose/src/commonMain/kotlin/world/respect/app/view/scanqrcode/ScanQRCodeScreen.kt
index 3dfdd4d59..893862ba1 100644
--- a/respect-app-compose/src/commonMain/kotlin/world/respect/app/view/scanqrcode/ScanQRCodeScreen.kt
+++ b/respect-app-compose/src/commonMain/kotlin/world/respect/app/view/scanqrcode/ScanQRCodeScreen.kt
@@ -108,7 +108,10 @@ fun ScanQRCodeScreen(
                         )
 
                         Button(
-                            onClick = viewModel::onClickTryAgain,
+                            onClick = {
+                                viewModel.onClickTryAgain()
+                                showScanner = true
+                            },
                             modifier = Modifier.fillMaxWidth(0.7f),
                         ) {
                             Text(
@@ -135,8 +138,8 @@ fun ScanQRCodeScreen(
                                 }
 
                                 is BarcodeResult.OnFailed -> {
-                                    showScanner = false
                                     viewModel.onQrCodeScanError(result.exception)
+                                    showScanner = false
                                 }
 
                                 BarcodeResult.OnCanceled -> {