Filtering fixes

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -2274,7 +2274,8 @@ - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
     self.recentsTableView.contentOffset = CGPointMake(0, self.recentsSearchBar.frame.size.height);
     self.recentsTableView.tableHeaderView = nil;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self refreshRecentsTable];
+        [self.recentsDataSource searchWithPatterns:nil];
+        [self.recentsSearchBar setText:nil];
     });
 }
 

Riot/Modules/Home/HomeViewController.m

@@ -114,7 +114,7 @@ - (void)viewWillAppear:(BOOL)animated
         [recentsDataSource setDelegate:self andRecentsDataSourceMode:RecentsDataSourceModeHome];
 
         // Reset filtering on the shared data source when switching tabs
-        [self searchBarCancelButtonClicked:self.recentsSearchBar];
+        [recentsDataSource searchWithPatterns:nil];
         [self.recentsSearchBar setText:nil];
     }
 }

Riot/Modules/Home/VersionCheck/HomeViewControllerWithBannerWrapperViewController.swift

@@ -44,11 +44,16 @@ class HomeViewControllerWithBannerWrapperViewController: UIViewController, MXKVi
         view.backgroundColor = .clear
 
         stackView = UIStackView()
+        stackView.translatesAutoresizingMaskIntoConstraints = false
         stackView.axis = .vertical
         stackView.distribution = .fill
         stackView.alignment = .fill
 
-        view.vc_addSubViewMatchingParentSafeArea(stackView)
+        view.addSubview(stackView)
+        NSLayoutConstraint.activate([stackView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor),
+                                     stackView.leftAnchor.constraint(equalTo: self.view.leftAnchor),
+                                     stackView.rightAnchor.constraint(equalTo: self.view.rightAnchor),
+                                     stackView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)])
 
         addChild(homeViewController)
         stackView.addArrangedSubview(homeViewController.view)

changelog.d/6130.bugfix

@@ -0,0 +1 @@
+Fixed filtering search bar not resetting properly when cancelling or switching tabs.

changelog.d/pr-6184.bugfix

@@ -0,0 +1 @@
+Fixed home screen shrinking too much on opening the keyboard.