Fix channel admin list controller after upgrade

submodules/PeerInfoUI/Sources/ChannelAdminController.swift

@@ -1180,7 +1180,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
             })
         }
         
-        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.Channel_Management_LabelEditor), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
+        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(initialParticipant?.adminInfo == nil ? presentationData.strings.Channel_Management_AddModerator : presentationData.strings.Channel_Moderator_Title), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
         
         let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: channelAdminControllerEntries(presentationData: presentationData, state: state, accountPeerId: context.account.peerId, channelView: channelView, adminView: adminView, initialParticipant: initialParticipant, canEdit: canEdit), style: .blocks, focusItemTag: focusItemTag, ensureVisibleItemTag: nil, emptyStateItem: nil, animateChanges: true)
         

submodules/PeerInfoUI/Sources/ChannelAdminsController.swift

@@ -489,7 +489,7 @@ private func channelAdminsControllerEntries(presentationData: PresentationData,
     return entries
 }
 
-public func channelAdminsController(context: AccountContext, peerId: PeerId, loadCompleted: @escaping () -> Void = {}) -> ViewController {
+public func channelAdminsController(context: AccountContext, peerId initialPeerId: PeerId, loadCompleted: @escaping () -> Void = {}) -> ViewController {
     let statePromise = ValuePromise(ChannelAdminsControllerState(), ignoreRepeated: true)
     let stateValue = Atomic(value: ChannelAdminsControllerState())
     let updateState: ((ChannelAdminsControllerState) -> ChannelAdminsControllerState) -> Void = { f in
@@ -517,26 +517,40 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
     
     var upgradedToSupergroupImpl: ((PeerId, @escaping () -> Void) -> Void)?
     
+    let currentPeerId = ValuePromise<PeerId>(initialPeerId)
+    
     let upgradedToSupergroup: (PeerId, @escaping () -> Void) -> Void = { upgradedPeerId, f in
+        currentPeerId.set(upgradedPeerId)
         upgradedToSupergroupImpl?(upgradedPeerId, f)
     }
     
     let transferedOwnership: (PeerId) -> Void = { memberId in
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        let _ = (context.account.postbox.transaction { transaction -> (channel: Peer?, user: Peer?) in
+        let _ = (currentPeerId.get()
+        |> take(1)
+        |> mapToSignal { peerId in
+            context.account.postbox.transaction { transaction -> (channel: Peer?, user: Peer?) in
                 return (channel: transaction.getPeer(peerId), user: transaction.getPeer(memberId))
-        } |> deliverOnMainQueue).start(next: { peer, user in
+            }
+        }
+        |> deliverOnMainQueue).start(next: { peer, user in
             guard let peer = peer, let user = user else {
                 return
             }
-            presentControllerImpl?(UndoOverlayController(presentationData: context.sharedContext.currentPresentationData.with { $0 }, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(user.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0), elevatedLayout: false, action: { _ in }), nil)
+            presentControllerImpl?(UndoOverlayController(presentationData: context.sharedContext.currentPresentationData.with { $0 }, content: .succeed(text: presentationData.strings.Channel_OwnershipTransfer_TransferCompleted(user.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0), elevatedLayout: false, action: { _ in return false }), nil)
         })
     }
     
     let peerView = Promise<PeerView>()
-    peerView.set(context.account.viewTracker.peerView(peerId))
+    peerView.set(currentPeerId.get()
+    |> mapToSignal { peerId in
+        return context.account.viewTracker.peerView(peerId)
+    })
     
     let arguments = ChannelAdminsControllerArguments(context: context, openRecentActions: {
+        let _ = (currentPeerId.get()
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { peerId in
             let _ = (context.account.postbox.loadedPeerWithId(peerId)
             |> deliverOnMainQueue).start(next: { peer in
                 if peer is TelegramGroup {
@@ -544,6 +558,7 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
                     pushControllerImpl?(context.sharedContext.makeChatRecentActionsController(context: context, peer: peer))
                 }
             })
+        })
     }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in
         updateState { state in
             if (peerId == nil && fromPeerId == state.peerIdWithRevealedOptions) || (peerId != nil && fromPeerId == nil) {
@@ -553,6 +568,9 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
             }
         }
     }, removeAdmin: { adminId in
+        let _ = (currentPeerId.get()
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { peerId in
             updateState {
                 return $0.withUpdatedRemovingPeerId(adminId)
             }
@@ -571,7 +589,11 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
                     }
                 }))
             }
+        })
     }, addAdmin: {
+        let _ = (currentPeerId.get()
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { peerId in
             let _ = (peerView.get()
             |> take(1)
             |> deliverOnMainQueue).start(next: { peerView in
@@ -616,15 +638,26 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
                     return current
                 }
             })
+        })
     }, openAdmin: { participant in
+        let _ = (currentPeerId.get()
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { peerId in
             pushControllerImpl?(channelAdminController(context: context, peerId: peerId, adminId: participant.peerId, initialParticipant: participant, updated: { _ in
             }, upgradedToSupergroup: upgradedToSupergroup, transferedOwnership: transferedOwnership))
         })
+    })
     
