From dc661a252a12fbcf14b9f4eafca46665b12e55ae Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 15 Jan 2023 10:14:28 -0500
Subject: [PATCH] Assign keys for global search rows based on source

Maybe fixes #8924

(cherry picked from commit e468554fd9fbe19bfe58b4c018bd8ee87388bed7)
---
 .../eu/kanade/presentation/browse/GlobalSearchScreen.kt   | 8 ++++----
 .../eu/kanade/presentation/browse/MigrateSearchScreen.kt  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
index f033b17b9..c4ddabbca 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt
@@ -71,16 +71,13 @@ fun GlobalSearchContent(
         contentPadding = contentPadding,
     ) {
         items.forEach { (source, result) ->
-            item {
+            item(key = source.id) {
                 GlobalSearchResultItem(
                     title = source.name,
                     subtitle = LocaleHelper.getDisplayName(source.lang),
                     onClick = { onClickSource(source) },
                 ) {
                     when (result) {
-                        is SearchItemResult.Error -> {
-                            GlobalSearchErrorResultItem(message = result.throwable.message)
-                        }
                         SearchItemResult.Loading -> {
                             GlobalSearchLoadingResultItem()
                         }
@@ -104,6 +101,9 @@ fun GlobalSearchContent(
                                 onLongClick = onLongClickItem,
                             )
                         }
+                        is SearchItemResult.Error -> {
+                            GlobalSearchErrorResultItem(message = result.throwable.message)
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
index c370480c8..813cf9780 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt
@@ -67,16 +67,13 @@ fun MigrateSearchContent(
         contentPadding = contentPadding,
     ) {
         items.forEach { (source, result) ->
-            item {
+            item(key = source.id) {
                 GlobalSearchResultItem(
                     title = if (source.id == sourceId) "▶ ${source.name}" else source.name,
                     subtitle = LocaleHelper.getDisplayName(source.lang),
                     onClick = { onClickSource(source) },
                 ) {
                     when (result) {
-                        is SearchItemResult.Error -> {
-                            GlobalSearchErrorResultItem(message = result.throwable.message)
-                        }
                         SearchItemResult.Loading -> {
                             GlobalSearchLoadingResultItem()
                         }
@@ -93,6 +90,9 @@ fun MigrateSearchContent(
                                 onLongClick = onLongClickItem,
                             )
                         }
+                        is SearchItemResult.Error -> {
+                            GlobalSearchErrorResultItem(message = result.throwable.message)
+                        }
                     }
                 }
             }