diff --git a/Telegram-iOS/Resources/Compass.tgs b/Telegram-iOS/Resources/Compass.tgs
index d9ec83eb77..535e4362bf 100644
Binary files a/Telegram-iOS/Resources/Compass.tgs and b/Telegram-iOS/Resources/Compass.tgs differ
diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
index 30d8fc5e4a..1eb8d5bb87 100644
--- a/submodules/ChatListUI/Sources/ChatListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -95,7 +95,7 @@ private final class ContextControllerContentSourceImpl: ContextControllerContent
     }
 }
 
-public class ChatListControllerImpl: TelegramBaseController, ChatListController, UIViewControllerPreviewingDelegate, TabBarContainedController {
+public class ChatListControllerImpl: TelegramBaseController, ChatListController, UIViewControllerPreviewingDelegate/*, TabBarContainedController*/ {
     private var validLayout: ContainerViewLayout?
     
     public let context: AccountContext
@@ -1804,7 +1804,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
         }
     }
     
-    public func presentTabBarPreviewingController(sourceNodes: [ASDisplayNode]) {
+    /*public func presentTabBarPreviewingController(sourceNodes: [ASDisplayNode]) {
         if self.isNodeLoaded {
             let _ = (self.context.account.postbox.transaction { transaction -> [ChatListFilter] in
                 let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
@@ -1849,5 +1849,5 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController,
     
     public func updateTabBarPreviewingControllerPresentation(_ update: TabBarContainedControllerPresentationUpdate) {
         
-    }
+    }*/
 }
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
index 49065df51e..321f7685c2 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
@@ -1,4 +1,4 @@
-import Foundation
+/*import Foundation
 import UIKit
 import Display
 import SwiftSignalKit
@@ -405,3 +405,4 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
     return controller
 }
 
+*/
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
index c71904a4af..3ca80247d1 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
@@ -1,4 +1,4 @@
-import Foundation
+/*import Foundation
 import UIKit
 import Display
 import SwiftSignalKit
@@ -206,3 +206,4 @@ func chatListFilterPresetListController(context: AccountContext, updated: @escap
     
     return controller
 }
+*/
diff --git a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift
index a0abf7e711..a420bcbf20 100644
--- a/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift
+++ b/submodules/GalleryUI/Sources/ZoomableContentGalleryItemNode.swift
@@ -7,7 +7,7 @@ private let leftFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaq
     let bounds = CGRect(origin: CGPoint(), size: size)
     context.clear(bounds)
     
-    let gradientColors = [UIColor.black.withAlphaComponent(0.5).cgColor, UIColor.black.withAlphaComponent(0.0).cgColor] as CFArray
+    let gradientColors = [UIColor.black.withAlphaComponent(0.35).cgColor, UIColor.black.withAlphaComponent(0.0).cgColor] as CFArray
     
     var locations: [CGFloat] = [0.0, 1.0]
     let colorSpace = CGColorSpaceCreateDeviceRGB()
@@ -20,7 +20,7 @@ private let rightFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opa
     let bounds = CGRect(origin: CGPoint(), size: size)
     context.clear(bounds)
     
-    let gradientColors = [UIColor.black.withAlphaComponent(0.0).cgColor, UIColor.black.withAlphaComponent(0.5).cgColor] as CFArray
+    let gradientColors = [UIColor.black.withAlphaComponent(0.0).cgColor, UIColor.black.withAlphaComponent(0.35).cgColor] as CFArray
     
     var locations: [CGFloat] = [0.0, 1.0]
     let colorSpace = CGColorSpaceCreateDeviceRGB()
@@ -63,12 +63,12 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate
         self.leftFadeNode = ASImageNode()
         self.leftFadeNode.contentMode = .scaleToFill
         self.leftFadeNode.image = leftFadeImage
-        self.leftFadeNode.isHidden = true
+        self.leftFadeNode.alpha = 0.0
         
         self.rightFadeNode = ASImageNode()
         self.rightFadeNode.contentMode = .scaleToFill
         self.rightFadeNode.image = rightFadeImage
-        self.rightFadeNode.isHidden = true
+        self.rightFadeNode.alpha = 0.0
         
         super.init()
         
