From 0032f144ac88147c4758f5b81c703c4110f13150 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 17 May 2024 16:44:02 +0100
Subject: [PATCH 01/11] Update UI model with needed properties

---
 .../coupons/DashboardCouponsViewModel.kt      | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
index 3207abcad42..5f1f8636f11 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.WooException
-import com.woocommerce.android.model.Coupon
 import com.woocommerce.android.model.CouponPerformanceReport
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection
@@ -15,6 +14,9 @@ import com.woocommerce.android.ui.dashboard.DashboardViewModel
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.RefreshEvent
 import com.woocommerce.android.ui.dashboard.data.CouponsCustomDateRangeDataStore
 import com.woocommerce.android.ui.dashboard.domain.DashboardDateRangeFormatter
+import com.woocommerce.android.ui.products.ParameterRepository
+import com.woocommerce.android.util.CoroutineDispatchers
+import com.woocommerce.android.util.CouponUtils
 import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
@@ -23,6 +25,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -51,6 +54,9 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     private val customDateRangeDataStore: CouponsCustomDateRangeDataStore,
     private val dateRangeFormatter: DashboardDateRangeFormatter,
     private val appPrefs: AppPrefsWrapper,
+    private val couponUtils: CouponUtils,
+    private val parameterRepository: ParameterRepository,
+    private val coroutineDispatchers: CoroutineDispatchers
 ) : ScopedViewModel(savedStateHandle) {
     companion object {
         private const val COUPONS_LIMIT = 3
@@ -64,6 +70,10 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     private val selectedDateRange = getSelectedRange()
         .shareIn(viewModelScope, started = SharingStarted.WhileSubscribed(), replay = 1)
 
+    private val currencyCodeTask = async(coroutineDispatchers.io) {
+        parameterRepository.getParameters().currencyCode
+    }
+
     val dateRangeState = combine(
         selectedDateRange,
         customDateRangeDataStore.dateRange
@@ -152,8 +162,9 @@ class DashboardCouponsViewModel @AssistedInject constructor(
                                 ?: error("Coupon not found for id: ${performanceReport.couponId}")
 
                             CouponUiModel(
-                                coupon = coupon,
-                                performanceReport = performanceReport
+                                code = coupon.code.orEmpty(),
+                                uses = performanceReport.ordersCount,
+                                description = couponUtils.generateSummary(coupon, currencyCodeTask.await())
                             )
                         }
 
@@ -232,11 +243,10 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     )
 
     data class CouponUiModel(
-        private val coupon: Coupon,
-        private val performanceReport: CouponPerformanceReport
-    ) {
-        val code: String = coupon.code.orEmpty()
-    }
+        val code: String,
+        val uses: Int,
+        val description: String
+    )
 
     data class OpenDatePicker(val fromDate: Date, val toDate: Date) : MultiLiveEvent.Event()
 

From 53bf4b18a7e3fd8c0b69a3047520e281cddefa2e Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 17 May 2024 17:11:18 +0100
Subject: [PATCH 02/11] Add a loading UI

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 415f59b616d..75b3f320871 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -1,8 +1,11 @@
 package com.woocommerce.android.ui.dashboard.coupons
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -10,11 +13,13 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import com.woocommerce.android.model.DashboardWidget.Type.COUPONS
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.SelectionType
+import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.rememberNavController
 import com.woocommerce.android.ui.compose.viewModelWithFactory
 import com.woocommerce.android.ui.dashboard.DashboardDateRangeHeader
@@ -113,7 +118,7 @@ private fun DashboardCouponsCard(
 
             when (viewState) {
                 is Loading -> {
-                    CircularProgressIndicator()
+                    CouponsLoading()
                 }
 
                 is Loaded -> {
@@ -143,3 +148,41 @@ private fun DashboardCouponsList(
         }
     }
 }
+
+@Composable
+private fun CouponsLoading(
+    modifier: Modifier = Modifier
+) {
+    Column(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
+        Header(Modifier.fillMaxWidth())
+        Spacer(modifier = Modifier.height(8.dp))
+        repeat(3) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(4.dp),
+                modifier = Modifier.padding(top = 8.dp)
+            ) {
+                Row(
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    SkeletonView(width = 260.dp, height = 16.dp)
+                    SkeletonView(width = 40.dp, height = 16.dp)
+                }
+                SkeletonView(width = 120.dp, height = 16.dp)
+                Spacer(modifier = Modifier)
+                Divider()
+            }
+        }
+    }
+}
+
+@Composable
+private fun Header(modifier: Modifier = Modifier) {
+    Row(
+        horizontalArrangement = Arrangement.SpaceBetween,
+        modifier = modifier
+    ) {
+        Text(text = "Coupons")
+        Text(text = "Uses")
+    }
+}

