Merge commit '12d72565ae8eaaa63351737f65c7412e1ca89d95' into beta

laktyushin · laktyushin · commit fde974e51db5 · 2025-09-01T19:21:52.000+04:00
diff --git a/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift b/submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift
@@ -1033,7 +1033,6 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
                 let initialThemeIndex = giftThemes.firstIndex(where: { $0.id == initiallySelectedTheme.id })
                 if initialThemeIndex == nil || initialThemeIndex! > 50 {
                     giftThemes.insert(initiallySelectedTheme, at: 0)
-                    existingIds.insert(initiallySelectedTheme.id)
                 }
             }
             
@@ -1074,6 +1073,7 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
                     strings: presentationData.strings,
                     wallpaper: wallpaper
                 ))
+                existingIds.insert(theme.id)
             }
             
             if uniqueGiftChatThemesState.themes.count == 0 || uniqueGiftChatThemesState.dataState == .ready(canLoadMore: false) {

Original file line number	Diff line number	Diff line change
`@@ -1033,7 +1033,6 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega`
`1033`	`1033`	`let initialThemeIndex = giftThemes.firstIndex(where: { $0.id == initiallySelectedTheme.id })`
`1034`	`1034`	`if initialThemeIndex == nil \|\| initialThemeIndex! > 50 {`
`1035`	`1035`	`giftThemes.insert(initiallySelectedTheme, at: 0)`
`1036`		`- existingIds.insert(initiallySelectedTheme.id)`
`1037`	`1036`	`}`
`1038`	`1037`	`}`
`1039`	`1038`
`@@ -1074,6 +1073,7 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega`
`1074`	`1073`	`strings: presentationData.strings,`
`1075`	`1074`	`wallpaper: wallpaper`
`1076`	`1075`	`))`
	`1076`	`+ existingIds.insert(theme.id)`
`1077`	`1077`	`}`
`1078`	`1078`
`1079`	`1079`	`if uniqueGiftChatThemesState.themes.count == 0 \|\| uniqueGiftChatThemesState.dataState == .ready(canLoadMore: false) {`