diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt index 35f67748871b..717bc33eb2a6 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt @@ -70,7 +70,6 @@ import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker import com.woocommerce.android.ui.products.addons.AddonRepository import com.woocommerce.android.ui.products.details.ProductDetailRepository import com.woocommerce.android.ui.shipping.InstallWCShippingViewModel -import com.woocommerce.android.util.FeatureFlag import com.woocommerce.android.util.WooLog import com.woocommerce.android.util.WooLog.T import com.woocommerce.android.viewmodel.LiveDataDelegate @@ -220,8 +219,7 @@ class OrderDetailViewModel @Inject constructor( private var pluginsInformation: Map = HashMap() private val isRevampWooShippingEnabled: Boolean - get() = FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled() && - shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported() + get() = shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported() init { productImageMap.subscribeToOnProductFetchedEvents(this) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/ShippingLabelOnboardingRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/ShippingLabelOnboardingRepository.kt index 5c364fa5b4c2..421225c33c9c 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/ShippingLabelOnboardingRepository.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/ShippingLabelOnboardingRepository.kt @@ -4,7 +4,6 @@ import com.woocommerce.android.AppPrefsWrapper import com.woocommerce.android.extensions.semverCompareTo import com.woocommerce.android.model.Order import com.woocommerce.android.tools.SelectedSite -import com.woocommerce.android.util.FeatureFlag import javax.inject.Inject class ShippingLabelOnboardingRepository @Inject constructor( @@ -52,11 +51,7 @@ class ShippingLabelOnboardingRepository @Inject constructor( it.isOperational && pluginVersion.semverCompareTo(SUPPORTED_WC_SHIPPING_VERSION) >= 0 }?.let { - return if (FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled()) { - ShippingLabelSupport.WC_SHIPPING_SUPPORTED - } else { - ShippingLabelSupport.WCS_SUPPORTED - } + return ShippingLabelSupport.WC_SHIPPING_SUPPORTED } orderDetailRepository.getWooServicesPluginInfo() 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 c4942202cc47..3ffecb1847a5 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 @@ -72,7 +72,6 @@ import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent. import com.woocommerce.android.ui.products.MutableMultipleSelectionPredicate import com.woocommerce.android.util.ChromeCustomTabUtils import com.woocommerce.android.util.CurrencyFormatter -import com.woocommerce.android.util.FeatureFlag import com.woocommerce.android.util.StringUtils import com.woocommerce.android.viewmodel.MultiLiveEvent import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType @@ -244,10 +243,7 @@ class OrderListFragment : binding.orderFiltersCard.setClickListener { viewModel.onFiltersButtonTapped() } initCreateOrderFAB(binding.createOrderButton) initSwipeBehaviour() - - if (FeatureFlag.BULK_UPDATE_ORDERS_STATUS.isEnabled()) { - addSelectionTracker() - } + addSelectionTracker() } private fun addSelectionTracker() { diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt index d20cf075093e..db00f2d3934a 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/SitePickerViewModel.kt @@ -31,7 +31,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.H import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel import com.woocommerce.android.ui.sitepicker.sitevisibility.GetWooVisibleSites -import com.woocommerce.android.util.FeatureFlag import com.woocommerce.android.util.WooLog import com.woocommerce.android.viewmodel.LiveDataDelegate import com.woocommerce.android.viewmodel.MultiLiveEvent @@ -233,8 +232,7 @@ class SitePickerViewModel @Inject constructor( val isSelectedSiteVisible = getWooVisibleSites().any { it.id == selectedSiteId } _sites.value = buildSitesList(wooSites, selectedSiteId, nonWooSites) - val isEditListEnabled = FeatureFlag.HIDE_SITES_FROM_SITE_PICKER.isEnabled() && - !navArgs.openedFromLogin && + val isEditListEnabled = !navArgs.openedFromLogin && wooSites.size > 1 if (isEditListEnabled && sitePickerViewState.editStoreListEnabled.not()) { analyticsTrackerWrapper.track(stat = AnalyticsEvent.SITE_PICKER_EDIT_BUTTON_SHOWN) 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 ef6a016fbe76..66bbb13eb102 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt @@ -10,12 +10,8 @@ enum class FeatureFlag { WC_SHIPPING_BANNER, BETTER_CUSTOMER_SEARCH_M2, ORDER_CREATION_AUTO_TAX_RATE, - NEW_SHIPPING_SUPPORT, - REVAMP_WOO_SHIPPING, - BULK_UPDATE_ORDERS_STATUS, WOO_POS_HISTORICAL_ORDERS_M1, WOO_POS_LOCAL_CATALOG_M1, - HIDE_SITES_FROM_SITE_PICKER, AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL, APP_PASSWORDS_FOR_JETPACK_SITES; @@ -32,11 +28,6 @@ enum class FeatureFlag { AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL, WOO_POS_LOCAL_CATALOG_M1, APP_PASSWORDS_FOR_JETPACK_SITES -> PackageUtils.isDebugBuild() - - NEW_SHIPPING_SUPPORT, - BULK_UPDATE_ORDERS_STATUS, - HIDE_SITES_FROM_SITE_PICKER, - REVAMP_WOO_SHIPPING -> true } } }