-    let membersAndLoadMoreControl: (Disposable, PeerChannelMemberCategoryControl?)
+    let membersAndLoadMoreControlValue = Atomic<(Disposable, PeerChannelMemberCategoryControl?)?>(value: nil)
+    
+    let membersDisposableValue = MetaDisposable()
+    actionsDisposable.add(membersDisposableValue)
+    
+    actionsDisposable.add((currentPeerId.get()
+    |> deliverOnMainQueue).start(next: { peerId in
         if peerId.namespace == Namespaces.Peer.CloudChannel {
             var didReportLoadCompleted = false
-        membersAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId) { membersState in
+            let membersAndLoadMoreControl: (Disposable, PeerChannelMemberCategoryControl?) = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId) { membersState in
                 if case .loading = membersState.loadingState, membersState.list.isEmpty {
                     adminsPromise.set(.single(nil))
                 } else {
@@ -635,6 +668,8 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
                     }
                 }
             }
+            let _ = membersAndLoadMoreControlValue.swap(membersAndLoadMoreControl)
+            membersDisposableValue.set(membersAndLoadMoreControl.0)
         } else {
             loadCompleted()
             let membersDisposable = (peerView.get()
@@ -676,17 +711,19 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
             }).start(next: { members in
                 adminsPromise.set(.single(members))
             })
-        membersAndLoadMoreControl = (membersDisposable, nil)
+            let membersAndLoadMoreControl: (Disposable, PeerChannelMemberCategoryControl?) = (membersDisposable, nil)
+            let _ = membersAndLoadMoreControlValue.swap(membersAndLoadMoreControl)
+            membersDisposableValue.set(membersAndLoadMoreControl.0)
         }
-    
+    }))
-    let (membersDisposable, loadMoreControl) = membersAndLoadMoreControl
-    actionsDisposable.add(membersDisposable)
     
     var previousPeers: [RenderedChannelParticipant]?
     
     let signal = combineLatest(queue: .mainQueue(), presentationDataSignal, statePromise.get(), peerView.get(), adminsPromise.get() |> deliverOnMainQueue)
     |> deliverOnMainQueue
     |> map { presentationData, state, view, admins -> (ItemListControllerState, (ItemListNodeState, Any)) in
+        let peerId = view.peerId
+        
         var rightNavigationButton: ItemListNavigationButton?
         var secondaryRightNavigationButton: ItemListNavigationButton?
         if let admins = admins, admins.count > 1 {
@@ -783,17 +820,33 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa
             return
         }
         
-        rebuildControllerStackAfterSupergroupUpgrade(controller: controller, navigationController: navigationController)
+        var replacedSelf = false
+        rebuildControllerStackAfterSupergroupUpgrade(controller: controller, navigationController: navigationController, replace: { c in
+            if c === controller {
+                replacedSelf = true
+                return channelAdminsController(context: context, peerId: upgradedPeerId, loadCompleted: {
+                })
+            } else {
+                return c
+            }
+        })
+        f()
     }
     controller.visibleBottomContentOffsetChanged = { offset in
         if case let .known(value) = offset, value < 40.0 {
+            let _ = (currentPeerId.get()
+            |> take(1)
+            |> deliverOnMainQueue).start(next: { peerId in
+                if let loadMoreControl = membersAndLoadMoreControlValue.with({ $0?.1 }) {
                     context.peerChannelMemberCategoriesContextsManager.loadMore(peerId: peerId, control: loadMoreControl)
                 }
+            })
+        }
     }
     return controller
 }
 
-func rebuildControllerStackAfterSupergroupUpgrade(controller: ViewController, navigationController: NavigationController) {
+func rebuildControllerStackAfterSupergroupUpgrade(controller: ViewController, navigationController: NavigationController, replace: ((UIViewController) -> UIViewController)? = nil) {
     var controllers = navigationController.viewControllers
     for i in 0 ..< controllers.count {
         if controllers[i] === controller {
@@ -806,5 +859,10 @@ func rebuildControllerStackAfterSupergroupUpgrade(controller: ViewController, na
             break
         }
     }
+    for i in 0 ..< controllers.count {
+        if let replace = replace {
+            controllers[i] = replace(controllers[i])
+        }
+    }
     navigationController.setViewControllers(controllers, animated: false)
 }