From 256da52087f5dbd1750c6eb138c9547edac0454b Mon Sep 17 00:00:00 2001
From: Eugene Bistolas <eugene@signal.org>
Date: Fri, 5 Nov 2021 14:27:48 -1000
Subject: [PATCH] [Badging] Merge conflict resolution

---
 Pods                                                            | 2 +-
 .../AppSettings/SubscriptionViewController.swift                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Pods b/Pods
index 5fdcdcd471..e257f3d41b 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 5fdcdcd4718d00282d5124ac9d5ceeeffbc60819
+Subproject commit e257f3d41b2679c1cdeba3785465590a7f9113f7
diff --git a/Signal/src/ViewControllers/AppSettings/SubscriptionViewController.swift b/Signal/src/ViewControllers/AppSettings/SubscriptionViewController.swift
index acba660e0c..15494c47df 100644
--- a/Signal/src/ViewControllers/AppSettings/SubscriptionViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/SubscriptionViewController.swift
@@ -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) {