@@ -90,21 +90,21 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate
         }
         tapRecognizer.highlight = { [weak self] location in
             if let strongSelf = self {
+                let transition: ContainedViewLayoutTransition = .animated(duration: 0.07, curve: .easeInOut)
                 if let location = location, location.x < 44.0 {
-                    strongSelf.leftFadeNode.isHidden = false
+                    transition.updateAlpha(node: strongSelf.leftFadeNode, alpha: 1.0)
                 } else {
-                    strongSelf.leftFadeNode.isHidden = true
+                    transition.updateAlpha(node: strongSelf.leftFadeNode, alpha: 0.0)
                 }
                 if let location = location, location.x > strongSelf.frame.width - 44.0 {
-                    strongSelf.rightFadeNode.isHidden = false
+                    transition.updateAlpha(node: strongSelf.rightFadeNode, alpha: 1.0)
                 } else {
-                    strongSelf.rightFadeNode.isHidden = true
+                    transition.updateAlpha(node: strongSelf.rightFadeNode, alpha: 0.0)
                 }
             }
         }
         
         self.scrollNode.view.addGestureRecognizer(tapRecognizer)
-        
 
         self.addSubnode(self.scrollNode)
         self.addSubnode(self.leftFadeNode)
@@ -114,9 +114,10 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate
     @objc open func contentTap(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) {
         if recognizer.state == .ended {
             if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation {
-                if location.x < 44.0 {
+                let pointInNode = self.scrollNode.view.convert(location, to: self.view)
+                if pointInNode.x < 44.0 {
                     self.goToPreviousItem()
-                } else if location.x > self.frame.width - 44.0 {
+                } else if pointInNode.x > self.frame.width - 44.0 {
                     self.goToNextItem()
                 } else {
                     switch gesture {
@@ -159,8 +160,9 @@ open class ZoomableContentGalleryItemNode: GalleryItemNode, UIScrollViewDelegate
         }
         self.containerLayout = layout
         
-        self.leftFadeNode.frame = CGRect(x: 0.0, y: 0.0, width: layout.size.width * 0.2, height: layout.size.height)
-        self.rightFadeNode.frame = CGRect(x: layout.size.width - layout.size.width * 0.2, y: 0.0, width: layout.size.width * 0.2, height: layout.size.height)
+        let fadeWidth = min(72.0, layout.size.width * 0.2)
+        self.leftFadeNode.frame = CGRect(x: 0.0, y: 0.0, width: fadeWidth, height: layout.size.height)
+        self.rightFadeNode.frame = CGRect(x: layout.size.width - fadeWidth, y: 0.0, width: fadeWidth, height: layout.size.height)
         
         if shouldResetContents {
             var previousFrame: CGRect?
diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
index b6f056e465..f32ae41fee 100644
--- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
+++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
@@ -24,6 +24,8 @@ import ContextUI
 import TelegramNotices
 import TelegramStringFormatting
 
+private let maxUsersDisplayedLimit: Int32 = 5
+
 private struct PeerNearbyEntry {
     let peer: (Peer, CachedPeerData?)
     let expires: Int32
@@ -57,14 +59,16 @@ private final class PeersNearbyControllerArguments {
     let openChat: (Peer) -> Void
     let openCreateGroup: (Double, Double, String?) -> Void
     let contextAction: (Peer, ASDisplayNode, ContextGesture?) -> Void
+    let expandUsers: () -> Void
     
-    init(context: AccountContext, toggleVisibility: @escaping (Bool) -> Void, openProfile: @escaping (Peer) -> Void, openChat: @escaping (Peer) -> Void, openCreateGroup: @escaping (Double, Double, String?) -> Void, contextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void) {
+    init(context: AccountContext, toggleVisibility: @escaping (Bool) -> Void, openProfile: @escaping (Peer) -> Void, openChat: @escaping (Peer) -> Void, openCreateGroup: @escaping (Double, Double, String?) -> Void, contextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void, expandUsers: @escaping () -> Void) {
         self.context = context
         self.toggleVisibility = toggleVisibility
         self.openProfile = openProfile
         self.openChat = openChat
         self.openCreateGroup = openCreateGroup
         self.contextAction = contextAction
+        self.expandUsers = expandUsers
     }
 }
 
@@ -82,6 +86,7 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
     case empty(PresentationTheme, String)
     case visibility(PresentationTheme, String, Bool)
     case user(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, PeerNearbyEntry)
+    case expand(PresentationTheme, String)
     
     case groupsHeader(PresentationTheme, String, Bool)
     case createGroup(PresentationTheme, String, Double?, Double?, String?)
@@ -94,7 +99,7 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
         switch self {
             case .header:
                 return PeersNearbySection.header.rawValue
-            case .usersHeader, .empty, .visibility, .user:
+            case .usersHeader, .empty, .visibility, .user, .expand:
                 return PeersNearbySection.users.rawValue
             case .groupsHeader, .createGroup, .group:
                 return PeersNearbySection.groups.rawValue
@@ -115,12 +120,14 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
                 return 3
             case let .user(index, _, _, _, _, _):
                 return 4 + index
-            case .groupsHeader:
+            case .expand:
                 return 1000
-            case .createGroup:
+            case .groupsHeader:
                 return 1001
+            case .createGroup:
+                return 1002
             case let .group(index, _, _, _, _, _):
-                return 1002 + index
+                return 1003 + index
             case .channelsHeader:
                 return 2000
             case let .channel(index, _, _, _, _, _):
@@ -161,6 +168,12 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
+            case let .expand(lhsTheme, lhsText):
+                if case let .expand(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
+                    return true
+                } else {
+                    return false
+                }
             case let .groupsHeader(lhsTheme, lhsText, lhsLoading):
                 if case let .groupsHeader(rhsTheme, rhsText, rhsLoading) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsLoading == rhsLoading {
                     return true
@@ -224,14 +237,19 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
                 })
             case let .user(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer):
                 var text = strings.Map_DistanceAway(stringForDistance(peer.distance)).0
-                if peer.peer.0.id == arguments.context.account.peerId {
+                let isSelfPeer = peer.peer.0.id == arguments.context.account.peerId
+                if isSelfPeer {
                     text = strings.PeopleNearby_VisibleUntil(humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: peer.expires)).0
                 }
-                return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(strings.Map_DistanceAway(stringForDistance(peer.distance)).0), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
-                    arguments.openProfile(peer.peer.0)
-                }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, contextAction: { node, gesture in
-                    arguments.contextAction(peer.peer.0, node, gesture)
-                }, hasTopGroupInset: false, tag: nil)
+                return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(text), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: !isSelfPeer, sectionId: self.section, action: {
+                    if !isSelfPeer {
+                        arguments.openProfile(peer.peer.0)
+                    }
+                }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, toggleUpdated: nil, contextAction: nil, hasTopGroupInset: false, tag: nil)
+            case let .expand(theme, title):
+                return ItemListPeerActionItem(presentationData: presentationData, icon: PresentationResourcesItemList.downArrowImage(theme), title: title, sectionId: self.section, editing: false, action: {
+                    arguments.expandUsers()
+                })
             case let .groupsHeader(theme, text, loading):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, activityIndicator: loading ? .left : .none, sectionId: self.section)
             case let .createGroup(theme, title, latitude, longitude, address):
@@ -294,7 +312,7 @@ private struct PeersNearbyData: Equatable {
     }
 }
 
-private func peersNearbyControllerEntries(data: PeersNearbyData?, presentationData: PresentationData, displayLoading: Bool) -> [PeersNearbyEntry] {
+private func peersNearbyControllerEntries(data: PeersNearbyData?, presentationData: PresentationData, displayLoading: Bool, expanded: Bool) -> [PeersNearbyEntry] {
     var entries: [PeersNearbyEntry] = []
     
     entries.append(.header(presentationData.theme, presentationData.strings.PeopleNearby_DiscoverDescription))
@@ -305,10 +323,22 @@ private func peersNearbyControllerEntries(data: PeersNearbyData?, presentationDa
     
     if let data = data, !data.users.isEmpty {
         var i: Int32 = 0
-        for user in data.users {
+        var users = data.users
+        var effectiveExpanded = expanded
+        if users.count > maxUsersDisplayedLimit && !expanded {
+            users = Array(users.prefix(Int(maxUsersDisplayedLimit)))
+        } else {
+            effectiveExpanded = true
+        }
+        
+        for user in users {
             entries.append(.user(i, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, user))
             i += 1
         }
+        
+        if !effectiveExpanded {
+            entries.append(.expand(presentationData.theme, presentationData.strings.PeopleNearby_ShowMorePeople(Int32(data.users.count) - maxUsersDisplayedLimit)))
+        }
     }
     
     entries.append(.groupsHeader(presentationData.theme, presentationData.strings.PeopleNearby_Groups.uppercased(), displayLoading && data == nil))
@@ -429,6 +459,9 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
     let dataPromise = Promise<PeersNearbyData?>(nil)
     let addressPromise = Promise<String?>(nil)
     
+    let visibilityPromise = ValuePromise<Bool>(true)
+    let expandedPromise = ValuePromise<Bool>(false)
+    
     let coordinatePromise = Promise<CLLocationCoordinate2D?>(nil)
     coordinatePromise.set(.single(nil) |> then(currentLocationManagerCoordinate(manager: context.sharedContext.locationManager!, timeout: 5.0)))
     
@@ -440,12 +473,16 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
                 let _ = (coordinatePromise.get()
                 |> deliverOnMainQueue).start(next: { coordinate in
                     if let coordinate = coordinate {
-                        let _ = peersNearbyUpdateVisibility(network: context.account.network, stateManager: context.account.stateManager, update: .visible(latitude: coordinate.latitude, longitude: coordinate.longitude), background: false).start()
+                        let _ = peersNearbyUpdateVisibility(account: context.account, update: .visible(latitude: coordinate.latitude, longitude: coordinate.longitude), background: false).start()
                     }
                 })
             })]), nil)
+            
+            visibilityPromise.set(true)
         } else {
-            let _ = peersNearbyUpdateVisibility(network: context.account.network, stateManager: context.account.stateManager, update: .invisible, background: false).start()
+            let _ = peersNearbyUpdateVisibility(account: context.account, update: .invisible, background: false).start()
+            
+            visibilityPromise.set(false)
         }
     }, openProfile: { peer in
         navigateToProfileImpl?(peer)
@@ -498,6 +535,8 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
             presentControllerImpl?(c, nil)
         }), reactionItems: [], gesture: gesture)
         presentInGlobalOverlayImpl?(contextController)
