From 119277046567331a02d8373ad82bb8a9df0359fd Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 Jan 2025 15:44:59 +0100 Subject: [PATCH 1/3] Removed unused Order Creation Survey --- .../kotlin/com/woocommerce/android/AppUrls.kt | 2 - .../android/analytics/AnalyticsTracker.kt | 1 - .../android/model/FeatureFeedbackSettings.kt | 5 -- .../ui/feedback/FeedbackSurveyFragment.kt | 2 - .../android/ui/feedback/SurveyType.kt | 1 - .../ui/orders/list/OrderListFragment.kt | 50 +------------------ .../ui/orders/list/OrderListViewModel.kt | 39 +-------------- .../main/res/layout/fragment_order_list.xml | 13 +---- WooCommerce/src/main/res/values/strings.xml | 2 - .../ui/orders/OrderListViewModelTest.kt | 47 ++--------------- 10 files changed, 6 insertions(+), 156 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt index 15f8b0b18b0..b565c8445e3 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/AppUrls.kt @@ -38,8 +38,6 @@ object AppUrls { const val CROWDSIGNAL_ANALYTICS_HUB_SURVEY = "https://automattic.survey.fm/woo-app-analytics-hub-production" - const val ORDER_CREATION_SURVEY = "https://automattic.survey.fm/woo-app-order-creation-production" - const val ADDONS_SURVEY = "https://automattic.survey.fm/woo-app-addons-production" const val CROWDSIGNAL_STORE_SETUP_SURVEY = diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt index 29b51c2ba5c..c910bc6359f 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt @@ -366,7 +366,6 @@ class AnalyticsTracker private constructor( const val VALUE_STATE_OFF = "off" const val VALUE_SIMPLE_PAYMENTS_FLOW = "simple_payment" - const val VALUE_SIMPLE_PAYMENTS_FEEDBACK = "simple_payments" const val VALUE_SIMPLE_PAYMENTS_COLLECT_CARD = "card" const val VALUE_SIMPLE_PAYMENTS_COLLECT_CASH = "cash" const val VALUE_SIMPLE_PAYMENTS_COLLECT_LINK = "payment_link" diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureFeedbackSettings.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureFeedbackSettings.kt index f28cb7b1715..d8a3e40efa3 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureFeedbackSettings.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureFeedbackSettings.kt @@ -25,14 +25,9 @@ data class FeatureFeedbackSettings( enum class Feature { PRODUCT_ADDONS, - SIMPLE_PAYMENTS_AND_ORDER_CREATION, ANALYTICS_HUB, ORDER_SHIPPING_LINES } fun isFeedbackMoreThanDaysAgo(days: Int) = Date(settingChangeDate).pastTimeDeltaFromNowInDays greaterThan days - - fun isFeedbackGivenMoreThanDaysAgo(days: Int) = - feedbackState == FeedbackState.GIVEN && - Date(settingChangeDate).pastTimeDeltaFromNowInDays greaterThan days } diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt index 2c298823492..57e94f742e8 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/FeedbackSurveyFragment.kt @@ -24,7 +24,6 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_FEEDBA import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_FEEDBACK_STORE_SETUP_CONTEXT import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_ORDER_SHIPPING_LINES_FEEDBACK import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_PRODUCT_ADDONS_FEEDBACK -import com.woocommerce.android.analytics.AnalyticsTracker.Companion.VALUE_SIMPLE_PAYMENTS_FEEDBACK import com.woocommerce.android.databinding.FragmentFeedbackSurveyBinding import com.woocommerce.android.extensions.navigateSafely import com.woocommerce.android.ui.base.BaseFragment @@ -50,7 +49,6 @@ class FeedbackSurveyFragment : BaseFragment(R.layout.fragment_feedback_survey) { SurveyType.MAIN -> VALUE_FEEDBACK_GENERAL_CONTEXT SurveyType.PRODUCT -> VALUE_FEEDBACK_PRODUCT_M3_CONTEXT SurveyType.STORE_ONBOARDING -> VALUE_FEEDBACK_STORE_SETUP_CONTEXT - SurveyType.ORDER_CREATION -> VALUE_SIMPLE_PAYMENTS_FEEDBACK SurveyType.ADDONS -> VALUE_PRODUCT_ADDONS_FEEDBACK SurveyType.ANALYTICS_HUB -> VALUE_ANALYTICS_HUB_FEEDBACK SurveyType.ORDER_SHIPPING_LINES -> VALUE_ORDER_SHIPPING_LINES_FEEDBACK diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/SurveyType.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/SurveyType.kt index 61d3c96fc81..97c22ff977b 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/SurveyType.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/feedback/SurveyType.kt @@ -6,7 +6,6 @@ import com.woocommerce.android.BuildConfig @Suppress("MagicNumber") enum class SurveyType(private val untaggedUrl: String, private val milestone: Int? = null) { PRODUCT(AppUrls.CROWDSIGNAL_PRODUCT_SURVEY, 4), - ORDER_CREATION(AppUrls.ORDER_CREATION_SURVEY, 1), MAIN(AppUrls.CROWDSIGNAL_MAIN_SURVEY), ADDONS(AppUrls.ADDONS_SURVEY), STORE_ONBOARDING(AppUrls.CROWDSIGNAL_STORE_SETUP_SURVEY), diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt index f02eb61b2db..b1d127a2b9f 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt @@ -1,5 +1,6 @@ package com.woocommerce.android.ui.orders.list +import org.wordpress.android.util.ActivityUtils as WPActivityUtils import android.os.Bundle import android.os.Handler import android.os.Looper @@ -46,9 +47,6 @@ import com.woocommerce.android.extensions.isTwoPanesShouldBeUsed import com.woocommerce.android.extensions.navigateSafely import com.woocommerce.android.extensions.pinFabAboveBottomNavigationBar import com.woocommerce.android.extensions.takeIfNotEqualTo -import com.woocommerce.android.model.FeatureFeedbackSettings -import com.woocommerce.android.model.FeatureFeedbackSettings.Feature.SIMPLE_PAYMENTS_AND_ORDER_CREATION -import com.woocommerce.android.model.FeatureFeedbackSettings.FeedbackState import com.woocommerce.android.model.Order import com.woocommerce.android.support.help.HelpOrigin import com.woocommerce.android.support.requests.SupportRequestFormActivity @@ -57,7 +55,6 @@ import com.woocommerce.android.tracker.OrderDurationRecorder import com.woocommerce.android.ui.barcodescanner.BarcodeScanningFragment.Companion.KEY_BARCODE_SCANNING_SCAN_STATUS import com.woocommerce.android.ui.base.TopLevelFragment import com.woocommerce.android.ui.base.UIMessageResolver -import com.woocommerce.android.ui.feedback.SurveyType import com.woocommerce.android.ui.jitm.JitmFragment import com.woocommerce.android.ui.jitm.JitmMessagePathsProvider import com.woocommerce.android.ui.main.AppBarStatus @@ -84,7 +81,6 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.util.DisplayUtils import org.wordpress.android.util.ToastUtils import javax.inject.Inject -import org.wordpress.android.util.ActivityUtils as WPActivityUtils @AndroidEntryPoint @Suppress("LargeClass") @@ -720,11 +716,6 @@ class OrderListFragment : new.jitmEnabled.takeIfNotEqualTo(old?.jitmEnabled) { jitmEnabled -> initJitm(jitmEnabled) } - new.isSimplePaymentsAndOrderCreationFeedbackVisible.takeIfNotEqualTo( - old?.isSimplePaymentsAndOrderCreationFeedbackVisible - ) { - displaySimplePaymentsWIPCard(it) - } new.isErrorFetchingDataBannerVisible.takeIfNotEqualTo(old?.isErrorFetchingDataBannerVisible) { displayErrorParsingOrdersCard(it) } @@ -1122,45 +1113,6 @@ class OrderListFragment : return binding.orderListView.ordersList.computeVerticalScrollOffset() == 0 && !viewModel.isSearching } - private fun displaySimplePaymentsWIPCard(show: Boolean) { - if (!show) { - binding.simplePaymentsWIPcard.isVisible = false - return - } - - binding.simplePaymentsWIPcard.isVisible = true - binding.simplePaymentsWIPcard.initView( - getString(R.string.orderlist_simple_payments_wip_title), - getString(R.string.orderlist_simple_payments_wip_message_enabled), - onGiveFeedbackClick = { onGiveFeedbackClicked() }, - onDismissClick = { - FeatureFeedbackSettings( - FeatureFeedbackSettings.Feature.SIMPLE_PAYMENTS_AND_ORDER_CREATION, - FeedbackState.DISMISSED - ).registerItself(feedbackPrefs) - viewModel.onDismissOrderCreationSimplePaymentsFeedback() - }, - showFeedbackButton = true - ) - } - - private fun onGiveFeedbackClicked() { - AnalyticsTracker.track( - AnalyticsEvent.FEATURE_FEEDBACK_BANNER, - mapOf( - AnalyticsTracker.KEY_FEEDBACK_CONTEXT to AnalyticsTracker.VALUE_SIMPLE_PAYMENTS_FEEDBACK, - AnalyticsTracker.KEY_FEEDBACK_ACTION to AnalyticsTracker.VALUE_FEEDBACK_GIVEN - ) - ) - FeatureFeedbackSettings( - SIMPLE_PAYMENTS_AND_ORDER_CREATION, - FeedbackState.GIVEN - ).registerItself(feedbackPrefs) - NavGraphMainDirections - .actionGlobalFeedbackSurveyFragment(SurveyType.ORDER_CREATION) - .apply { findNavController().navigateSafely(this) } - } - override fun onSwiped(gestureSource: OrderStatusUpdateSource.SwipeToCompleteGesture) { viewModel.onSwipeStatusUpdate(gestureSource) } diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt index dd6d21fa5cb..dd7e0c7221c 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt @@ -19,7 +19,6 @@ import androidx.paging.PagedList import com.google.android.material.snackbar.Snackbar import com.woocommerce.android.AppPrefsWrapper import com.woocommerce.android.BuildConfig -import com.woocommerce.android.FeedbackPrefs import com.woocommerce.android.R import com.woocommerce.android.analytics.AnalyticsEvent import com.woocommerce.android.analytics.AnalyticsEvent.ORDERS_LIST_AUTOMATIC_TIMEOUT_RETRY @@ -35,7 +34,6 @@ import com.woocommerce.android.extensions.drop import com.woocommerce.android.extensions.filter import com.woocommerce.android.extensions.filterNotNull import com.woocommerce.android.extensions.runWithContext -import com.woocommerce.android.model.FeatureFeedbackSettings import com.woocommerce.android.model.Order import com.woocommerce.android.model.RequestResult.SUCCESS import com.woocommerce.android.network.ConnectionChangeReceiver.ConnectionChangeEvent @@ -116,7 +114,6 @@ class OrderListViewModel @Inject constructor( private val orderListTransactionLauncher: OrderListTransactionLauncher, private val shouldShowCreateTestOrderScreen: ShouldShowCreateTestOrderScreen, private val analyticsTracker: AnalyticsTrackerWrapper, - private val feedbackPrefs: FeedbackPrefs, private val barcodeScanningTracker: BarcodeScanningTracker, private val notificationChannelsHandler: NotificationChannelsHandler, private val appPrefs: AppPrefsWrapper, @@ -138,11 +135,6 @@ class OrderListViewModel @Inject constructor( override val lifecycle: Lifecycle get() = lifecycleRegistry - private val simplePaymentsAndOrderCreationFeedbackState - get() = feedbackPrefs.getFeatureFeedbackSettings( - FeatureFeedbackSettings.Feature.SIMPLE_PAYMENTS_AND_ORDER_CREATION - )?.feedbackState ?: FeatureFeedbackSettings.FeedbackState.UNANSWERED - val performanceObserver: LifecycleObserver = orderListTransactionLauncher internal var ordersPagedListWrapper: PagedListWrapper? = null @@ -208,14 +200,6 @@ class OrderListViewModel @Inject constructor( private var dismissListErrors = false var searchQuery = "" - private val isSimplePaymentsAndOrderCreationFeedbackVisible: Boolean - get() { - val simplePaymentsAndOrderFeedbackDismissed = - simplePaymentsAndOrderCreationFeedbackState == FeatureFeedbackSettings.FeedbackState.DISMISSED - val isTroubleshootingBannerVisible = viewState.shouldDisplayTroubleshootingBanner - return !simplePaymentsAndOrderFeedbackDismissed && !isTroubleshootingBannerVisible - } - private var _lastUpdateOrdersList = MutableStateFlow(null) val lastUpdateOrdersList: LiveData = _lastUpdateOrdersList .map { lastUpdateMillis -> @@ -313,7 +297,6 @@ class OrderListViewModel @Inject constructor( fun changeTroubleshootingBannerVisibility(show: Boolean) { viewState = viewState.copy( shouldDisplayTroubleshootingBanner = show, - isSimplePaymentsAndOrderCreationFeedbackVisible = !show ) } @@ -486,7 +469,6 @@ class OrderListViewModel @Inject constructor( PARSE_ERROR -> { viewState = viewState.copy( isErrorFetchingDataBannerVisible = true, - isSimplePaymentsAndOrderCreationFeedbackVisible = false ) } @@ -517,13 +499,12 @@ class OrderListViewModel @Inject constructor( private fun displayOrdersBannerOrJitm() { viewModelScope.launch { when { - !isSimplePaymentsAndOrderCreationFeedbackVisible -> { + !viewState.shouldDisplayTroubleshootingBanner -> { viewState = viewState.copy( jitmEnabled = true ) } } - refreshOrdersBannerVisibility() } } @@ -796,23 +777,6 @@ class OrderListViewModel @Inject constructor( } } - private fun refreshOrdersBannerVisibility() { - viewState = viewState.copy( - isSimplePaymentsAndOrderCreationFeedbackVisible = isSimplePaymentsAndOrderCreationFeedbackVisible - ) - } - - fun onDismissOrderCreationSimplePaymentsFeedback() { - analyticsTracker.track( - AnalyticsEvent.FEATURE_FEEDBACK_BANNER, - mapOf( - AnalyticsTracker.KEY_FEEDBACK_CONTEXT to AnalyticsTracker.VALUE_SIMPLE_PAYMENTS_FEEDBACK, - AnalyticsTracker.KEY_FEEDBACK_ACTION to AnalyticsTracker.VALUE_FEEDBACK_DISMISSED - ) - ) - refreshOrdersBannerVisibility() - } - private fun checkChaChingSoundSettings() { fun recreateNotificationChannel() { notificationChannelsHandler.recreateNotificationChannel(NotificationChannelType.NEW_ORDER) @@ -1137,7 +1101,6 @@ class OrderListViewModel @Inject constructor( val isRefreshPending: Boolean = false, val arePaymentGatewaysFetched: Boolean = false, val filterCount: Int = 0, - val isSimplePaymentsAndOrderCreationFeedbackVisible: Boolean = false, val jitmEnabled: Boolean = false, val isErrorFetchingDataBannerVisible: Boolean = false, val shouldDisplayTroubleshootingBanner: Boolean = false, diff --git a/WooCommerce/src/main/res/layout/fragment_order_list.xml b/WooCommerce/src/main/res/layout/fragment_order_list.xml index 60f2c1ca2e0..03827f974dc 100644 --- a/WooCommerce/src/main/res/layout/fragment_order_list.xml +++ b/WooCommerce/src/main/res/layout/fragment_order_list.xml @@ -42,17 +42,6 @@ app:layout_constraintTop_toBottomOf="@id/toolbar" tools:visibility="visible" /> - - + app:layout_constraintTop_toBottomOf="@+id/error_troubleshooting_card" /> Looking up your orders… All Orders Filtered Orders - Create orders from your device! - We\'ve been working on making it possible to create orders from your device! You can try this feature out by tapping on the "+" button Simple payment order_card_%1$s order_card_detail diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt index c37d21aade1..869268e52bf 100644 --- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt +++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/OrderListViewModelTest.kt @@ -4,14 +4,11 @@ import androidx.lifecycle.MutableLiveData import androidx.paging.PagedList import com.google.android.material.snackbar.Snackbar import com.woocommerce.android.AppPrefsWrapper -import com.woocommerce.android.FeedbackPrefs import com.woocommerce.android.R import com.woocommerce.android.analytics.AnalyticsEvent -import com.woocommerce.android.analytics.AnalyticsTracker import com.woocommerce.android.analytics.AnalyticsTrackerWrapper import com.woocommerce.android.extensions.NotificationReceivedEvent import com.woocommerce.android.extensions.takeIfNotEqualTo -import com.woocommerce.android.model.FeatureFeedbackSettings import com.woocommerce.android.model.Order import com.woocommerce.android.model.RequestResult import com.woocommerce.android.notifications.NotificationChannelType @@ -118,7 +115,6 @@ class OrderListViewModelTest : BaseUnitTest() { private val getSelectedOrderFiltersCount: GetSelectedOrderFiltersCount = mock() private val shouldShowCreateTestOrderScreen: ShouldShowCreateTestOrderScreen = mock() private val analyticsTracker: AnalyticsTrackerWrapper = mock() - private val feedbackPrefs = mock() private val barcodeScanningTracker = mock() private val notificationChannelsHandler = mock() private val appPrefs = mock() @@ -172,7 +168,6 @@ class OrderListViewModelTest : BaseUnitTest() { orderListTransactionLauncher = mock(), shouldShowCreateTestOrderScreen = shouldShowCreateTestOrderScreen, analyticsTracker = analyticsTracker, - feedbackPrefs = feedbackPrefs, barcodeScanningTracker = barcodeScanningTracker, notificationChannelsHandler = notificationChannelsHandler, appPrefs = appPrefs, @@ -560,7 +555,7 @@ class OrderListViewModelTest : BaseUnitTest() { // Then the order status is changed optimistically val optimisticChangeEvent = viewModel.event.getOrAwaitValue() - assertTrue(optimisticChangeEvent is Event.ShowUndoSnackbar) + assertTrue(optimisticChangeEvent is ShowUndoSnackbar) advanceTimeBy(1_001) @@ -595,7 +590,7 @@ class OrderListViewModelTest : BaseUnitTest() { // Then the order status is changed optimistically val optimisticChangeEvent = viewModel.event.getOrAwaitValue() - assertTrue(optimisticChangeEvent is Event.ShowUndoSnackbar) + assertTrue(optimisticChangeEvent is ShowUndoSnackbar) advanceTimeBy(1_001) @@ -604,42 +599,6 @@ class OrderListViewModelTest : BaseUnitTest() { assertTrue(resultEvent is OrderListEvent.ShowRetryErrorSnack) } - @Test - fun `when onDismissOrderCreationSimplePaymentsFeedback called, then FEATURE_FEEDBACK_BANNER tracked`() = - testBlocking { - // when - viewModel.onDismissOrderCreationSimplePaymentsFeedback() - - // then - verify(analyticsTracker).track( - AnalyticsEvent.FEATURE_FEEDBACK_BANNER, - mapOf( - AnalyticsTracker.KEY_FEEDBACK_CONTEXT to AnalyticsTracker.VALUE_SIMPLE_PAYMENTS_FEEDBACK, - AnalyticsTracker.KEY_FEEDBACK_ACTION to AnalyticsTracker.VALUE_FEEDBACK_DISMISSED - ) - ) - } - - @Test - fun `when onDismissOrderCreationSimplePaymentsFeedback called, then order banner visibility changed`() = - testBlocking { - // given - val featureFeedbackSettings = mock { - on { feedbackState }.thenReturn(FeatureFeedbackSettings.FeedbackState.DISMISSED) - } - whenever( - feedbackPrefs.getFeatureFeedbackSettings( - FeatureFeedbackSettings.Feature.SIMPLE_PAYMENTS_AND_ORDER_CREATION - ) - ).thenReturn(featureFeedbackSettings) - - // when - viewModel.onDismissOrderCreationSimplePaymentsFeedback() - - // then - assertThat(viewModel.viewState.isSimplePaymentsAndOrderCreationFeedbackVisible).isEqualTo(false) - } - @Test fun `when fetching orders for the first time fails with timeout, then trigger a retry event`() = testBlocking { // given @@ -997,7 +956,7 @@ class OrderListViewModelTest : BaseUnitTest() { assertNotNull(isFetchingFirstPage) // Check that isFetchingFirstPage is reset to default value (false) on clearLiveDataSources - assertFalse(isFetchingFirstPage!!) + assertFalse(isFetchingFirstPage) } @Test From 2a3fa01a77b4dd4864a03fbea2fd7e7636cdcb49 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 Jan 2025 15:53:25 +0100 Subject: [PATCH 2/3] Fixed detekt complain --- .../com/woocommerce/android/ui/orders/list/OrderListFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt index b1d127a2b9f..e7557833493 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt @@ -1,6 +1,5 @@ package com.woocommerce.android.ui.orders.list -import org.wordpress.android.util.ActivityUtils as WPActivityUtils import android.os.Bundle import android.os.Handler import android.os.Looper @@ -81,6 +80,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.wordpress.android.util.DisplayUtils import org.wordpress.android.util.ToastUtils import javax.inject.Inject +import org.wordpress.android.util.ActivityUtils as WPActivityUtils @AndroidEntryPoint @Suppress("LargeClass") From a907f3a132dfa321b6002e9c31df53029f0a6cdd Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 Jan 2025 15:56:52 +0100 Subject: [PATCH 3/3] Updated release notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index daff5d0fe22..776d11a0f6a 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -4,9 +4,9 @@ 21.6 ----- - [*] Updated tablet detection logic to consider both width and height dimensions, enhancing compatibility with larger phones and tablets, particularly in landscape mode [https://github.com/woocommerce/woocommerce-android/pull/13228] - - [**] The UK customers have access to the POS now [https://github.com/woocommerce/woocommerce-android/pull/13386] - [Internal] [*] Fixed a bug that could lead to a crash when formatting dates and times [https://github.com/woocommerce/woocommerce-android/pull/13393] +- [Internal] [*] Removed order creation survey from the order's list [https://github.com/woocommerce/woocommerce-android/pull/13423] 21.5 -----