Skip to content

fix: avatar not loaded after login - WPB-24860 🍒 #4675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: release/cycle-4.18
Choose a base branch
from
+6 −3
Open

fix: avatar not loaded after login - WPB-24860 🍒 #4675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WireDomain/Sources/WireDomain/Repositories/User/UserLocalStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public final class UserLocalStore: UserLocalStoreProtocol {
persistedUser.teamIdentifier = userInfo.teamID
persistedUser.accentColorValue = Int16(userInfo.accentID)
persistedUser.previewProfileAssetIdentifier = userInfo.previewAssetKey
persistedUser.previewProfileAssetIdentifier = userInfo.completeAssetKey
persistedUser.completeProfileAssetIdentifier = userInfo.completeAssetKey
persistedUser.emailAddress = userInfo.email
persistedUser.expiresAt = userInfo.expiresAt
if let appDescription = userInfo.appDescription, let appCategory = userInfo.appCategory {
Expand Down
7 changes: 5 additions & 2 deletions ...-ios-data-model/Source/UseCases/AccountImageSource/GetUserAccountImageSourceUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ public struct GetUserAccountImageSourceUseCase: GetUserAccountImageSourceUseCase
account: Account
) async throws -> AccountImageSource {

// user's custom image
if let data = account.imageData, let accountImage = UIImage(data: data) {
// user's custom image (check account first, fall back to user
// in case it's not set on account yet).
if
let data = account.imageData ?? user.imageData(for: .preview),
let accountImage = UIImage(data: data) {
return .image(accountImage)
}

Expand Down