From 6a829acfefad9592c70acb796208a17cd7f26ccf Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 17 May 2024 17:58:43 +0100
Subject: [PATCH 03/11] Add UI for the coupon items

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 60 +++++++++++++++++--
 WooCommerce/src/main/res/values/strings.xml   |  4 ++
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 75b3f320871..45d2bfb8d0b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -5,17 +5,22 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import com.woocommerce.android.R
 import com.woocommerce.android.model.DashboardWidget.Type.COUPONS
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.SelectionType
@@ -141,11 +146,46 @@ private fun DashboardCouponsList(
     state: Loaded,
     modifier: Modifier = Modifier
 ) {
-    Column(modifier) {
-        state.coupons.forEach {
-            Text(text = it.code)
-            Divider()
+    Column(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
+        Header(Modifier.fillMaxWidth())
+        Spacer(modifier = Modifier.height(8.dp))
+        state.coupons.forEach { couponUiModel ->
+            CouponListItem(
+                couponUiModel = couponUiModel
+            )
+        }
+    }
+}
+
+@Composable
+private fun CouponListItem(
+    couponUiModel: DashboardCouponsViewModel.CouponUiModel,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(4.dp),
+        modifier = modifier.padding(top = 8.dp)
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.SpaceBetween,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(
+                text = couponUiModel.code,
+                style = MaterialTheme.typography.subtitle1
+            )
+            Text(
+                text = couponUiModel.uses.toString(),
+                style = MaterialTheme.typography.subtitle1
+            )
         }
+        Text(
+            text = couponUiModel.description,
+            style = MaterialTheme.typography.body2,
+            color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium)
+        )
+        Spacer(modifier = Modifier)
+        Divider()
     }
 }
 
@@ -182,7 +222,15 @@ private fun Header(modifier: Modifier = Modifier) {
         horizontalArrangement = Arrangement.SpaceBetween,
         modifier = modifier
     ) {
-        Text(text = "Coupons")
-        Text(text = "Uses")
+        Text(
+            text = stringResource(id = R.string.dashboard_coupons_card_header_coupons),
+            style = MaterialTheme.typography.subtitle2,
+            color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium)
+        )
+        Text(
+            text = stringResource(id = R.string.dashboard_coupons_card_header_uses),
+            style = MaterialTheme.typography.subtitle2,
+            color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium)
+        )
     }
 }
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index a180102b550..a96d62c28b3 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -426,6 +426,10 @@
     <string name="dashboard_reviews_card_empty_title_filtered">No reviews found</string>
     <string name="dashboard_reviews_card_empty_message_filtered">No reviews match the selected filter, please try changing the filter</string>
     <string name="dashboard_reviews_card_view_all_button">View all reviews</string>
+
+    <string name="dashboard_coupons_card_header_coupons">Coupons</string>
+    <string name="dashboard_coupons_card_header_uses">Uses</string>
+
     <!--
         Sign Up Flow
     -->

From f0307ae3d51649d1e79681ea335ac0d5796d1160 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 17 May 2024 18:48:25 +0100
Subject: [PATCH 04/11] Handle navigation to coupons and add menu

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 27 ++++++++++++++++++-
 .../coupons/DashboardCouponsViewModel.kt      |  5 ++++
 .../main/res/navigation/nav_graph_main.xml    |  3 +++
 WooCommerce/src/main/res/values/strings.xml   |  1 +
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 45d2bfb8d0b..ebd0e3d1b3d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -21,6 +21,8 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import com.woocommerce.android.R
+import com.woocommerce.android.extensions.navigateSafely
+import com.woocommerce.android.model.DashboardWidget
 import com.woocommerce.android.model.DashboardWidget.Type.COUPONS
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
 import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.SelectionType
