Fix issues with safe area

itsmeichigo · itsmeichigo · commit 0cb823bf3a39 · 2022-03-30T14:14:48.000+07:00
diff --git a/WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetails.swift b/WooCommerce/Classes/ViewRelated/Coupons/CouponDetails/CouponDetails.swift
@@ -136,7 +136,6 @@ struct CouponDetails: View {
                         Text(Localization.performance)
                             .bold()
                             .padding(Constants.margin)
-                            .padding(.horizontal, insets: geometry.safeAreaInsets)
                         VStack(alignment: .leading, spacing: Constants.verticalSpacing) {
                             HStack(alignment: .firstTextBaseline) {
                                 Text(Localization.discountedOrders)
@@ -172,6 +171,7 @@ struct CouponDetails: View {
                             }
                         }
                     }
+                    .padding(.horizontal, insets: geometry.safeAreaInsets)
                     .padding(.bottom, Constants.margin)
                     .background(Color(.listForeground))
 
@@ -182,7 +182,7 @@ struct CouponDetails: View {
                 }.hidden()
             }
             .background(Color(.listBackground))
-            .ignoresSafeArea(.container, edges: [.horizontal, .bottom])
+            .ignoresSafeArea(.container, edges: [.horizontal])
             .sheet(isPresented: $showingEnableAnalytics) {
                 EnableAnalyticsView(viewModel: .init(siteID: viewModel.siteID),
                                     presentingController: noticePresenter.presentingViewController,

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ struct CouponDetails: View {`
`136`	`136`	`Text(Localization.performance)`
`137`	`137`	`.bold()`
`138`	`138`	`.padding(Constants.margin)`
`139`		`- .padding(.horizontal, insets: geometry.safeAreaInsets)`
`140`	`139`	`VStack(alignment: .leading, spacing: Constants.verticalSpacing) {`
`141`	`140`	`HStack(alignment: .firstTextBaseline) {`
`142`	`141`	`Text(Localization.discountedOrders)`
`@@ -172,6 +171,7 @@ struct CouponDetails: View {`
`172`	`171`	`}`
`173`	`172`	`}`
`174`	`173`	`}`
	`174`	`+ .padding(.horizontal, insets: geometry.safeAreaInsets)`
`175`	`175`	`.padding(.bottom, Constants.margin)`
`176`	`176`	`.background(Color(.listForeground))`
`177`	`177`
`@@ -182,7 +182,7 @@ struct CouponDetails: View {`
`182`	`182`	`}.hidden()`
`183`	`183`	`}`
`184`	`184`	`.background(Color(.listBackground))`
`185`		`- .ignoresSafeArea(.container, edges: [.horizontal, .bottom])`
	`185`	`+ .ignoresSafeArea(.container, edges: [.horizontal])`
`186`	`186`	`.sheet(isPresented: $showingEnableAnalytics) {`
`187`	`187`	`EnableAnalyticsView(viewModel: .init(siteID: viewModel.siteID),`
`188`	`188`	`presentingController: noticePresenter.presentingViewController,`