From 9b5a15a9e321ff443b8e89f49f5e7a060bbe39b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81sar=20Vargas=20Casaseca?= Date: Thu, 30 Oct 2025 16:15:35 +0100 Subject: [PATCH 1/3] Remove feature flag --- .../WooPosHistoricalOrdersM1Enabled.kt | 10 ---------- .../toolbar/WooPosHomeFloatingToolbarViewModel.kt | 15 ++++----------- .../com/woocommerce/android/util/FeatureFlag.kt | 2 -- .../WooPosHomeFloatingToolbarViewModelTest.kt | 5 +---- 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/featureflags/WooPosHistoricalOrdersM1Enabled.kt diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/featureflags/WooPosHistoricalOrdersM1Enabled.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/featureflags/WooPosHistoricalOrdersM1Enabled.kt deleted file mode 100644 index d1e9f5bd5c3c..000000000000 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/featureflags/WooPosHistoricalOrdersM1Enabled.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.woocommerce.android.ui.woopos.featureflags - -import com.woocommerce.android.util.FeatureFlag -import javax.inject.Inject - -class WooPosHistoricalOrdersM1Enabled @Inject constructor() { - operator fun invoke(): Boolean { - return FeatureFlag.WOO_POS_HISTORICAL_ORDERS_M1.isEnabled() - } -} diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.kt index 4e9133ce6841..95de426f67b2 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.kt @@ -12,7 +12,6 @@ import com.woocommerce.android.cardreader.connection.CardReaderStatus.Connected import com.woocommerce.android.cardreader.connection.CardReaderStatus.Connecting import com.woocommerce.android.cardreader.connection.CardReaderStatus.NotConnected import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderFacade -import com.woocommerce.android.ui.woopos.featureflags.WooPosHistoricalOrdersM1Enabled import com.woocommerce.android.ui.woopos.home.ChildToParentEvent import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender import com.woocommerce.android.ui.woopos.home.toolbar.WooPosHomeFloatingToolbarUIEvent.MenuItemClicked @@ -35,8 +34,7 @@ class WooPosHomeFloatingToolbarViewModel @Inject constructor( private val childrenToParentEventSender: WooPosChildrenToParentEventSender, private val networkStatus: WooPosNetworkStatus, private val resourceProvider: ResourceProvider, - private val analyticsTracker: WooPosAnalyticsTracker, - private val wooPosHistoricalOrdersM1Enabled: WooPosHistoricalOrdersM1Enabled, + private val analyticsTracker: WooPosAnalyticsTracker ) : ViewModel() { private val _state = MutableStateFlow( WooPosHomeFloatingToolbarState( @@ -138,17 +136,12 @@ class WooPosHomeFloatingToolbarViewModel @Inject constructor( private val toolbarMenuItems by lazy { buildList { - if (wooPosHistoricalOrdersM1Enabled()) { - add( + addAll( + listOf( WooPosHomeFloatingToolbarState.Menu.MenuItem( title = R.string.woopos_orders_title, icon = Icons.Default.Description, - ) - ) - } - - addAll( - listOf( + ), WooPosHomeFloatingToolbarState.Menu.MenuItem( title = R.string.woopos_settings_title, icon = Icons.Default.Settings, diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt index f83c59064e36..37834a23a614 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt @@ -11,7 +11,6 @@ enum class FeatureFlag { BETTER_CUSTOMER_SEARCH_M2, ORDER_CREATION_AUTO_TAX_RATE, WOO_POS_SURVEYS, - WOO_POS_HISTORICAL_ORDERS_M1, WOO_POS_LOCAL_CATALOG_M1, BOOKINGS_MVP; @@ -21,7 +20,6 @@ enum class FeatureFlag { PackageUtils.isDebugBuild() || context != null && PackageUtils.isBetaBuild(context) } - WOO_POS_HISTORICAL_ORDERS_M1, WC_SHIPPING_BANNER, WOO_POS_SURVEYS, BETTER_CUSTOMER_SEARCH_M2, diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt index 9e5afd0329c7..34c2e9e898c4 100644 --- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt +++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt @@ -7,7 +7,6 @@ import androidx.compose.material.icons.filled.Settings import com.woocommerce.android.R import com.woocommerce.android.cardreader.connection.CardReaderStatus import com.woocommerce.android.ui.woopos.cardreader.WooPosCardReaderFacade -import com.woocommerce.android.ui.woopos.featureflags.WooPosHistoricalOrdersM1Enabled import com.woocommerce.android.ui.woopos.home.ChildToParentEvent import com.woocommerce.android.ui.woopos.home.WooPosChildrenToParentEventSender import com.woocommerce.android.ui.woopos.util.WooPosCoroutineTestRule @@ -39,7 +38,6 @@ class WooPosHomeFloatingToolbarViewModelTest { private val networkStatus: WooPosNetworkStatus = mock() private val resourceProvider: ResourceProvider = mock() private val analyticsTracker: WooPosAnalyticsTracker = mock() - private val wooPosHistoricalOrdersM1Enabled: WooPosHistoricalOrdersM1Enabled = mock() @Test fun `given card reader status is NotConnected, when initialized, then state should be NotConnected`() = runTest { @@ -260,7 +258,6 @@ class WooPosHomeFloatingToolbarViewModelTest { childrenToParentEventSender, networkStatus, resourceProvider, - analyticsTracker, - wooPosHistoricalOrdersM1Enabled, + analyticsTracker ) } From 2be738f3ce49a1b827d537150e98d98a681713a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81sar=20Vargas=20Casaseca?= Date: Thu, 30 Oct 2025 16:21:57 +0100 Subject: [PATCH 2/3] Fix test by adding missing button --- .../home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt index 34c2e9e898c4..597b5bc47dae 100644 --- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt +++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModelTest.kt @@ -85,6 +85,10 @@ class WooPosHomeFloatingToolbarViewModelTest { .isEqualTo( WooPosHomeFloatingToolbarState.Menu.Visible( listOf( + WooPosHomeFloatingToolbarState.Menu.MenuItem( + title = R.string.woopos_orders_title, + icon = Icons.Default.Description, + ), WooPosHomeFloatingToolbarState.Menu.MenuItem( title = R.string.woopos_settings_title, icon = Icons.Default.Settings, From 4464faa1f6c675d9d940d796add7cc42b141d1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ce=CC=81sar=20Vargas=20Casaseca?= Date: Thu, 30 Oct 2025 16:27:12 +0100 Subject: [PATCH 3/3] Add release note --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index acbc529d12de..6a5360795567 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -8,6 +8,7 @@ - [*] Improved the Filters button colors on the Orders and Products screens [https://github.com/woocommerce/woocommerce-android/pull/14832] - [*] Fixed an issue when images for the card reader flows were not shown on tablets [https://github.com/woocommerce/woocommerce-android/pull/14849] - [*] Fixed an issue where the count of the filters applied to the orders was not updated correctly [https://github.com/woocommerce/woocommerce-android/pull/14844] +- [**] POS: Allow merchants to view, search, and manage POS orders directly within the POS interface. [https://github.com/woocommerce/woocommerce-android/pull/14866] 23.5 -----