From f98b49608e00331e9f659e104393b7cba35af525 Mon Sep 17 00:00:00 2001 From: Sonal Yadav Date: Sat, 5 Jul 2025 09:45:57 +0530 Subject: [PATCH 1/2] fix popup from appearing in nearby (#6359) Co-authored-by: Nicolas Raoul --- .../nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt index 77999cf2f..4d565adb2 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.kt @@ -107,7 +107,10 @@ class UploadMediaPresenter @Inject constructor( view.showProgress(false) val gpsCoords = uploadItem.gpsCoords val hasImageCoordinates = gpsCoords != null && gpsCoords.imageCoordsExists - if (hasImageCoordinates && place == null) { + + // Only check for nearby places if image has coordinates AND no place was pre-selected + // This prevents the popup from appearing when uploading from Nearby feature + if (hasImageCoordinates && place == null && uploadItem.place == null) { checkNearbyPlaces(uploadItem) } }, { throwable: Throwable? -> From 65f41beed8247a8e2ba6986dc990fb238df820a3 Mon Sep 17 00:00:00 2001 From: VoidRaven Date: Sat, 5 Jul 2025 11:35:54 +0530 Subject: [PATCH 2/2] Update bug-report.yml to use Type:bug label as per issue #6356 (#6363) * Update bug-report.yml to use Type:bug label as per issue #6356 * Update bug-report.yml to use type: bug and labels: ['Type: bug'] as per issue #6356 * Update bug-report.yml to use type: Bug and revert labels to ['bug'] as per mentor's feedback for issue #6356 * Remove labels field from bug-report.yml as per feedback for issue #6356 --------- Co-authored-by: Ritika Pahwa <83745993+RitikaPahwa4444@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index f92f51a43..a4682fd3c 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -1,7 +1,7 @@ name: "\U0001F41E Bug report" description: Create a report to help us improve. title: "[Bug]: " -labels: ["bug"] +type: Bug # Retained to categorize the issue as per organization-level type body: - type: markdown attributes: