[IPP] Delete simple payments migration flow

RELEASE-NOTES.txt

@@ -3,12 +3,14 @@
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 22.1
 -----
+- [*] Payments: Collect payment flow has been removed from the Payments Hub screen, as order creation flow with custom amount has replaced it [https://github.com/woocommerce/woocommerce-android/pull/13814]
 - [*] The order count badge is now fully visible for counts higher than 99 [https://github.com/woocommerce/woocommerce-android/pull/13825]
 - [*] Fix rare crash in the POS upon adding an item to the cart [https://github.com/woocommerce/woocommerce-android/pull/13838]
 
 22.0.1
 -----
 - [**] Fixed a missing toolbar on tablets on the Receipt Preview screen [https://github.com/woocommerce/woocommerce-android/pull/13830]
+
 22.0
 -----
 - [*] Payments: display specific error for the cases when a reader with low battery level attempted to connect [https://github.com/woocommerce/woocommerce-android/pull/13642]

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -232,8 +232,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     // -- Simple Payments
     SIMPLE_PAYMENTS_FLOW_NOTE_ADDED,
     SIMPLE_PAYMENTS_FLOW_TAXES_TOGGLED,
-    SIMPLE_PAYMENTS_MIGRATION_SHEET_ADD_CUSTOM_AMOUNT,
-    SIMPLE_PAYMENTS_MIGRATION_SHEET_SHOWN,
 
     // -- Upsell Banner
     FEATURE_CARD_SHOWN,
@@ -531,7 +529,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     SETTINGS_DOMAINS_TAPPED,
 
     // -- Payments Hub
-    PAYMENTS_HUB_COLLECT_PAYMENT_TAPPED,
     PAYMENTS_HUB_ORDER_CARD_READER_TAPPED,
     PAYMENTS_HUB_CARD_READER_MANUALS_TAPPED,
     PAYMENTS_HUB_MANAGE_CARD_READERS_TAPPED,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -1073,7 +1073,7 @@ class MainActivity :
         binding.bottomNav.currentPosition = ORDERS
         binding.bottomNav.active(ORDERS.position)
         val action = OrderListFragmentDirections.actionOrderListFragmentToOrderCreationFragment(
-            OrderCreateEditViewModel.Mode.Creation(),
+            OrderCreateEditViewModel.Mode.Creation,
             null,
             null,
         )

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt

@@ -37,7 +37,6 @@ import com.woocommerce.android.R
 import com.woocommerce.android.databinding.FragmentOrderCreateEditFormBinding
 import com.woocommerce.android.databinding.LayoutOrderCreationCustomerInfoBinding
 import com.woocommerce.android.databinding.OrderCreationAdditionalInfoCollectionSectionBinding
-import com.woocommerce.android.extensions.handleDialogNotice
 import com.woocommerce.android.extensions.handleDialogResult
 import com.woocommerce.android.extensions.handleResult
 import com.woocommerce.android.extensions.hide
@@ -79,7 +78,6 @@ import com.woocommerce.android.ui.orders.creation.shipping.OrderShippingFragment
 import com.woocommerce.android.ui.orders.creation.shipping.OrderShippingFragment.Companion.UPDATE_SHIPPING_RESULT
 import com.woocommerce.android.ui.orders.creation.shipping.ShippingLineFormSection
 import com.woocommerce.android.ui.orders.creation.shipping.ShippingUpdateResult
-import com.woocommerce.android.ui.orders.creation.simplepaymentsmigration.OrderCreateEditSimplePaymentsMigrationBottomSheetFragment
 import com.woocommerce.android.ui.orders.creation.taxes.rates.TaxRate
 import com.woocommerce.android.ui.orders.creation.taxes.rates.TaxRateSelectorFragment.Companion.KEY_SELECTED_TAX_RATE
 import com.woocommerce.android.ui.orders.creation.totals.OrderCreateEditTotalsView
@@ -162,7 +160,7 @@ class OrderCreateEditFormFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         with(FragmentOrderCreateEditFormBinding.bind(view)) {
             setupObserversWith(this)
-            setupHandleResults(this)
+            setupHandleResults()
             initView()
         }
         handleCouponEditResult()
@@ -1134,17 +1132,11 @@ class OrderCreateEditFormFragment :
         }
     }
 
-    private fun setupHandleResults(fragmentOrderCreateEditFormBinding: FragmentOrderCreateEditFormBinding) {
+    private fun setupHandleResults() {
         handleDialogResult<OrderStatusUpdateSource>(
             key = KEY_ORDER_STATUS_RESULT,
             entryId = R.id.orderCreationFragment
         ) { viewModel.onOrderStatusChanged(Order.Status.fromValue(it.newStatus)) }
-        handleDialogNotice(
-            key = OrderCreateEditSimplePaymentsMigrationBottomSheetFragment.KEY_ON_ADD_CUSTOM_AMOUNT_CLICKED_NOTICE,
-            entryId = R.id.orderCreationFragment
-        ) {
-            navigateToCustomAmountDialogWhenViewIsCreated(fragmentOrderCreateEditFormBinding.root)
-        }
 
         handleResult<Collection<SelectedItem>>(ProductSelectorFragment.PRODUCT_SELECTOR_RESULT) {
             viewModel.onProductsSelected(it)
@@ -1273,15 +1265,6 @@ class OrderCreateEditFormFragment :
         }
     }
 
-    /**
-     * This is workaround, as in this point navigation component
-     * still didn't finish previous navigation, we have to make sure
-     * that to delay navigation to the dialog. As marker that we can navigate is the view is created
-     */
-    private fun navigateToCustomAmountDialogWhenViewIsCreated(root: View) {
-        root.post { navigateToCustomAmountsDialog() }
-    }
-
     private fun hideProgressDialog() {
         progressDialog?.dismiss()
         progressDialog = null

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt

@@ -218,7 +218,6 @@ class OrderCreateEditViewModel @Inject constructor(
     companion object {
         val EMPTY_BIG_DECIMAL = -Double.MAX_VALUE.toBigDecimal()
         const val MAX_PRODUCT_QUANTITY = 100_000
-        const val DELAY_BEFORE_SHOWING_SIMPLE_PAYMENTS_MIGRATION_BOTTOM_SHEET = 500L
         private const val PARAMETERS_KEY = "parameters_key"
         private const val ORDER_CUSTOM_FEE_NAME = "order_custom_fee"
         const val DELAY_BEFORE_SHOWING_SHIPPING_FEEDBACK = 1000L
@@ -436,13 +435,6 @@ class OrderCreateEditViewModel @Inject constructor(
                         onTaxRateSelected(it)
                     }
                 }
-
-                if (mode.indicateSimplePaymentsMigration) {
-                    triggerEventWithDelay(
-                        OrderCreateEditNavigationTarget.SimplePaymentsMigrationBottomSheet,
-                        delay = DELAY_BEFORE_SHOWING_SIMPLE_PAYMENTS_MIGRATION_BOTTOM_SHEET,
-                    )
-                }
             }
 
             is Mode.Edit -> {
@@ -2066,7 +2058,7 @@ class OrderCreateEditViewModel @Inject constructor(
 
     sealed class Mode : Parcelable {
         @Parcelize
-        data class Creation(val indicateSimplePaymentsMigration: Boolean = false) : Mode()
+        object Creation : Mode()
 
         @Parcelize
         data class Edit(val orderId: Long) : Mode()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/navigation/OrderCreateEditNavigationTarget.kt

@@ -78,6 +78,4 @@ sealed class OrderCreateEditNavigationTarget : Event() {
         val giftCard: String
     ) : OrderCreateEditNavigationTarget()
     object AddGiftCard : OrderCreateEditNavigationTarget()
-
-    data object SimplePaymentsMigrationBottomSheet : OrderCreateEditNavigationTarget()
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/navigation/OrderCreateEditNavigator.kt

@@ -103,11 +103,6 @@ object OrderCreateEditNavigator {
                 )
             }
 
-            is OrderCreateEditNavigationTarget.SimplePaymentsMigrationBottomSheet -> {
-                OrderCreateEditFormFragmentDirections
-                    .actionOrderCreationFragmentToSimplePaymentsMigrationBottomSheetFragment()
-            }
-
             is OrderCreateEditNavigationTarget.EditDiscount -> {
                 OrderCreateEditFormFragmentDirections.actionOrderCreationToOrderCreationProductDiscountFragment(
                     target.item,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt

@@ -32,7 +32,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialFadeThrough
 import com.woocommerce.android.AppConstants
 import com.woocommerce.android.AppUrls
-import com.woocommerce.android.FeedbackPrefs
 import com.woocommerce.android.NavGraphMainDirections
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
@@ -113,9 +112,6 @@ class OrderListFragment :
     @Inject
     internal lateinit var currencyFormatter: CurrencyFormatter
 
-    @Inject
-    lateinit var feedbackPrefs: FeedbackPrefs
-
     private var tracker: SelectionTracker<Long>? = null
     private var actionMode: ActionMode? = null
     private val selectionPredicate = MutableMultipleSelectionPredicate<Long>(
@@ -662,9 +658,6 @@ class OrderListFragment :
                 )
 
                 is OrderListViewModel.OrderListEvent.RetryLoadingOrders -> refreshOrders()
-                is OrderListViewModel.OrderListEvent.OpenOrderCreationWithSimplePaymentsMigration ->
-                    openOrderCreationFragment(indicateSimplePaymentsMigration = true)
-
                 is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
                     showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
@@ -930,13 +923,12 @@ class OrderListFragment :
     private fun openOrderCreationFragment(
         code: String? = null,
         barcodeFormat: BarcodeFormat? = null,
-        indicateSimplePaymentsMigration: Boolean = false,
     ) {
         OrderDurationRecorder.startRecording()
         AnalyticsTracker.track(AnalyticsEvent.ORDERS_ADD_NEW)
         findNavController().navigateSafely(
             OrderListFragmentDirections.actionOrderListFragmentToOrderCreationFragment(
-                OrderCreateEditViewModel.Mode.Creation(indicateSimplePaymentsMigration),
+                OrderCreateEditViewModel.Mode.Creation,
                 code,
                 barcodeFormat,
             )