Fix merge

This commit is contained in:
Peter Iakovlev
2019-02-05 17:03:43 +04:00
parent 6713e11d2a
commit cbbf1cd7e9
7 changed files with 492 additions and 539 deletions

View File

@@ -348,7 +348,7 @@ func twoStepVerificationPasswordEntryController(context: AccountContext, mode: T
presentControllerImpl?(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
}))
case let .setupEmail(password):
updatePasswordDisposable.set((updateTwoStepVerificationEmail(account: context.account, currentPassword: password, updatedEmail: email) |> deliverOnMainQueue).start(next: { update in
updatePasswordDisposable.set((updateTwoStepVerificationEmail(network: context.account.network, currentPassword: password, updatedEmail: email) |> deliverOnMainQueue).start(next: { update in
updateState {
$0.withUpdatedUpdating(false)
}