File tree Expand file tree Collapse file tree 5 files changed +4
-26
lines changed
WooCommerce/src/main/kotlin/com/woocommerce/android Expand file tree Collapse file tree 5 files changed +4
-26
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,6 @@ import com.woocommerce.android.ui.payments.tracking.PaymentsFlowTracker
7070import com.woocommerce.android.ui.products.addons.AddonRepository
7171import com.woocommerce.android.ui.products.details.ProductDetailRepository
7272import com.woocommerce.android.ui.shipping.InstallWCShippingViewModel
73- import com.woocommerce.android.util.FeatureFlag
7473import com.woocommerce.android.util.WooLog
7574import com.woocommerce.android.util.WooLog.T
7675import com.woocommerce.android.viewmodel.LiveDataDelegate
@@ -220,8 +219,7 @@ class OrderDetailViewModel @Inject constructor(
220219 private var pluginsInformation: Map <String , WooPlugin > = HashMap ()
221220
222221 private val isRevampWooShippingEnabled: Boolean
223- get() = FeatureFlag .REVAMP_WOO_SHIPPING .isEnabled() &&
224- shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
222+ get() = shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
225223
226224 init {
227225 productImageMap.subscribeToOnProductFetchedEvents(this )
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import com.woocommerce.android.AppPrefsWrapper
44import com.woocommerce.android.extensions.semverCompareTo
55import com.woocommerce.android.model.Order
66import com.woocommerce.android.tools.SelectedSite
7- import com.woocommerce.android.util.FeatureFlag
87import javax.inject.Inject
98
109class ShippingLabelOnboardingRepository @Inject constructor(
@@ -52,11 +51,7 @@ class ShippingLabelOnboardingRepository @Inject constructor(
5251 it.isOperational &&
5352 pluginVersion.semverCompareTo(SUPPORTED_WC_SHIPPING_VERSION ) >= 0
5453 }?.let {
55- return if (FeatureFlag .REVAMP_WOO_SHIPPING .isEnabled()) {
56- ShippingLabelSupport .WC_SHIPPING_SUPPORTED
57- } else {
58- ShippingLabelSupport .WCS_SUPPORTED
59- }
54+ return ShippingLabelSupport .WC_SHIPPING_SUPPORTED
6055 }
6156
6257 orderDetailRepository.getWooServicesPluginInfo()
Original file line number Diff line number Diff line change @@ -72,7 +72,6 @@ import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.
7272import com.woocommerce.android.ui.products.MutableMultipleSelectionPredicate
7373import com.woocommerce.android.util.ChromeCustomTabUtils
7474import com.woocommerce.android.util.CurrencyFormatter
75- import com.woocommerce.android.util.FeatureFlag
7675import com.woocommerce.android.util.StringUtils
7776import com.woocommerce.android.viewmodel.MultiLiveEvent
7877import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
@@ -244,10 +243,7 @@ class OrderListFragment :
244243 binding.orderFiltersCard.setClickListener { viewModel.onFiltersButtonTapped() }
245244 initCreateOrderFAB(binding.createOrderButton)
246245 initSwipeBehaviour()
247-
248- if (FeatureFlag .BULK_UPDATE_ORDERS_STATUS .isEnabled()) {
249- addSelectionTracker()
250- }
246+ addSelectionTracker()
251247 }
252248
253249 private fun addSelectionTracker () {
Original file line number Diff line number Diff line change @@ -31,7 +31,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.H
3131import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel
3232import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel
3333import com.woocommerce.android.ui.sitepicker.sitevisibility.GetWooVisibleSites
34- import com.woocommerce.android.util.FeatureFlag
3534import com.woocommerce.android.util.WooLog
3635import com.woocommerce.android.viewmodel.LiveDataDelegate
3736import com.woocommerce.android.viewmodel.MultiLiveEvent
@@ -233,8 +232,7 @@ class SitePickerViewModel @Inject constructor(
233232 val isSelectedSiteVisible = getWooVisibleSites().any { it.id == selectedSiteId }
234233 _sites .value = buildSitesList(wooSites, selectedSiteId, nonWooSites)
235234
236- val isEditListEnabled = FeatureFlag .HIDE_SITES_FROM_SITE_PICKER .isEnabled() &&
237- ! navArgs.openedFromLogin &&
235+ val isEditListEnabled = ! navArgs.openedFromLogin &&
238236 wooSites.size > 1
239237 if (isEditListEnabled && sitePickerViewState.editStoreListEnabled.not ()) {
240238 analyticsTrackerWrapper.track(stat = AnalyticsEvent .SITE_PICKER_EDIT_BUTTON_SHOWN )
Original file line number Diff line number Diff line change @@ -10,12 +10,8 @@ enum class FeatureFlag {
1010 WC_SHIPPING_BANNER ,
1111 BETTER_CUSTOMER_SEARCH_M2 ,
1212 ORDER_CREATION_AUTO_TAX_RATE ,
13- NEW_SHIPPING_SUPPORT ,
14- REVAMP_WOO_SHIPPING ,
15- BULK_UPDATE_ORDERS_STATUS ,
1613 WOO_POS_HISTORICAL_ORDERS_M1 ,
1714 WOO_POS_LOCAL_CATALOG_M1 ,
18- HIDE_SITES_FROM_SITE_PICKER ,
1915 AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL ,
2016 APP_PASSWORDS_FOR_JETPACK_SITES ;
2117
@@ -32,11 +28,6 @@ enum class FeatureFlag {
3228 AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL ,
3329 WOO_POS_LOCAL_CATALOG_M1 ,
3430 APP_PASSWORDS_FOR_JETPACK_SITES -> PackageUtils .isDebugBuild()
35-
36- NEW_SHIPPING_SUPPORT ,
37- BULK_UPDATE_ORDERS_STATUS ,
38- HIDE_SITES_FROM_SITE_PICKER ,
39- REVAMP_WOO_SHIPPING -> true
4031 }
4132 }
4233}
You can’t perform that action at this time.
0 commit comments