diff --git a/Riot/Modules/Authentication/AuthenticationViewController.m b/Riot/Modules/Authentication/AuthenticationViewController.m
index 76667cb58..c44b79f92 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/AuthenticationViewController.m
@@ -79,6 +79,8 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
// Current SSO transaction id used to identify and validate the SSO authentication callback
@property (nonatomic, strong) NSString *ssoCallbackTxnId;
+@property (nonatomic, getter = isFirstViewAppearing) BOOL firstViewAppearing;
+
@end
@implementation AuthenticationViewController
@@ -110,6 +112,8 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
defaultCountryCode = @"GB";
didCheckFalseAuthScreenDisplay = NO;
+
+ _firstViewAppearing = YES;
}
- (void)viewDidLoad
@@ -302,6 +306,11 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
{
[super viewDidAppear:animated];
+ if (self.isFirstViewAppearing)
+ {
+ self.firstViewAppearing = NO;
+ }
+
if (self.keyVerificationCoordinatorBridgePresenter)
{
return;
@@ -333,6 +342,16 @@ static const CGFloat kAuthInputContainerViewMinHeightConstraintConstant = 150.0;
[super viewDidDisappear:animated];
}
+- (void)viewDidLayoutSubviews
+{
+ [super viewDidLayoutSubviews];
+
+ if (self.isFirstViewAppearing)
+ {
+ [self refreshContentViewHeightConstraint];
+ }
+}
+
- (void)destroy
{
[super destroy];
diff --git a/Riot/Modules/Authentication/AuthenticationViewController.xib b/Riot/Modules/Authentication/AuthenticationViewController.xib
index 28b60026d..8312e0a28 100644
--- a/Riot/Modules/Authentication/AuthenticationViewController.xib
+++ b/Riot/Modules/Authentication/AuthenticationViewController.xib
@@ -135,7 +135,7 @@
-
+
@@ -410,7 +410,7 @@ Clear it if you're finished using this device, or want to sign in to another acc
-
+