Fix #1585

Dimillian · Sep 22, 2023 · 7efd8ed · 7efd8ed
1 parent cc32845
commit 7efd8ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/IceCubesApp/App/IceCubesApp.swift b/IceCubesApp/App/IceCubesApp.swift
@@ -115,34 +115,32 @@ struct IceCubesApp: App {
                 popToRootTab: $popToRootTab,
                 tabs: availableTabs)
     {
-      GeometryReader { _ in
-        HStack(spacing: 0) {
-          ZStack {
-            if selectedTab == .profile {
-              ProfileTab(popToRootTab: $popToRootTab)
-            }
-            ForEach(availableTabs) { tab in
-              if tab == selectedTab || sideBarLoadedTabs.contains(tab) {
-                tab
-                  .makeContentView(popToRootTab: $popToRootTab)
-                  .opacity(tab == selectedTab ? 1 : 0)
-                  .transition(.opacity)
-                  .id("\(tab)\(appAccountsManager.currentAccount.id)")
-                  .onAppear {
-                    sideBarLoadedTabs.insert(tab)
-                  }
-              } else {
-                EmptyView()
-              }
-            }
+      HStack(spacing: 0) {
+        ZStack {
+          if selectedTab == .profile {
+            ProfileTab(popToRootTab: $popToRootTab)
           }
-          if appAccountsManager.currentClient.isAuth,
-             userPreferences.showiPadSecondaryColumn
-          {
-            Divider().edgesIgnoringSafeArea(.all)
-            notificationsSecondaryColumn
+          ForEach(availableTabs) { tab in
+            if tab == selectedTab || sideBarLoadedTabs.contains(tab) {
+              tab
+                .makeContentView(popToRootTab: $popToRootTab)
+                .opacity(tab == selectedTab ? 1 : 0)
+                .transition(.opacity)
+                .id("\(tab)\(appAccountsManager.currentAccount.id)")
+                .onAppear {
+                  sideBarLoadedTabs.insert(tab)
+                }
+            } else {
+              EmptyView()
+            }
           }
         }
+        if appAccountsManager.currentClient.isAuth,
+           userPreferences.showiPadSecondaryColumn
+        {
+          Divider().edgesIgnoringSafeArea(.all)
+          notificationsSecondaryColumn
+        }
       }
     }.onChange(of: $appAccountsManager.currentAccount.id) {
       sideBarLoadedTabs.removeAll()

diff --git a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
@@ -95,6 +95,12 @@ struct TimelineTab: View {
       if client.isAuth, newValue == .home || newValue == .federated || newValue == .local {
         lastTimelineFilter = newValue
       }
+      switch newValue {
+      case .tagGroup:
+        break
+      default:
+        selectedTagGroup = nil
+      }
     }
     .withSafariRouter()
     .environment(routerPath)