Fix #7851: Tab selection for TabsBar interface is done after active w…

…ebsite is loaded (#8032)

Sources/Brave/Frontend/Browser/BrowserViewController.swift

@@ -1069,6 +1069,8 @@ public class BrowserViewController: UIViewController {
     }
     searchController?.additionalSafeAreaInsets = additionalInsets
     favoritesController?.additionalSafeAreaInsets = additionalInsets
+
+    tabsBar.reloadDataAndRestoreSelectedTab(isAnimated: false)
   }
 
   override public var canBecomeFirstResponder: Bool {

Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+WKNavigationDelegate.swift

@@ -686,8 +686,6 @@ extension BrowserViewController: WKNavigationDelegate {
         // Set rewards inter site url as new page load url.
         rewardsXHRLoadURL = webView.url
       }
-
-      tabsBar.reloadDataAndRestoreSelectedTab()
 
       if tab.walletEthProvider != nil {
         tab.emitEthereumEvent(.connect)

Sources/Brave/Frontend/Browser/Tabs/TabBar/TabsBarViewController.swift

@@ -240,17 +240,23 @@ class TabsBarViewController: UIViewController {
     }
   }
 
-  func reloadDataAndRestoreSelectedTab() {
+  func reloadDataAndRestoreSelectedTab(isAnimated: Bool? = nil) {
     collectionView.reloadData()
 
     guard let tabManager = tabManager, let selectedTabIndex = selectedTabIndexPath else {
       return
     }
+
+    var scrollTabsBarAnimated = !tabManager.isRestoring
+
+    if let isAnimated = isAnimated {
+      scrollTabsBarAnimated = isAnimated
+    }
 
     if selectedTabIndex.row < tabList.count() {
       collectionView.selectItem(
         at: selectedTabIndex,
-        animated: (!tabManager.isRestoring),
+        animated: scrollTabsBarAnimated,
         scrollPosition: .centeredHorizontally)
     }
   }