@@ -27,7 +27,6 @@ import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitePickerEvent
27
27
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.Header
28
28
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.NonWooSiteUiModel
29
29
import com.woocommerce.android.ui.sitepicker.SitePickerViewModel.SitesListItem.WooSiteUiModel
30
- import com.woocommerce.android.util.FeatureFlag
31
30
import com.woocommerce.android.util.WooLog
32
31
import com.woocommerce.android.viewmodel.LiveDataDelegate
33
32
import com.woocommerce.android.viewmodel.MultiLiveEvent
@@ -160,9 +159,7 @@ class SitePickerViewModel @Inject constructor(
160
159
161
160
private suspend fun getSitesFromDb (): List <SiteModel > {
162
161
val sitesInDb = repository.getSites()
163
- return if (! FeatureFlag .JETPACK_CP .isEnabled() ||
164
- sitesInDb.none { it.isJetpackCPConnected }
165
- ) {
162
+ return if (sitesInDb.none { it.isJetpackCPConnected }) {
166
163
sitesInDb
167
164
} else {
168
165
emptyList()
@@ -190,9 +187,7 @@ class SitePickerViewModel @Inject constructor(
190
187
}
191
188
192
189
private fun onSitesLoaded (sites : List <SiteModel >) {
193
- val filteredSites = sites.filter {
194
- FeatureFlag .JETPACK_CP .isEnabled() || ! it.isJetpackCPConnected
195
- }
190
+ val filteredSites = sites.filter { ! it.isJetpackCPConnected }
196
191
197
192
if (filteredSites.isEmpty()) {
198
193
when {
@@ -268,9 +263,7 @@ class SitePickerViewModel @Inject constructor(
268
263
* - Has WooCommerce installed
269
264
*/
270
265
private fun processLoginSiteAddress (url : String ) {
271
- val site = repository.getSiteBySiteUrl(url)?.takeIf {
272
- FeatureFlag .JETPACK_CP .isEnabled() || ! it.isJetpackCPConnected
273
- }
266
+ val site = repository.getSiteBySiteUrl(url)?.takeIf { ! it.isJetpackCPConnected }
274
267
when {
275
268
site == null -> {
276
269
// The url doesn't match any sites for this account.
0 commit comments