+    }, expandUsers: {
+        expandedPromise.set(true)
     })
     
     let dataSignal: Signal<PeersNearbyData?, NoError> = coordinatePromise.get()
@@ -569,9 +608,9 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
         |> delay(1.0, queue: Queue.mainQueue())
     )
     
-    let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), displayLoading)
+    let signal = combineLatest(context.sharedContext.presentationData, dataPromise.get(), displayLoading, visibilityPromise.get(), expandedPromise.get())
     |> deliverOnMainQueue
-    |> map { presentationData, data, displayLoading -> (ItemListControllerState, (ItemListNodeState, Any)) in
+    |> map { presentationData, data, displayLoading, visibility, expanded -> (ItemListControllerState, (ItemListNodeState, Any)) in
         let previous = previousData.swap(data)
         
         var crossfade = false
@@ -583,7 +622,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
         }
         
         let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.PeopleNearby_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: true)
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: peersNearbyControllerEntries(data: data, presentationData: presentationData, displayLoading: displayLoading), style: .blocks, emptyStateItem: nil, crossfadeState: crossfade, animateChanges: !crossfade)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: peersNearbyControllerEntries(data: data, presentationData: presentationData, displayLoading: displayLoading, expanded: expanded), style: .blocks, emptyStateItem: nil, crossfadeState: crossfade, animateChanges: !crossfade)
         
         return (controllerState, (listState, arguments))
     }
