Fix iOS 15 crash on remote messaging (#2041)

duckduckgo · Sep 26, 2023 · 6b5b394 · 6b5b394
1 parent dc15e7a
commit 6b5b394
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/DuckDuckGo/HomeCollectionView.swift b/DuckDuckGo/HomeCollectionView.swift
@@ -87,9 +87,7 @@ class HomeCollectionView: UICollectionView {
                 renderers.install(renderer: FavoritesHomeViewSectionRenderer(viewModel: favoritesViewModel))
 
             case .homeMessage:
-                if #available(iOS 16.0, *) {
-                    renderers.install(renderer: HomeMessageViewSectionRenderer(homePageConfiguration: homePageConfiguration))
-                }
+                renderers.install(renderer: HomeMessageViewSectionRenderer(homePageConfiguration: homePageConfiguration))
 
             case .appTrackingProtection:
 #if APP_TRACKING_PROTECTION

diff --git a/DuckDuckGo/HomeMessageView.swift b/DuckDuckGo/HomeMessageView.swift
@@ -46,9 +46,7 @@ struct HomeMessageView: View {
     @State var activityItem: ShareItem?
 
     var body: some View {
-        ZStack {
-            closeButtonHeader
-
+        ZStack(alignment: .topTrailing) {
             VStack(spacing: 8) {
                 Group {
                     topText
@@ -78,6 +76,11 @@ struct HomeMessageView: View {
             .multilineTextAlignment(.center)
             .padding(.vertical)
             .padding(.horizontal, 8)
+
+            closeButtonHeader
+                .alignmentGuide(.top) { dimension in
+                    dimension[.top]
+                }
         }
         .background(RoundedRectangle(cornerRadius: Const.Radius.corner)
                         .fill(Color.background)
@@ -97,7 +100,6 @@ struct HomeMessageView: View {
                 closeButton
                     .padding(0)
             }
-            Spacer()
         }
     }