Fix merch distribution getting into the wrong error flow

RoboJackets · Sep 8, 2024 · c3be6e7 · c3be6e7
1 parent 4e1b5a5
commit c3be6e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/merchandise/src/main/java/org/robojackets/apiary/merchandise/model/MerchandiseViewModel.kt b/merchandise/src/main/java/org/robojackets/apiary/merchandise/model/MerchandiseViewModel.kt
@@ -320,6 +320,7 @@ class MerchandiseViewModel @Inject constructor(
     }
 
     fun dismissPickupDialog() {
+        error.value = null
         screenState.value = MerchandiseDistributionScreenState.ReadyForTap
     }
 }

diff --git a/...dise/src/main/java/org/robojackets/apiary/merchandise/ui/MerchandiseDistributionScreen.kt b/...dise/src/main/java/org/robojackets/apiary/merchandise/ui/MerchandiseDistributionScreen.kt
@@ -8,6 +8,7 @@ import com.nxp.nfclib.NxpNfcLib
 import org.robojackets.apiary.base.ui.error.ErrorMessageWithRetry
 import org.robojackets.apiary.base.ui.util.ContentPadding
 import org.robojackets.apiary.base.ui.util.LoadingSpinner
+import org.robojackets.apiary.merchandise.model.MerchandiseDistributionScreenState
 import org.robojackets.apiary.merchandise.model.MerchandiseViewModel
 import timber.log.Timber
 
@@ -33,7 +34,7 @@ fun MerchandiseDistributionScreen(
                     prioritizeRetryButton = true,
                 )
             }
-            state.error != null -> {
+            state.error != null && state.screenState == MerchandiseDistributionScreenState.ReadyForTap -> {
                 ErrorMessageWithRetry(
                     title = state.error ?: "Merchandise distribution is temporarily unavailable",
                     onRetry = { viewModel.selectMerchandiseItemForDistribution(merchandiseItemId) },
-Original file line number
+Diff line change
@@ Expand Up / @@ -320,6 +320,7 @@ class MerchandiseViewModel @Inject constructor( @@
         }
         fun dismissPickupDialog() {
+            error.value = null
             screenState.value = MerchandiseDistributionScreenState.ReadyForTap
         }
     }
@@ Expand Down @@