Merge pull request #20390 from wordpress-mobile/fix/loading-state-of-traffic-chart

Fix the loading state of the traffic chart

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/UiModelMapper.kt

@@ -83,13 +83,6 @@ class UiModelMapper
         return mapStatsWithOverview(PostDetailType.POST_OVERVIEW, useCaseModels, showError)
     }
 
-    fun mapViewsVisitorsDetailStats(
-        useCaseModels: List<UseCaseModel>,
-        showError: (Int) -> Unit
-    ): UiModel {
-        return mapStatsWithOverview(TimeStatsType.OVERVIEW, useCaseModels, showError)
-    }
-
     @Suppress("CyclomaticComplexMethod")
     private fun mapStatsWithOverview(
         overViewType: StatsType,
@@ -105,30 +98,30 @@ class UiModelMapper
         return if (!allFailing && (overviewHasData || !overviewIsFailing)) {
             if (useCaseModels.isNotEmpty()) {
                 UiModel.Success(useCaseModels.mapNotNull { useCaseModel ->
-                    if ((useCaseModel.type == overViewType) && useCaseModel.data != null) {
-                        StatsBlock.Success(useCaseModel.type, useCaseModel.data)
-                    } else {
-                        when (useCaseModel.state) {
-                            SUCCESS -> StatsBlock.Success(useCaseModel.type, useCaseModel.data ?: listOf())
-                            ERROR -> useCaseModel.stateData?.let {
-                                StatsBlock.Error(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                                )
-                            }
-                            LOADING -> useCaseModel.stateData?.let {
-                                StatsBlock.Loading(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                                )
-                            }
-                            EMPTY -> useCaseModel.stateData?.let {
-                                StatsBlock.EmptyBlock(
-                                    useCaseModel.type,
-                                    useCaseModel.stateData
-                                )
-                            }
+                    when {
+                        useCaseModel.state == LOADING -> useCaseModel.stateData?.let {
+                            StatsBlock.Loading(useCaseModel.type, useCaseModel.stateData)
                         }
+
+                        useCaseModel.type == overViewType && useCaseModel.data != null -> StatsBlock.Success(
+                            useCaseModel.type,
+                            useCaseModel.data
+                        )
+
+                        useCaseModel.state == SUCCESS -> StatsBlock.Success(
+                            useCaseModel.type,
+                            useCaseModel.data ?: listOf()
+                        )
+
+                        useCaseModel.state == ERROR -> useCaseModel.stateData?.let {
+                            StatsBlock.Error(useCaseModel.type, useCaseModel.stateData)
+                        }
+
+                        useCaseModel.state == EMPTY -> useCaseModel.stateData?.let {
+                            StatsBlock.EmptyBlock(useCaseModel.type, useCaseModel.stateData)
+                        }
+
+                        else -> null
                     }
                 })
             } else {