@@ -28,6 +30,7 @@ import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.rememberNavController
 import com.woocommerce.android.ui.compose.viewModelWithFactory
 import com.woocommerce.android.ui.dashboard.DashboardDateRangeHeader
+import com.woocommerce.android.ui.dashboard.DashboardFragmentDirections
 import com.woocommerce.android.ui.dashboard.DashboardViewModel
 import com.woocommerce.android.ui.dashboard.DashboardViewModel.DashboardWidgetMenu
 import com.woocommerce.android.ui.dashboard.WidgetCard
@@ -37,6 +40,8 @@ import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.St
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Error
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Loaded
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Loading
+import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.ViewAllCoupons
+import com.woocommerce.android.ui.dashboard.defaultHideMenuEntry
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import java.util.Date
 
@@ -67,6 +72,8 @@ fun DashboardCouponsCard(
         viewState = viewState,
         onTabSelected = viewModel::onTabSelected,
         onCustomRangeClick = viewModel::onEditCustomRangeTapped,
+        onViewAllClick = viewModel::onViewAllClicked,
+        onHideClick = { parentViewModel.onHideWidgetClicked(DashboardWidget.Type.COUPONS) },
         modifier = modifier
     )
 }
@@ -85,6 +92,12 @@ private fun HandleEvents(
                 is DashboardCouponsViewModel.OpenDatePicker -> {
                     openDatePicker(event.fromDate.time, event.toDate.time)
                 }
+
+                ViewAllCoupons -> {
+                    navController.navigateSafely(
+                        DashboardFragmentDirections.actionDashboardToCouponListFragment()
+                    )
+                }
             }
         }
 
@@ -102,11 +115,23 @@ private fun DashboardCouponsCard(
     viewState: State,
     onTabSelected: (SelectionType) -> Unit,
     onCustomRangeClick: () -> Unit,
+    onViewAllClick: () -> Unit,
+    onHideClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     WidgetCard(
         titleResource = COUPONS.titleResource,
-        menu = DashboardWidgetMenu(emptyList()),
+        menu = DashboardWidgetMenu(
+            listOf(
+                DashboardWidget.Type.COUPONS.defaultHideMenuEntry {
+                    onHideClick()
+                }
+            )
+        ),
+        button = DashboardViewModel.DashboardWidgetAction(
+            titleResource = R.string.dashboard_coupons_view_all_button,
+            action = onViewAllClick
+        ),
         isError = viewState is Error,
         modifier = modifier
     ) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
index 5f1f8636f11..70d7cc143f8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
@@ -140,6 +140,10 @@ class DashboardCouponsViewModel @AssistedInject constructor(
         }
     }
 
+    fun onViewAllClicked() {
+        triggerEvent(ViewAllCoupons)
+    }
+
     private fun observeCouponUiModels(
         dateRange: StatsTimeRange,
         forceRefresh: Boolean
@@ -249,6 +253,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     )
 
     data class OpenDatePicker(val fromDate: Date, val toDate: Date) : MultiLiveEvent.Event()
+    data object ViewAllCoupons : MultiLiveEvent.Event()
 
     @AssistedFactory
     interface Factory {
diff --git a/WooCommerce/src/main/res/navigation/nav_graph_main.xml b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
index 1e2c5afec36..18648265266 100644
--- a/WooCommerce/src/main/res/navigation/nav_graph_main.xml
+++ b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
@@ -90,6 +90,9 @@
         <action
             android:id="@+id/action_dashboard_to_reviews"
             app:destination="@id/reviews" />
+        <action
+            android:id="@+id/action_dashboard_to_couponListFragment"
+            app:destination="@id/nav_graph_coupons" />
     </fragment>
     <fragment
         android:id="@+id/orders"
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index a96d62c28b3..281ba533efd 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -429,6 +429,7 @@
 
     <string name="dashboard_coupons_card_header_coupons">Coupons</string>
     <string name="dashboard_coupons_card_header_uses">Uses</string>
+    <string name="dashboard_coupons_view_all_button">View all coupons</string>
 
     <!--
         Sign Up Flow

From 1829783f7c749e00262b4ad9f7fb5ce13c34c759 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 17 May 2024 19:18:26 +0100
Subject: [PATCH 05/11] Error handling

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 26 ++++++++++++-------
 .../coupons/DashboardCouponsViewModel.kt      |  4 +++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index ebd0e3d1b3d..91767347f71 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -74,6 +74,8 @@ fun DashboardCouponsCard(
         onCustomRangeClick = viewModel::onEditCustomRangeTapped,
         onViewAllClick = viewModel::onViewAllClicked,
         onHideClick = { parentViewModel.onHideWidgetClicked(DashboardWidget.Type.COUPONS) },
+        onRetryClick = viewModel::onRetryClicked,
+        onContactSupportClick = parentViewModel::onContactSupportClicked,
         modifier = modifier
     )
 }
