diff --git a/Modules/Sources/Experiments/DefaultFeatureFlagService.swift b/Modules/Sources/Experiments/DefaultFeatureFlagService.swift index 243060fa575..fd0e4ec9e03 100644 --- a/Modules/Sources/Experiments/DefaultFeatureFlagService.swift +++ b/Modules/Sources/Experiments/DefaultFeatureFlagService.swift @@ -98,7 +98,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService { case .pointOfSaleAsATabi2: return buildConfig == .localDeveloper || buildConfig == .alpha case .pointOfSaleOrdersi1: - return buildConfig == .localDeveloper || buildConfig == .alpha + return true case .pointOfSaleOrdersi2: return buildConfig == .localDeveloper || buildConfig == .alpha case .pointOfSaleBarcodeScanningi2: diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index fdc050fee41..dab0f1ab76f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -5,6 +5,7 @@ ----- - [*] Shipping Labels: Improve UI of Split shipments screen. [https://github.com/woocommerce/woocommerce-ios/pull/15838] - [*] POS: icon button with confirmation step used for clearing the cart [https://github.com/woocommerce/woocommerce-ios/pull/15829] +- [*] POS: Orders from Point of Sale now show a badge in order list and order details [https://github.com/woocommerce/woocommerce-ios/pull/15887] - [*] Shipping Labels: Fixed a portion of layout issues caused by bigger accessibility content size categories. [https://github.com/woocommerce/woocommerce-ios/pull/15844] - [*] Shipping Labels: Enable the confirm button on the payment method sheet even when there are no changes. [https://github.com/woocommerce/woocommerce-ios/pull/15856] - [*] POS: start a new cart by scanning a barcode on the payment success screen [https://github.com/woocommerce/woocommerce-ios/pull/15870] diff --git a/WooCommerce/Classes/Extensions/UILabel+SalesChannel.swift b/WooCommerce/Classes/Extensions/UILabel+SalesChannel.swift index d66b25e72cc..a3c1900204a 100644 --- a/WooCommerce/Classes/Extensions/UILabel+SalesChannel.swift +++ b/WooCommerce/Classes/Extensions/UILabel+SalesChannel.swift @@ -23,7 +23,7 @@ private extension UILabel { enum Layout { static let borderWidth = CGFloat(0.0) static let cornerRadius = CGFloat(4.0) - static let salesChannelLabelTextColor = UIColor(color: .wooCommercePurple(.shade80)) - static let salesChannelLabelBackgroundColor = UIColor(color: .wooCommercePurple(.shade10)) + static let salesChannelLabelTextColor = UIColor.withColorStudio(.wooCommercePurple, shade: .shade80) + static let salesChannelLabelBackgroundColor = UIColor.withColorStudio(.wooCommercePurple, shade: .shade10) } }