@@ -596,7 +635,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
         controller?.clearItemNodesHighlight(animated: true)
     }
     navigateToProfileImpl = { [weak controller] peer in
-        if let navigationController = controller?.navigationController as? NavigationController, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: true) {
+        if let navigationController = controller?.navigationController as? NavigationController, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false, fromChat: false) {
             (navigationController as? NavigationController)?.pushViewController(controller)
         }
     }
diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift
index 76d058ee03..1af4170023 100644
--- a/submodules/SyncCore/Sources/Namespaces.swift
+++ b/submodules/SyncCore/Sources/Namespaces.swift
@@ -197,6 +197,7 @@ private enum PreferencesKeyValues: Int32 {
     case walletCollection = 18
     case contentSettings = 19
     case chatListFilters = 20
+    case peersNearby = 21
 }
 
 public func applicationSpecificPreferencesKey(_ value: Int32) -> ValueBoxKey {
@@ -313,6 +314,12 @@ public struct PreferencesKeys {
         key.setInt32(0, value: PreferencesKeyValues.chatListFilters.rawValue)
         return key
     }()
+    
+    public static let peersNearby: ValueBoxKey = {
+        let key = ValueBoxKey(length: 4)
+        key.setInt32(0, value: PreferencesKeyValues.peersNearby.rawValue)
+        return key
+    }()
 }
 
 private enum SharedDataKeyValues: Int32 {
diff --git a/submodules/TelegramCore/Sources/AuthTransfer.swift b/submodules/TelegramCore/Sources/AuthTransfer.swift
index 793079c53e..e661aa715d 100644
--- a/submodules/TelegramCore/Sources/AuthTransfer.swift
+++ b/submodules/TelegramCore/Sources/AuthTransfer.swift
@@ -18,7 +18,7 @@ public enum ExportAuthTransferTokenResult {
     case displayToken(AuthTransferExportedToken)
     case changeAccountAndRetry(UnauthorizedAccount)
     case loggedIn
-    case passwordRequested
+    case passwordRequested(UnauthorizedAccount)
 }
 
 public func exportAuthTransferToken(accountManager: AccountManager, account: UnauthorizedAccount, otherAccountUserIds: [Int32], syncContacts: Bool) -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> {
@@ -42,8 +42,6 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una
                         return nil
                     }
                     |> castError(ExportAuthTransferTokenError.self)
-                    
-                    return .single(nil)
                 }
             }
         } else {
@@ -52,7 +50,7 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una
     }
     |> mapToSignal { result -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> in
         guard let result = result else {
-            return .single(.passwordRequested)
+            return .single(.passwordRequested(account))
         }
         switch result {
         case let .loginToken(expires, token):
@@ -66,7 +64,7 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una
                 |> map(Optional.init)
                 |> `catch` { error -> Signal<Api.auth.LoginToken?, ExportAuthTransferTokenError> in
                     if error.errorDescription == "SESSION_PASSWORD_NEEDED" {
-                        return account.network.request(Api.functions.account.getPassword(), automaticFloodWait: false)
+                        return updatedAccount.network.request(Api.functions.account.getPassword(), automaticFloodWait: false)
                         |> mapError { error -> ExportAuthTransferTokenError in
                             if error.errorDescription.hasPrefix("FLOOD_WAIT") {
                                 return .limitExceeded
@@ -77,13 +75,11 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una
                         |> mapToSignal { result -> Signal<Api.auth.LoginToken?, ExportAuthTransferTokenError> in
                             switch result {
                             case let .password(password):
-                                return account.postbox.transaction { transaction -> Api.auth.LoginToken? in
-                                    transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .passwordEntry(hint: password.hint ?? "", number: nil, code: nil, suggestReset: false, syncContacts: syncContacts)))
+                                return updatedAccount.postbox.transaction { transaction -> Api.auth.LoginToken? in
+                                    transaction.setState(UnauthorizedAccountState(isTestingEnvironment: updatedAccount.testingEnvironment, masterDatacenterId: updatedAccount.masterDatacenterId, contents: .passwordEntry(hint: password.hint ?? "", number: nil, code: nil, suggestReset: false, syncContacts: syncContacts)))
                                     return nil
                                 }
                                 |> castError(ExportAuthTransferTokenError.self)
-                                
-                                return .single(nil)
                             }
                         }
                     } else {
@@ -91,8 +87,11 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una
                     }
                 }
                 |> mapToSignal { result -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> in
+                    guard let result = result else {
+                        return .single(.passwordRequested(updatedAccount))
+                    }
                     switch result {
-                    case let .loginTokenSuccess(authorization)?:
+                    case let .loginTokenSuccess(authorization):
                         switch authorization {
                         case let .authorization(_, _, user):
                             return updatedAccount.postbox.transaction { transaction -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> in
diff --git a/submodules/TelegramCore/Sources/BankCards.swift b/submodules/TelegramCore/Sources/BankCards.swift
index f0db9d6304..b600491d83 100644
--- a/submodules/TelegramCore/Sources/BankCards.swift
+++ b/submodules/TelegramCore/Sources/BankCards.swift
@@ -2,33 +2,58 @@ import Foundation
 import Postbox
 import TelegramApi
 import SyncCore
+import MtProtoKit
 import SwiftSignalKit
 
+public struct BankCardUrl {
+    public let title: String
+    public let url: String
+}
+
 public struct BankCardInfo {
     public let title: String
-    public let url: String?
-    public let actionTitle: String?
+    public let urls: [BankCardUrl]
 }
 
 public func getBankCardInfo(account: Account, cardNumber: String) -> Signal<BankCardInfo?, NoError> {
-    return account.network.request(Api.functions.payments.getBankCardData(number: cardNumber))
-    |> map { result -> BankCardInfo? in
-        return BankCardInfo(apiBankCardData: result)
+    return currentWebDocumentsHostDatacenterId(postbox: account.postbox, isTestingEnvironment: false)
+    |> mapToSignal { datacenterId in
+        let signal: Signal<Api.payments.BankCardData, MTRpcError>
+        if account.network.datacenterId != datacenterId {
+            signal = account.network.download(datacenterId: Int(datacenterId), isMedia: false, tag: nil)
+            |> castError(MTRpcError.self)
+            |> mapToSignal { worker in
+                return worker.request(Api.functions.payments.getBankCardData(number: cardNumber))
+            }
+        } else {
+            signal = account.network.request(Api.functions.payments.getBankCardData(number: cardNumber))
+        }
+        return signal
+        |> map { result -> BankCardInfo? in
+            return BankCardInfo(apiBankCardData: result)
+        }
+        |> `catch` { _ -> Signal<BankCardInfo?, NoError> in
+            return .single(nil)
+        }
     }
-    |> `catch` { _ -> Signal<BankCardInfo?, NoError> in
-        return .single(nil)
+}
+
+extension BankCardUrl {
+    init(apiBankCardOpenUrl: Api.BankCardOpenUrl) {
+        switch apiBankCardOpenUrl {
+            case let .bankCardOpenUrl(url, name):
+                self.title = name
+                self.url = url
+        }
     }
 }
 
 extension BankCardInfo {
     init(apiBankCardData: Api.payments.BankCardData) {
         switch apiBankCardData {
-            case let .bankCardData(flags, title, url, urlName):
+            case let .bankCardData(title, urls):
                 self.title = title
-                self.url = url
-                self.actionTitle = urlName
+                self.urls = urls.map { BankCardUrl(apiBankCardOpenUrl: $0) }
         }
     }
 }
-
-
diff --git a/submodules/TelegramCore/Sources/ChannelStatistics.swift b/submodules/TelegramCore/Sources/ChannelStatistics.swift
index 1e501b535b..ff2a71fdfd 100644
--- a/submodules/TelegramCore/Sources/ChannelStatistics.swift
+++ b/submodules/TelegramCore/Sources/ChannelStatistics.swift
@@ -133,7 +133,8 @@ public struct ChannelStatsContextState: Equatable {
 }
 
 private func requestStats(network: Network, datacenterId: Int32, peer: Peer, dark: Bool = false) -> Signal<ChannelStats?, NoError> {
-    guard let inputChannel = apiInputChannel(peer) else {
+    return .never()
+    /*guard let inputChannel = apiInputChannel(peer) else {
         return .never()
     }
     
@@ -159,11 +160,12 @@ private func requestStats(network: Network, datacenterId: Int32, peer: Peer, dar
     }
     |> `catch` { _ -> Signal<ChannelStats?, NoError> in
         return .single(nil)
-    }
+    }*/
 }
 
 private func requestGraph(network: Network, datacenterId: Int32, token: String) -> Signal<ChannelStatsGraph?, NoError> {
-    let signal: Signal<Api.StatsGraph, MTRpcError>
+    return .never()
+    /*let signal: Signal<Api.StatsGraph, MTRpcError>
     if network.datacenterId != datacenterId {
         signal = network.download(datacenterId: Int(datacenterId), isMedia: false, tag: nil)
         |> castError(MTRpcError.self)
@@ -180,7 +182,7 @@ private func requestGraph(network: Network, datacenterId: Int32, token: String)
     }
     |> `catch` { _ -> Signal<ChannelStatsGraph?, NoError> in
         return .single(nil)
-    }
+    }*/
 }
 
 private final class ChannelStatsContextImpl {
@@ -361,7 +363,7 @@ public final class ChannelStatsContext {
     }
 }
 
-extension ChannelStatsGraph {
+/*extension ChannelStatsGraph {
     init(apiStatsGraph: Api.StatsGraph) {
         switch apiStatsGraph {
             case let .statsGraph(json):
@@ -422,3 +424,4 @@ extension ChannelStats {
         }
     }
 }
+*/
diff --git a/submodules/TelegramCore/Sources/PeersNearby.swift b/submodules/TelegramCore/Sources/PeersNearby.swift
index 4ea533867d..b6eda7311b 100644
--- a/submodules/TelegramCore/Sources/PeersNearby.swift
+++ b/submodules/TelegramCore/Sources/PeersNearby.swift
@@ -25,7 +25,7 @@ public enum PeerNearbyVisibilityUpdate {
     case invisible
 }
 
-public func peersNearbyUpdateVisibility(network: Network, stateManager: AccountStateManager, update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal<Void, NoError> {
+public func peersNearbyUpdateVisibility(account: Account, update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal<Void, NoError> {
     var flags: Int32 = 0
     var geoPoint: Api.InputGeoPoint
     var selfExpires: Int32?
@@ -43,18 +43,30 @@ public func peersNearbyUpdateVisibility(network: Network, stateManager: AccountS
             selfExpires = 0
     }
     
+    let _ = (account.postbox.transaction { transaction in
+        transaction.updatePreferencesEntry(key: PreferencesKeys.peersNearby, { entry in
+            var settings = entry as? PeersNearbyState ?? PeersNearbyState.default
+            if let expires = selfExpires {
+                settings.visibilityExpires = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) + expires
+            } else if case .invisible = update {
+                settings.visibilityExpires = nil
+            }
+            return settings
+        })
+    }).start()
+
     if background {
         flags |= (1 << 1)
     }
         
-    return network.request(Api.functions.contacts.getLocated(flags: flags, geoPoint: geoPoint, selfExpires: selfExpires))
+    return account.network.request(Api.functions.contacts.getLocated(flags: flags, geoPoint: geoPoint, selfExpires: selfExpires))
     |> map(Optional.init)
     |> `catch` { _ -> Signal<Api.Updates?, NoError> in
         return .single(nil)
     }
     |> mapToSignal { updates -> Signal<Void, NoError> in
         if let updates = updates {
-            stateManager.addUpdates(updates)
+            account.stateManager.addUpdates(updates)
         }
         return .complete()
     }
@@ -258,3 +270,33 @@ public func updateChannelGeoLocation(postbox: Postbox, network: Network, channel
         }
     }
 }
+
+public struct PeersNearbyState: PreferencesEntry, Equatable {
+    public var visibilityExpires: Int32?
+    
+    public static var `default` = PeersNearbyState(visibilityExpires: nil)
+    
+    public init(visibilityExpires: Int32?) {
+        self.visibilityExpires = visibilityExpires
+    }
+    
+    public init(decoder: PostboxDecoder) {
+        self.visibilityExpires = decoder.decodeOptionalInt32ForKey("expires")
+    }
+    
+    public func encode(_ encoder: PostboxEncoder) {
+        if let expires = self.visibilityExpires {
+            encoder.encodeInt32(expires, forKey: "expires")
+        } else {
+            encoder.encodeNil(forKey: "expires")
+        }
+    }
+    
+    public func isEqual(to: PreferencesEntry) -> Bool {
+        if let to = to as? PeersNearbyState, self == to {
+            return true
+        } else {
+            return false
+        }
+    }
+}
diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift
index b4069a9b3c..823060560c 100644
--- a/submodules/TelegramUI/TelegramUI/ChatController.swift
+++ b/submodules/TelegramUI/TelegramUI/ChatController.swift
@@ -1359,17 +1359,18 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         guard let message = message else {
                             return
                         }
+                        
                         let _ = (getBankCardInfo(account: strongSelf.context.account, cardNumber: number)
                         |> deliverOnMainQueue).start(next: { [weak self] info in
                             if let strongSelf = self, let info = info {
                                 let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
                                 var items: [ActionSheetItem] = []
                                 items.append(ActionSheetTextItem(title: info.title))
-                                if let url = info.url, let actionTitle = info.actionTitle {
-                                    items.append(ActionSheetButtonItem(title: actionTitle, color: .accent, action: { [weak actionSheet] in
+                                for url in info.urls {
+                                    items.append(ActionSheetButtonItem(title: url.title, color: .accent, action: { [weak actionSheet] in
                                         actionSheet?.dismissAnimated()
                                         if let strongSelf = self {
-                                            strongSelf.controllerInteraction?.openUrl(url, false, false, message)
+                                            strongSelf.controllerInteraction?.openUrl(url.url, false, false, message)
                                         }
                                     }))
                                 }