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

[Badging] Merge conflict resolution

Browse Source
This commit is contained in:
Eugene Bistolas 2021-11-05 14:27:48 -10:00 committed by Michelle Linington
parent 64f126ae3f
commit 256da52087
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pods

@ -1 +1 @@
Subproject commit 5fdcdcd4718d00282d5124ac9d5ceeeffbc60819
Subproject commit e257f3d41b2679c1cdeba3785465590a7f9113f7

2
Signal/src/ViewControllers/AppSettings/SubscriptionViewController.swift
View File

@ -30,7 +30,7 @@ class SubscriptionViewController: OWSTableViewController2 {
}
private lazy var avatarView: ConversationAvatarView = {
let newAvatarView = ConversationAvatarView(sizeClass: .eightyEight, badged: true)
let newAvatarView = ConversationAvatarView(sizeClass: .eightyEight, localUserDisplayMode: .asUser, badged: true)
databaseStorage.read { readTx in
newAvatarView.update(readTx) { config in
if let address = tsAccountManager.localAddress(with: readTx) {