Merge branch 'trunk' into woomob-1450-crash-in-alamofirenetworkerrorhandler

itsmeichigo · web-flow · commit 54b98acb5d03 · 2025-10-08T19:16:52.000+07:00
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -5,6 +5,7 @@
 -----
 - [internal] POS code was moved to its own module, including POS specific color and image assets. [https://github.com/woocommerce/woocommerce-ios/pull/16176]
 - [*] Fix race condition when flagging sites as unsupported for application passwords [https://github.com/woocommerce/woocommerce-ios/pull/16223]
+- [*] Fix Create Coupon screen scrolling issue. [https://github.com/woocommerce/woocommerce-ios/pull/16218]
 
 
 23.4
diff --git a/WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/AddEditCoupon.swift b/WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/AddEditCoupon.swift
@@ -285,6 +285,7 @@ struct AddEditCoupon: View {
                         }
                     }
                 }
+                .scrollDismissesKeyboard(.immediately)
             }
             .sheet(isPresented: $showingSelectProducts) {
                 ProductSelectorNavigationView(configuration: .productsForCoupons,
diff --git a/WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/UsageDetails/CouponRestrictions.swift b/WooCommerce/Classes/ViewRelated/Coupons/Add and Edit Coupons/UsageDetails/CouponRestrictions.swift
@@ -151,6 +151,7 @@ struct CouponRestrictions: View {
                 .padding(.horizontal, insets: geometry.safeAreaInsets)
                 .frame(maxWidth: .infinity, alignment: .leading)
             }
+            .scrollDismissesKeyboard(.immediately)
             .background(Color(.listForeground(modal: false)))
             .ignoresSafeArea(.container, edges: [.horizontal])
             .sheet(isPresented: $showingExcludeProducts) {

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ struct AddEditCoupon: View {`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`	`}`
	`288`	`+ .scrollDismissesKeyboard(.immediately)`
`288`	`289`	`}`
`289`	`290`	`.sheet(isPresented: $showingSelectProducts) {`
`290`	`291`	`ProductSelectorNavigationView(configuration: .productsForCoupons,`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ struct CouponRestrictions: View {`
`151`	`151`	`.padding(.horizontal, insets: geometry.safeAreaInsets)`
`152`	`152`	`.frame(maxWidth: .infinity, alignment: .leading)`
`153`	`153`	`}`
	`154`	`+ .scrollDismissesKeyboard(.immediately)`
`154`	`155`	`.background(Color(.listForeground(modal: false)))`
`155`	`156`	`.ignoresSafeArea(.container, edges: [.horizontal])`
`156`	`157`	`.sheet(isPresented: $showingExcludeProducts) {`