Merge branch 'trunk' into woomob-1020-woo-possettings-add-ff-and-settings-button-to-the-menu

Author: samiuelson

RELEASE-NOTES.txt

@@ -1,11 +1,11 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
-
 23.1
 -----
+- [*] You can now remove background from product images in the app. Just open the product image and click "Remove background" button. [https://github.com/woocommerce/woocommerce-android/pull/14445]
 - [*] Fixed bug when an order was not selected when navigating from my store screen [https://github.com/woocommerce/woocommerce-android/pull/14436]
-
+- [*] Updated behavior on the POS cash payment screen [https://github.com/woocommerce/woocommerce-android/pull/14449]
 
 23.0
 -----

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/images/ProductImageViewerFragment.kt

@@ -24,7 +24,6 @@ import com.woocommerce.android.ui.main.AppBarStatus
 import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.products.ConfirmRemoveProductImageDialog
 import com.woocommerce.android.ui.products.ImageViewerFragment
-import com.woocommerce.android.util.FeatureFlag
 import com.woocommerce.android.util.WooAnimUtils
 import com.woocommerce.android.util.setupTabletSecondPaneToolbar
 import com.woocommerce.android.viewmodel.fixedHiltNavGraphViewModels
@@ -93,8 +92,6 @@ class ProductImageViewerFragment :
         }
         toolbar.inflateMenu(R.menu.menu_product_image)
         toolbar.menu.findItem(R.id.menu_delete_image).isVisible = navArgs.isDeletingAllowed
-        toolbar.menu.findItem(R.id.menu_remove_background).isVisible =
-            FeatureFlag.AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL.isEnabled(context)
     }
 
     private fun onMenuItemSelected(item: MenuItem): Boolean =

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentScreen.kt

@@ -149,6 +149,7 @@ private fun Collecting(
                 currencyPosition = state.currencyPosition,
                 decimalSeparator = state.decimalSeparator,
                 numberOfDecimals = state.numberOfDecimals,
+                preselectText = true,
             )
 
             Spacer(modifier = Modifier.height(WooPosSpacing.Small.value))

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentViewModel.kt

@@ -44,7 +44,7 @@ class WooPosCashPaymentViewModel @Inject constructor(
 
             val order = repository.getOrderById(orderId)!!
             _state.value = WooPosCashPaymentState.Collecting(
-                enteredAmount = null,
+                enteredAmount = order.total,
                 changeDueText = "",
                 changeDue = null,
                 total = order.total,
@@ -59,7 +59,7 @@ class WooPosCashPaymentViewModel @Inject constructor(
                 numberOfDecimals = repository.getNumberOfDecimals(),
                 button = WooPosCashPaymentState.Collecting.Button(
                     text = resourceProvider.getString(R.string.woopos_complete_cash_order_button),
-                    status = WooPosCashPaymentState.Collecting.Button.Status.DISABLED
+                    status = WooPosCashPaymentState.Collecting.Button.Status.ENABLED
                 )
             )
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/component/WooPosInputFields.kt

@@ -56,6 +56,7 @@ fun WooPosMoneyInputField(
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
     keyboardActions: KeyboardActions = KeyboardActions.Default,
     contentAlignment: Alignment = Alignment.CenterStart,
+    preselectText: Boolean = false,
 ) {
     val visualTransformation = remember {
         CurrencyVisualTransformation(
@@ -84,7 +85,12 @@ fun WooPosMoneyInputField(
         stateSaver = TextFieldValue.Saver,
     ) {
         currentValue = value
-        mutableStateOf(TextFieldValue(valueMapper.printValue(value)))
+        mutableStateOf(
+            TextFieldValue(
+                text = valueMapper.printValue(value),
+                selection = if (preselectText) TextRange(0, value.toString().length) else TextRange.Zero
+            )
+        )
     }
 
     var labelWidth by remember { mutableIntStateOf(0) }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsAnalyticsTracker.kt

@@ -95,4 +95,8 @@ class WooPosTotalsAnalyticsTracker @Inject constructor(
     suspend fun trackCreateNewOrderTapped() {
         analyticsTracker.track(CreateNewOrderTapped)
     }
+
+    suspend fun trackCashPaymentTapped() {
+        analyticsTracker.track(WooPosAnalyticsEvent.Event.CheckoutCashPaymentTapped)
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

@@ -158,7 +158,7 @@ class WooPosTotalsViewModel @Inject constructor(
 
             WooPosTotalsUIEvent.OnStartReceiptFlowClicked -> handleEmailReceiptClicked()
 
-            WooPosTotalsUIEvent.OnCashPaymentClicked -> informParentAboutNavigatingToCashPayment()
+            WooPosTotalsUIEvent.OnCashPaymentClicked -> handleCashPaymentClicked()
 
             WooPosTotalsUIEvent.GoBackToCheckoutAfterFailedPayment -> handleGoBackToCheckoutClickedWhenPaymentFailed()
 
@@ -183,7 +183,8 @@ class WooPosTotalsViewModel @Inject constructor(
         }
     }
 
-    private fun informParentAboutNavigatingToCashPayment() = viewModelScope.launch {
+    private fun handleCashPaymentClicked() = viewModelScope.launch {
+        totalsAnalyticsTracker.trackCashPaymentTapped()
         childrenToParentEventSender.sendToParent(
             ToCashPayment(dataState.value.orderId)
         )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/util/analytics/WooPosAnalyticsEvent.kt

@@ -47,6 +47,9 @@ sealed class WooPosAnalyticsEvent : IAnalyticsEvent {
         data object CashCollectPaymentSuccess : Event() {
             override val name: String = "cash_collect_payment_success"
         }
+        data object CheckoutCashPaymentTapped : Event() {
+            override val name: String = "checkout_cash_payment_tapped"
+        }
         data object CashPaymentTapped : Event() {
             override val name: String = "cash_payment_tapped"
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt

@@ -26,8 +26,7 @@ enum class FeatureFlag {
             WOO_POS_SETTINGS,
             WC_SHIPPING_BANNER,
             BETTER_CUSTOMER_SEARCH_M2,
-            ORDER_CREATION_AUTO_TAX_RATE,
-            AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL -> PackageUtils.isDebugBuild()
+            ORDER_CREATION_AUTO_TAX_RATE -> PackageUtils.isDebugBuild()
 
             NEW_SHIPPING_SUPPORT,
             BULK_UPDATE_ORDERS_STATUS,

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/woopos/cashpayment/WooPosCashPaymentViewModelTest.kt

@@ -94,6 +94,18 @@ class WooPosCashPaymentViewModelTest {
         assertThat(collectingState.numberOfDecimals).isEqualTo(2)
     }
 
+    @Test
+    fun `when ViewModel initializes, then entered amount prefilled with total value and button is enabled`() = runTest {
+        // WHEN
+        val state = viewModel.state.first()
+
+        // THEN
+        assertThat(state).isInstanceOf(WooPosCashPaymentState.Collecting::class.java)
+        val collectingState = state as WooPosCashPaymentState.Collecting
+        assertThat(collectingState.enteredAmount).isEqualTo(BigDecimal("100.00"))
+        assertThat(collectingState.button.status).isEqualTo(WooPosCashPaymentState.Collecting.Button.Status.ENABLED)
+    }
+
     @Test
     fun `given valid amount,when onUIEvent AmountChanged , then button is enabled and changeDue is updated`() = runTest {
         // GIVEN