Merge branch 'develop' into protection_fine_tuning

This commit is contained in:
ismailgulek
2020-09-29 18:33:22 +03:00
committed by GitHub
27 changed files with 697 additions and 133 deletions

View File

@@ -178,7 +178,7 @@ final class SetupBiometricsViewController: UIViewController {
guard let biometricsName = viewModel.localizedBiometricsName() else { return }
self.titleLabel.text = VectorL10n.biometricsDesetupTitleX(biometricsName)
self.subtitleLabel.text = VectorL10n.biometricsDesetupSubtitle
self.subtitleLabel.text = nil
self.biometricsIconImageView.image = viewModel.biometricsIcon()
self.enableButton.setTitle(VectorL10n.biometricsDesetupDisableButtonTitleX(biometricsName), for: .normal)
}