@@ -117,6 +119,8 @@ private fun DashboardCouponsCard(
     onCustomRangeClick: () -> Unit,
     onViewAllClick: () -> Unit,
     onHideClick: () -> Unit,
+    onRetryClick: () -> Unit,
+    onContactSupportClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     WidgetCard(
@@ -136,15 +140,17 @@ private fun DashboardCouponsCard(
         modifier = modifier
     ) {
         Column {
-            DashboardDateRangeHeader(
-                rangeSelection = dateRangeState.rangeSelection,
-                dateFormatted = dateRangeState.rangeFormatted,
-                onCustomRangeClick = onCustomRangeClick,
-                onTabSelected = onTabSelected,
-                modifier = Modifier.fillMaxWidth()
-            )
+            if (viewState !is Error) {
+                DashboardDateRangeHeader(
+                    rangeSelection = dateRangeState.rangeSelection,
+                    dateFormatted = dateRangeState.rangeFormatted,
+                    onCustomRangeClick = onCustomRangeClick,
+                    onTabSelected = onTabSelected,
+                    modifier = Modifier.fillMaxWidth()
+                )
 
-            Divider()
+                Divider()
+            }
 
             when (viewState) {
                 is Loading -> {
@@ -157,8 +163,8 @@ private fun DashboardCouponsCard(
 
                 is Error -> {
                     WidgetError(
-                        onContactSupportClicked = { /*TODO*/ },
-                        onRetryClicked = { /*TODO*/ }
+                        onContactSupportClicked = onContactSupportClick,
+                        onRetryClicked = onRetryClick
                     )
                 }
             }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
index 70d7cc143f8..09bbef2c459 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
@@ -144,6 +144,10 @@ class DashboardCouponsViewModel @AssistedInject constructor(
         triggerEvent(ViewAllCoupons)
     }
 
+    fun onRetryClicked() {
+        _refreshTrigger.tryEmit(RefreshEvent())
+    }
+
     private fun observeCouponUiModels(
         dateRange: StatsTimeRange,
         forceRefresh: Boolean

From 2fdb924e6264e058a877dd7b3e6669a523a57782 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 19 May 2024 11:14:25 +0100
Subject: [PATCH 06/11] Handle navigation to coupon details

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 54 ++++++++++++++-----
 .../coupons/DashboardCouponsViewModel.kt      |  7 +++
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 91767347f71..9ccad870fca 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -1,5 +1,6 @@
 package com.woocommerce.android.ui.dashboard.coupons
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -20,6 +21,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
+import androidx.navigation.navOptions
 import com.woocommerce.android.R
 import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.model.DashboardWidget
@@ -29,6 +31,7 @@ import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.Selec
 import com.woocommerce.android.ui.compose.animations.SkeletonView
 import com.woocommerce.android.ui.compose.rememberNavController
 import com.woocommerce.android.ui.compose.viewModelWithFactory
+import com.woocommerce.android.ui.coupons.CouponListFragmentDirections
 import com.woocommerce.android.ui.dashboard.DashboardDateRangeHeader
 import com.woocommerce.android.ui.dashboard.DashboardFragmentDirections
 import com.woocommerce.android.ui.dashboard.DashboardViewModel
@@ -37,10 +40,6 @@ import com.woocommerce.android.ui.dashboard.WidgetCard
 import com.woocommerce.android.ui.dashboard.WidgetError
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.DateRangeState
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State
-import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Error
-import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Loaded
-import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State.Loading
-import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.ViewAllCoupons
 import com.woocommerce.android.ui.dashboard.defaultHideMenuEntry
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import java.util.Date
@@ -73,6 +72,7 @@ fun DashboardCouponsCard(
         onTabSelected = viewModel::onTabSelected,
         onCustomRangeClick = viewModel::onEditCustomRangeTapped,
         onViewAllClick = viewModel::onViewAllClicked,
+        onCouponClick = viewModel::onCouponClicked,
         onHideClick = { parentViewModel.onHideWidgetClicked(DashboardWidget.Type.COUPONS) },
         onRetryClick = viewModel::onRetryClicked,
         onContactSupportClick = parentViewModel::onContactSupportClicked,
@@ -95,11 +95,32 @@ private fun HandleEvents(
                     openDatePicker(event.fromDate.time, event.toDate.time)
                 }
 
-                ViewAllCoupons -> {
+                DashboardCouponsViewModel.ViewAllCoupons -> {
                     navController.navigateSafely(
                         DashboardFragmentDirections.actionDashboardToCouponListFragment()
                     )
                 }
+
+                is DashboardCouponsViewModel.ViewCouponDetails -> {
+                    navController.navigateSafely(
+                        DashboardFragmentDirections.actionDashboardToCouponListFragment()
+                    )
+                    navController.navigateSafely(
+                        directions = CouponListFragmentDirections.actionCouponListFragmentToCouponDetailsFragment(
+                            couponId = event.couponId
+                        ),
+                        skipThrottling = true,
+                        navOptions = navOptions {
+                            popUpTo(R.id.dashboard)
+                            anim {
+                                enter = R.anim.default_enter_anim
+                                exit = R.anim.default_exit_anim
+                                popEnter = R.anim.default_pop_enter_anim
+                                popExit = R.anim.default_pop_exit_anim
+                            }
+                        }
+                    )
+                }
             }
         }
 
@@ -118,6 +139,7 @@ private fun DashboardCouponsCard(
     onTabSelected: (SelectionType) -> Unit,
     onCustomRangeClick: () -> Unit,
     onViewAllClick: () -> Unit,
+    onCouponClick: (Long) -> Unit,
     onHideClick: () -> Unit,
     onRetryClick: () -> Unit,
     onContactSupportClick: () -> Unit,
@@ -153,15 +175,18 @@ private fun DashboardCouponsCard(
             }
 
             when (viewState) {
-                is Loading -> {
+                is State.Loading -> {
                     CouponsLoading()
                 }
 
-                is Loaded -> {
-                    DashboardCouponsList(viewState)
+                is State.Loaded -> {
+                    DashboardCouponsList(
+                        viewState,
+                        onCouponClick
+                    )
                 }
 
-                is Error -> {
+                is State.Error -> {
                     WidgetError(
                         onContactSupportClicked = onContactSupportClick,
                         onRetryClicked = onRetryClick
@@ -174,7 +199,8 @@ private fun DashboardCouponsCard(
 
 @Composable
 private fun DashboardCouponsList(
-    state: Loaded,
+    state: State.Loaded,
+    onCouponClick: (Long) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
@@ -182,7 +208,8 @@ private fun DashboardCouponsList(
         Spacer(modifier = Modifier.height(8.dp))
         state.coupons.forEach { couponUiModel ->
             CouponListItem(
-                couponUiModel = couponUiModel
+                couponUiModel = couponUiModel,
+                onClick = { onCouponClick(couponUiModel.id) }
             )
         }
     }
@@ -191,11 +218,14 @@ private fun DashboardCouponsList(
 @Composable
 private fun CouponListItem(
     couponUiModel: DashboardCouponsViewModel.CouponUiModel,
+    onClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(
         verticalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = modifier.padding(top = 8.dp)
+        modifier = modifier
+            .clickable(onClick = onClick)
+            .padding(top = 8.dp)
     ) {
         Row(
             horizontalArrangement = Arrangement.SpaceBetween,
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
index 09bbef2c459..48ce7365573 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
@@ -144,6 +144,10 @@ class DashboardCouponsViewModel @AssistedInject constructor(
         triggerEvent(ViewAllCoupons)
     }
 
+    fun onCouponClicked(couponId: Long) {
+        triggerEvent(ViewCouponDetails(couponId))
+    }
+
     fun onRetryClicked() {
         _refreshTrigger.tryEmit(RefreshEvent())
     }
@@ -170,6 +174,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
                                 ?: error("Coupon not found for id: ${performanceReport.couponId}")
 
                             CouponUiModel(
+                                id = coupon.id,
                                 code = coupon.code.orEmpty(),
                                 uses = performanceReport.ordersCount,
                                 description = couponUtils.generateSummary(coupon, currencyCodeTask.await())
@@ -251,6 +256,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     )
 
     data class CouponUiModel(
+        val id: Long,
         val code: String,
         val uses: Int,
         val description: String
@@ -258,6 +264,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
 
     data class OpenDatePicker(val fromDate: Date, val toDate: Date) : MultiLiveEvent.Event()
     data object ViewAllCoupons : MultiLiveEvent.Event()
+    data class ViewCouponDetails(val couponId: Long) : MultiLiveEvent.Event()
 
     @AssistedFactory
     interface Factory {

From 33d44d93e49306838df70afeb1849c1151a5668c Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 19 May 2024 11:17:46 +0100
Subject: [PATCH 07/11] Update paddings

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 9ccad870fca..d2b99095fc9 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
@@ -203,8 +204,8 @@ private fun DashboardCouponsList(
     onCouponClick: (Long) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Column(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
-        Header(Modifier.fillMaxWidth())
+    Column(modifier.padding(vertical = 8.dp)) {
+        Header(Modifier.fillMaxWidth().padding(horizontal = 16.dp))
         Spacer(modifier = Modifier.height(8.dp))
         state.coupons.forEach { couponUiModel ->
             CouponListItem(
@@ -229,7 +230,9 @@ private fun CouponListItem(
     ) {
         Row(
             horizontalArrangement = Arrangement.SpaceBetween,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp)
         ) {
             Text(
                 text = couponUiModel.code,
@@ -243,10 +246,11 @@ private fun CouponListItem(
         Text(
             text = couponUiModel.description,
             style = MaterialTheme.typography.body2,
-            color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium)
+            color = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium),
+            modifier = Modifier.padding(horizontal = 16.dp)
         )
         Spacer(modifier = Modifier)
-        Divider()
+        Divider(modifier = Modifier.padding(start = 16.dp))
     }
 }
 
@@ -254,8 +258,8 @@ private fun CouponListItem(
 private fun CouponsLoading(
     modifier: Modifier = Modifier
 ) {
-    Column(modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
-        Header(Modifier.fillMaxWidth())
+    Column(modifier.padding(vertical = 8.dp)) {
+        Header(Modifier.fillMaxWidth().padding(horizontal = 16.dp))
         Spacer(modifier = Modifier.height(8.dp))
         repeat(3) {
             Column(
@@ -264,14 +268,20 @@ private fun CouponsLoading(
             ) {
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp)
                 ) {
                     SkeletonView(width = 260.dp, height = 16.dp)
                     SkeletonView(width = 40.dp, height = 16.dp)
                 }
-                SkeletonView(width = 120.dp, height = 16.dp)
+                SkeletonView(
+                    modifier = Modifier
+                        .size(width = 120.dp, height = 16.dp)
+                        .padding(horizontal = 16.dp)
+                )
                 Spacer(modifier = Modifier)
-                Divider()
+                Divider(Modifier.padding(start = 16.dp))
             }
         }
     }

From 2904a60dc04fc1f644ca14365f02d2e300f55c8f Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 19 May 2024 11:18:02 +0100
Subject: [PATCH 08/11] Fix tint of the more icon in the coupon details

---
 .../android/ui/coupons/details/CouponDetailsScreen.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsScreen.kt
index fdddc8b678f..567ad7ea19e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsScreen.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsScreen.kt
@@ -83,9 +83,9 @@ fun CouponDetailsScreen(
             actions = {
                 IconButton(onClick = { showMenu = !showMenu }) {
                     Icon(
-                        Icons.Filled.MoreVert,
+                        imageVector = Icons.Filled.MoreVert,
                         contentDescription = "Coupons Menu",
-                        tint = colorResource(id = R.color.action_menu_fg_selector)
+                        tint = MaterialTheme.colors.primary
                     )
                 }
                 DropdownMenu(

From 890ce2ef573e9cc3d22bf435d6abd7f21705973c Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 19 May 2024 12:34:23 +0100
Subject: [PATCH 09/11] Add an empty view to the coupons card

---
 .../dashboard/coupons/DashboardCouponsCard.kt | 53 ++++++++++++++++---
 .../dashboard/reviews/DashboardReviewsCard.kt |  2 +-
 WooCommerce/src/main/res/values/strings.xml   |  1 +
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index d2b99095fc9..0cdd4e32acf 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -1,5 +1,6 @@
 package com.woocommerce.android.ui.dashboard.coupons
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
@@ -16,9 +18,12 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
@@ -181,10 +186,14 @@ private fun DashboardCouponsCard(
                 }
 
                 is State.Loaded -> {
-                    DashboardCouponsList(
-                        viewState,
-                        onCouponClick
-                    )
+                    if (viewState.coupons.isEmpty()) {
+                        CouponsEmptyView()
+                    } else {
+                        DashboardCouponsList(
+                            state = viewState,
+                            onCouponClick = onCouponClick
+                        )
+                    }
                 }
 
                 is State.Error -> {
@@ -205,7 +214,10 @@ private fun DashboardCouponsList(
     modifier: Modifier = Modifier
 ) {
     Column(modifier.padding(vertical = 8.dp)) {
-        Header(Modifier.fillMaxWidth().padding(horizontal = 16.dp))
+        Header(
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp))
         Spacer(modifier = Modifier.height(8.dp))
         state.coupons.forEach { couponUiModel ->
             CouponListItem(
@@ -259,7 +271,10 @@ private fun CouponsLoading(
     modifier: Modifier = Modifier
 ) {
     Column(modifier.padding(vertical = 8.dp)) {
-        Header(Modifier.fillMaxWidth().padding(horizontal = 16.dp))
+        Header(
+            Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp))
         Spacer(modifier = Modifier.height(8.dp))
         repeat(3) {
             Column(
@@ -287,6 +302,32 @@ private fun CouponsLoading(
     }
 }
 
+@Composable
+private fun CouponsEmptyView(
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(16.dp)
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.img_empty_coupon_list),
+            contentDescription = null,
+            modifier = Modifier.sizeIn(maxWidth = 160.dp, maxHeight = 160.dp)
+                .padding(vertical = 16.dp)
+        )
+
+        Text(
+            text = stringResource(id = R.string.dashboard_coupons_card_empty_view_message),
+            style = MaterialTheme.typography.body1,
+            textAlign = TextAlign.Center
+        )
+    }
+}
+
 @Composable
 private fun Header(modifier: Modifier = Modifier) {
     Row(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/reviews/DashboardReviewsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/reviews/DashboardReviewsCard.kt
index ad54c9a9289..8c00c6da3fc 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/reviews/DashboardReviewsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/reviews/DashboardReviewsCard.kt
@@ -316,7 +316,7 @@ private fun Header(
 }
 
 @Composable
-fun EmptyView(
+private fun EmptyView(
     selectedFilter: ProductReviewStatus,
     modifier: Modifier = Modifier
 ) {
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index 281ba533efd..0ee0a65e687 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -430,6 +430,7 @@
     <string name="dashboard_coupons_card_header_coupons">Coupons</string>
     <string name="dashboard_coupons_card_header_uses">Uses</string>
     <string name="dashboard_coupons_view_all_button">View all coupons</string>
+    <string name="dashboard_coupons_card_empty_view_message">No coupon usage during this period</string>
 
     <!--
         Sign Up Flow

From 35d1b10bffd72234d98199ef4892be975c77ddc4 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Sun, 19 May 2024 12:51:10 +0100
Subject: [PATCH 10/11] Fix detekt issues

---
 .../android/ui/dashboard/coupons/DashboardCouponsCard.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
index 0cdd4e32acf..4511552ca88 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt
@@ -217,7 +217,8 @@ private fun DashboardCouponsList(
         Header(
             Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 16.dp))
+                .padding(horizontal = 16.dp)
+        )
         Spacer(modifier = Modifier.height(8.dp))
         state.coupons.forEach { couponUiModel ->
             CouponListItem(
@@ -274,7 +275,8 @@ private fun CouponsLoading(
         Header(
             Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 16.dp))
+                .padding(horizontal = 16.dp)
+        )
         Spacer(modifier = Modifier.height(8.dp))
         repeat(3) {
             Column(
@@ -316,7 +318,8 @@ private fun CouponsEmptyView(
         Image(
             painter = painterResource(id = R.drawable.img_empty_coupon_list),
             contentDescription = null,
-            modifier = Modifier.sizeIn(maxWidth = 160.dp, maxHeight = 160.dp)
+            modifier = Modifier
+                .sizeIn(maxWidth = 160.dp, maxHeight = 160.dp)
                 .padding(vertical = 16.dp)
         )
 

From a06914b409cdbf5ac81dc7a6a064710dc5b4fe38 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Tue, 28 May 2024 18:28:58 +0100
Subject: [PATCH 11/11] Improve logic to account for coupon deletion

This updates the logic to load 6 coupons instead of 3, then exclude deleted coupons, and map only the rest.
---
 .../coupons/DashboardCouponsViewModel.kt      | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
index d08ab0b67c6..2a2559ab699 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsViewModel.kt
@@ -56,10 +56,13 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     private val appPrefs: AppPrefsWrapper,
     private val couponUtils: CouponUtils,
     private val parameterRepository: ParameterRepository,
-    private val coroutineDispatchers: CoroutineDispatchers
+    coroutineDispatchers: CoroutineDispatchers
 ) : ScopedViewModel(savedStateHandle) {
     companion object {
-        private const val COUPONS_LIMIT = 3
+        // We store double the number of coupons to account for the possibility of some coupons being deleted
+        // As the report API keeps track of the deleted ones
+        private const val INTERNAL_COUPONS_LIMIT = 6
+        private const val UI_COUPONS_LIMIT = 3
     }
 
     private val _refreshTrigger = MutableSharedFlow<RefreshEvent>(extraBufferCapacity = 1)
@@ -169,17 +172,25 @@ class DashboardCouponsViewModel @AssistedInject constructor(
                 couponsResult.fold(
                     onSuccess = { coupons ->
                         // Map performance reports to coupons and preserve the order of mostActiveCoupons
-                        val models = mostActiveCoupons.map { performanceReport ->
-                            val coupon = coupons.firstOrNull { coupon -> coupon.id == performanceReport.couponId }
-                                ?: error("Coupon not found for id: ${performanceReport.couponId}")
-
-                            CouponUiModel(
-                                id = coupon.id,
-                                code = coupon.code.orEmpty(),
-                                uses = performanceReport.ordersCount,
-                                description = couponUtils.generateSummary(coupon, currencyCodeTask.await())
-                            )
-                        }
+                        val models = mostActiveCoupons.mapNotNull { performanceReport ->
+                            coupons.firstOrNull { coupon -> coupon.id == performanceReport.couponId }
+                                ?.let { coupon ->
+                                    CouponUiModel(
+                                        id = coupon.id,
+                                        code = coupon.code.orEmpty(),
+                                        uses = performanceReport.ordersCount,
+                                        description = couponUtils.generateSummary(coupon, currencyCodeTask.await())
+                                    )
+                                }.also {
+                                    if (it == null) {
+                                        WooLog.w(
+                                            WooLog.T.DASHBOARD,
+                                            "Coupon not found for performance report: $performanceReport," +
+                                                "it may have been deleted"
+                                        )
+                                    }
+                                }
+                        }.take(UI_COUPONS_LIMIT)
 
                         Result.success(models)
                     },
@@ -201,7 +212,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
             emit(
                 couponRepository.fetchMostActiveCoupons(
                     dateRange = dateRange,
-                    limit = COUPONS_LIMIT
+                    limit = INTERNAL_COUPONS_LIMIT
                 ).onSuccess {
                     couponsReportCache[dateRange] = it
                 }
@@ -215,7 +226,7 @@ class DashboardCouponsViewModel @AssistedInject constructor(
     ) = flow {
         suspend fun fetchCoupons() = couponRepository.fetchCoupons(
             page = 1,
-            pageSize = COUPONS_LIMIT,
+            pageSize = INTERNAL_COUPONS_LIMIT,
             couponIds = couponIds
         )