[ANDROAPP-5800] Not loop on next click when gets the last item

dhis2 · Feb 22, 2024 · 9324f0e · 9324f0e
1 parent efc1063
commit 9324f0e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt b/...ain/java/org/dhis2/usescases/searchTrackEntity/searchparameters/SearchParametersScreen.kt
@@ -204,8 +204,10 @@ fun SearchParametersScreen(
                             fieldUiModel = fieldUiModel,
                             callback = callback,
                             onNextClicked = {
-                                val nextItemIndex = (index + 1) % uiState.items.size
-                                uiState.items[nextItemIndex].onItemClick()
+                                val nextIndex = index + 1
+                                if (nextIndex < uiState.items.size) {
+                                    uiState.items[nextIndex].onItemClick()
+                                }
                             },
                         ),
                     )