Merge branch 'trunk' into update-filters-and-add-buttons-colors

Author: irfano

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]
 - [*] Improved the Filters and Add button colors [https://github.com/woocommerce/woocommerce-android/pull/14872]
 
 23.5

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/featureflags/WooPosHistoricalOrdersM1Enabled.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,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/toolbar/WooPosHomeFloatingToolbarViewModel.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,

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.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 {
@@ -87,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,
@@ -260,7 +262,6 @@ class WooPosHomeFloatingToolbarViewModelTest {
         childrenToParentEventSender,
         networkStatus,
         resourceProvider,
-        analyticsTracker,
-        wooPosHistoricalOrdersM1Enabled,
+        analyticsTracker
     )
 }