Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -220,8 +219,7 @@ class OrderDetailViewModel @Inject constructor(
private var pluginsInformation: Map<String, WooPlugin> = HashMap()

private val isRevampWooShippingEnabled: Boolean
get() = FeatureFlag.REVAMP_WOO_SHIPPING.isEnabled() &&
shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()
get() = shippingLabelOnboardingRepository.shippingPluginSupport.isWooShippingSupported()

init {
productImageMap.subscribeToOnProductFetchedEvents(this)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

fun isEnabled(context: Context? = null): Boolean {
Expand All @@ -30,11 +26,6 @@ enum class FeatureFlag {
ORDER_CREATION_AUTO_TAX_RATE,
AI_PRODUCT_IMAGE_BACKGROUND_REMOVAL,
WOO_POS_LOCAL_CATALOG_M1 -> PackageUtils.isDebugBuild()

NEW_SHIPPING_SUPPORT,
BULK_UPDATE_ORDERS_STATUS,
HIDE_SITES_FROM_SITE_PICKER,
REVAMP_WOO_SHIPPING -> true
}
}
}
Loading