From 5fb2795b110555140552333abdd8ad1bf8762101 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 17 Mar 2021 23:27:15 +0400 Subject: [PATCH 1/2] Fix raised hand status --- .../TelegramCallsUI/Sources/PresentationGroupCall.swift | 2 +- .../TelegramPresentationData/Sources/PresentationData.swift | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift index a9d102bab9..47545458bb 100644 --- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift +++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift @@ -1495,7 +1495,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall { let previousRaisedHand = strongSelf.stateValue.raisedHand if !(strongSelf.stateValue.muteState?.canUnmute ?? false) { - strongSelf.stateValue.raisedHand = participant.raiseHandRating != nil + strongSelf.stateValue.raisedHand = participant.hasRaiseHand } if let muteState = participant.muteState, muteState.canUnmute && previousRaisedHand { diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index 1850dd0668..b8eee86679 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -158,12 +158,14 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat { var dateSeparator = "/" var dateSuffix = "" if let dateString = DateFormatter.dateFormat(fromTemplate: "MdY", options: 0, locale: locale) { - for separator in [".", "/", "-", "/"] { + for separator in [". ", ".", "/", "-", "/"] { if dateString.contains(separator) { if separator == ". " { dateSuffix = "." + dateSeparator = "." + } else { + dateSeparator = separator } - dateSeparator = separator break } } From cd6af7d5378f746b7be0c11693b3f6a0282644e9 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 18 Mar 2021 00:33:48 +0400 Subject: [PATCH 2/2] Fix account selection for voice chats from Calls screen --- submodules/CallListUI/Sources/CallListControllerNode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/CallListUI/Sources/CallListControllerNode.swift b/submodules/CallListUI/Sources/CallListControllerNode.swift index 3e73269d38..384c5aab58 100644 --- a/submodules/CallListUI/Sources/CallListControllerNode.swift +++ b/submodules/CallListUI/Sources/CallListControllerNode.swift @@ -383,7 +383,7 @@ final class CallListControllerNode: ASDisplayNode { } if let activeCall = activeCall { - strongSelf.context.joinGroupCall(peerId: peerId, invite: nil, requestJoinAsPeerId: nil, activeCall: activeCall) + strongSelf.joinGroupCall(peerId, activeCall) } })) })