signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Update badge thanks sheet logic

Browse Source
This commit is contained in:
Nora Trapp 2021-11-16 12:54:55 -08:00
parent d5f1928a89
commit 1ecf98a395
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Signal/src/ViewControllers/AppSettings/BadgeThanksSheet.swift
View File

@ -69,13 +69,9 @@ class BadgeThanksSheet: InteractiveSheetViewController {
let snapshot = profileManagerImpl.localProfileSnapshot(shouldIncludeAvatar: true)
var allBadges = snapshot.profileBadgeInfo ?? []
guard let newlyFeaturedBadge = allBadges.first(where: { $0.badgeId == self.badge.id }) else {
return Promise(error: OWSAssertionError("Invalid badge"))
}
let nonPrimaryBadges = allBadges.filter { $0.badgeId != newlyFeaturedBadge.badgeId }
allBadges = [newlyFeaturedBadge] + nonPrimaryBadges
let allBadges = snapshot.profileBadgeInfo ?? []
let nonPrimaryBadgeIds = allBadges.filter { $0.badgeId != self.badge.id }.map { $0.badgeId }
let visibleBadgeIds = [self.badge.id] + nonPrimaryBadgeIds
return OWSProfileManager.updateLocalProfilePromise(
profileGivenName: snapshot.givenName,
@ -83,7 +79,7 @@ class BadgeThanksSheet: InteractiveSheetViewController {
profileBio: snapshot.bio,
profileBioEmoji: snapshot.bioEmoji,
profileAvatarData: snapshot.avatarData,
visibleBadgeIds: allBadges.map { $0.badgeId },
visibleBadgeIds: visibleBadgeIds,
userProfileWriter: .localUser
)
}