chore(flipcash): include metadata on error modal when pool distributions fail

bmc08gt · bmc08gt · commit bba9fcc71181 · 2025-07-14T16:43:23.000-04:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -226,11 +226,8 @@
     <string name="error_title_resolvePoolFailed">Something Went Wrong</string>
     <string name="error_description_resolvePoolFailed">We were unable to resolve your pool. Please try again</string>
 
-    <string name="error_title_resolvePoolDistributionsFailed">Pool Distributions Failed</string>
-    <string name="error_description_resolvePoolDistributionsFailed">
-        The distributions for this pool could not be completed. Please try again
-        %1$s
-    </string>
+    <string name="error_title_resolvePoolDistributionsFailed">Pool Payouts Failed</string>
+    <string name="error_description_resolvePoolDistributionsFailed">The payouts for this pool could not be completed. Please try again</string>
 
 
     <string name="action_swipeToBuyIn">Swipe to Buy In</string>
diff --git a/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/PoolBettingViewModel.kt b/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/PoolBettingViewModel.kt
@@ -460,7 +460,19 @@ internal class PoolBettingViewModel @Inject constructor(
             }.onEach { event ->
                 when (event) {
                     PaymentEvent.OnPaymentCancelled -> Unit
-                    is PaymentEvent.OnPaymentError -> Unit
+                    is PaymentEvent.OnPaymentError -> {
+                        when (val error = event.error) {
+                            is PaymentError.PoolDistributionFailed -> {
+                                BottomBarManager.showError(
+                                    title = resources.getString(R.string.error_title_resolvePoolDistributionsFailed),
+                                    message = resources.getString(R.string.error_description_resolvePoolDistributionsFailed),
+                                    additionalInfo = error.state
+                                )
+                            }
+                            // other errors are handled internally
+                            else -> Unit
+                        }
+                    }
                     is PaymentEvent.OnRpcFailure -> Unit
                     is PaymentEvent.OnPaymentSuccess -> {
                         event.acknowledge(true) {
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPaymentController.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPaymentController.kt
@@ -220,7 +220,7 @@ internal class InternalPaymentController(
                     }
                     is PaymentError.NoOwnerForDistribution -> presentPaymentFailedError()
                     is PaymentError.NoPoolBalance -> presentPaymentFailedError()
-                    is PaymentError.PoolDistributionFailed -> presentPaymentFailedError()
+                    is PaymentError.PoolDistributionFailed -> Unit
                 }
             }
 
@@ -263,6 +263,7 @@ sealed interface PaymentError {
     data class NoPoolBalance(override val message: String? = "No pool balance") : PaymentError, Throwable(message)
 
     data class PoolDistributionFailed(
+        val state: Map<String, Any?> = emptyMap(),
         override val message: String = "Failed to distribute funds",
         override val cause: Throwable,
     ): PaymentError, Throwable(
diff --git a/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolResolveDelegate.kt b/apps/flipcash/shared/payments/src/main/kotlin/com/flipcash/app/payments/internal/InternalPoolResolveDelegate.kt
@@ -110,10 +110,7 @@ class InternalPoolResolveDelegate @Inject constructor(
 
             onError(
                 error.copy(
-                    message = """
-                        ---
-                DEBUG: ${metadata.entries.joinToString()}
-            """.trimIndent()
+                    state = metadata
                 )
             )
         }
diff --git a/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt b/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt
@@ -27,6 +27,7 @@ object BottomBarManager {
     data class BottomBarMessage(
         val title: String = "",
         val subtitle: String = "",
+        val additionalInfo: Map<String, Any?> = emptyMap(),
         val actions: List<BottomBarAction> = emptyList(),
         val showCancel: Boolean,
         val onClose: (selection: SelectedBottomBarAction) -> Unit = { },
@@ -130,13 +131,15 @@ object BottomBarManager {
     fun showError(
         title: String,
         message: String,
+        additionalInfo: Map<String, Any?> = emptyMap(),
         additionalActions: List<BottomBarAction> = emptyList(),
         onDismiss: () -> Unit = { },
     ) {
         showMessage(
             BottomBarMessage(
                 title = title,
                 subtitle = message,
+                additionalInfo = additionalInfo,
                 showCancel = false,
                 actions = additionalActions,
                 type = BottomBarMessageType.ERROR,
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/bars/BottomBarContainer.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/bars/BottomBarContainer.kt
@@ -10,10 +10,12 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -22,22 +24,27 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.material.Icon
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ExpandMore
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -224,6 +231,51 @@ fun BottomBarView(
                     }
                 }
             }
+            if (bottomBarMessage.additionalInfo.isNotEmpty()) {
+                var isExpanded by remember { mutableStateOf(false) }
+
+                CompositionLocalProvider(LocalContentColor provides White) {
+                    Column {
+                        Row(
+                            modifier = Modifier.clickable { isExpanded = !isExpanded },
+                            verticalAlignment = Alignment.CenterVertically,
+                        ) {
+                            val rotation by animateFloatAsState(if (isExpanded) 180f else 0f)
+                            val linkPrefix = if (isExpanded) "Hide" else "View"
+                            Text(
+                                text = "$linkPrefix Additional Information",
+                                style = CodeTheme.typography.caption,
+                                color = LocalContentColor.current.copy(alpha = 0.8f),
+                            )
+                            Icon(
+                                modifier = Modifier.rotate(rotation),
+                                imageVector = Icons.Rounded.ExpandMore,
+                                contentDescription = null,
+                                tint = LocalContentColor.current.copy(alpha = 0.8f),
+                            )
+                        }
+                        AnimatedContent(
+                            targetState = isExpanded,
+                            modifier = Modifier.fillMaxWidth(),
+                            transitionSpec = {
+                                slideInVertically { -it } togetherWith slideOutVertically { -it }
+                            }
+                        ) { expanded ->
+                            if (expanded) {
+                                Text(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    text = """
+                                    ${bottomBarMessage.additionalInfo.onEach { (k, v) -> "$k: $v" }}
+                                """.trimIndent(),
+                                    style = CodeTheme.typography.textSmall,
+                                )
+                            } else {
+                                Spacer(modifier = Modifier.fillMaxWidth())
+                            }
+                        }
+                    }
+                }
+            }
             Column(verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)) {
                 val okText = stringResource(R.string.action_ok)
                 val actions by remember(bottomBarMessage.actions) {

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ internal class InternalPaymentController(`
`220`	`220`	`}`
`221`	`221`	`is PaymentError.NoOwnerForDistribution -> presentPaymentFailedError()`
`222`	`222`	`is PaymentError.NoPoolBalance -> presentPaymentFailedError()`
`223`		`- is PaymentError.PoolDistributionFailed -> presentPaymentFailedError()`
	`223`	`+ is PaymentError.PoolDistributionFailed -> Unit`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`@@ -263,6 +263,7 @@ sealed interface PaymentError {`
`263`	`263`	`data class NoPoolBalance(override val message: String? = "No pool balance") : PaymentError, Throwable(message)`
`264`	`264`
`265`	`265`	`data class PoolDistributionFailed(`
	`266`	`+ val state: Map<String, Any?> = emptyMap(),`
`266`	`267`	`override val message: String = "Failed to distribute funds",`
`267`	`268`	`override val cause: Throwable,`
`268`	`269`	`): PaymentError, Throwable(`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,7 @@ class InternalPoolResolveDelegate @Inject constructor(`
`110`	`110`
`111`	`111`	`onError(`
`112`	`112`	`error.copy(`
`113`		`- message = """`
`114`		`- ---`
`115`		`- DEBUG: ${metadata.entries.joinToString()}`
`116`		`- """.trimIndent()`
	`113`	`+ state = metadata`
`117`	`114`	`)`
`118`	`115`	`)`
`119`	`116`	`}`