fix(fc): observe balance directly on tip confirmation

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt

@@ -11,6 +11,8 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.fragment.app.FragmentActivity
 import com.getcode.libs.opengraph.LocalOpenGraphParser
 import com.getcode.libs.opengraph.OpenGraphParser
+import com.getcode.network.BalanceController
+import com.getcode.network.LocalBalanceController
 import com.getcode.network.client.Client
 import com.getcode.network.exchange.ExchangeNull
 import com.getcode.network.exchange.LocalExchange
@@ -73,6 +75,9 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var openGraphParser: OpenGraphParser
 
+    @Inject
+    lateinit var balanceController: BalanceController
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         handleUncaughtException()
@@ -90,6 +95,7 @@ class MainActivity : FragmentActivity() {
                 LocalLabs provides betaFeatures,
                 LocalBillingClient provides iapController,
                 LocalOpenGraphParser provides openGraphParser,
+                LocalBalanceController provides balanceController,
             ) {
                 Rinku {
                     App(tipsEngine = tipsEngine)

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/MessageTipPaymentConfirmation.kt

@@ -4,18 +4,21 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.res.stringResource
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.getcode.model.Currency
 import com.getcode.model.KinAmount
 import com.getcode.model.Rate
 import com.getcode.model.kin
 import com.getcode.models.ConfirmationState
 import com.getcode.models.MessageTipPaymentConfirmation
+import com.getcode.network.LocalBalanceController
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.Modal
 import com.getcode.ui.components.SlideToConfirm
@@ -58,11 +61,14 @@ internal fun MessageTipPaymentConfirmation(
         )
     }
 
+    val balanceController = LocalBalanceController.currentOrThrow
+    val currentBalance by balanceController.formattedBalance.collectAsState()
+
     Modal(modifier) {
         if (state != null) {
             MessageTipConfirmationContent(
                 pickerState = pickerState,
-                balance = confirmation?.balance,
+                balance = currentBalance?.formattedValue,
                 isSending = isSending,
                 state = state,
                 onApproved = {

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PaymentScaffold.kt

@@ -73,7 +73,7 @@ fun PaymentScaffold(content: @Composable () -> Unit) {
 
         AnimatedContent(
             modifier = Modifier.align(BottomCenter),
-            targetState = state.billState.messageTipPaymentConfirmation?.balance,
+            targetState = state.billState.messageTipPaymentConfirmation?.metadata,
             transitionSpec = AnimationUtils.modalAnimationSpec(speed = ModalAnimationSpeed.Fast),
             label = "message tip payments",
         ) {

libs/requests/src/main/kotlin/com/getcode/models/BillState.kt

@@ -233,7 +233,6 @@ data class MessageTipPaymentConfirmation(
     override val state: ConfirmationState,
     val destination: PublicKey,
     val metadata: ExtendedMetadata,
-    val balance: String?,
     override val showScrim: Boolean = true,
     override val cancellable: Boolean = true,
 ): Confirmation(showScrim, state)

services/flipchat/payments/src/main/kotlin/com/getcode/network/BalanceController.kt

@@ -1,6 +1,6 @@
 package com.getcode.network
 
-import com.codeinc.gen.user.v1.user
+import androidx.compose.runtime.staticCompositionLocalOf
 import com.getcode.model.Currency
 import com.getcode.model.CurrencyCode
 import com.getcode.model.Rate
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import timber.log.Timber
+import xyz.flipchat.services.PaymentController
 import xyz.flipchat.services.user.AuthState
 import xyz.flipchat.services.user.UserManager
 import java.util.Locale
@@ -243,3 +244,5 @@ open class BalanceController @Inject constructor(
         }
     }
 }
+
+val LocalBalanceController = staticCompositionLocalOf<BalanceController?> { null }

services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/PaymentController.kt

@@ -3,23 +3,17 @@ package xyz.flipchat.services
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.getcode.domain.BillController
 import com.getcode.manager.TopBarManager
-import com.getcode.model.Currency
 import com.getcode.model.ID
 import com.getcode.model.KinAmount
 import com.getcode.models.BillState
 import com.getcode.models.ConfirmationState
 import com.getcode.models.MessageTipPaymentConfirmation
 import com.getcode.models.PublicPaymentConfirmation
-import com.getcode.network.BalanceController
 import com.getcode.network.repository.PaymentError
 import com.getcode.network.repository.PaymentRepository
 import com.getcode.services.model.ExtendedMetadata
 import com.getcode.solana.keys.PublicKey
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.utils.CurrencyUtils
-import com.getcode.utils.Kin
-import com.getcode.utils.flagResId
-import com.getcode.utils.formatAmountString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -58,16 +52,14 @@ open class PaymentController @Inject constructor(
     private val paymentRepository: PaymentRepository,
     private val resources: ResourceHelper,
     private val billController: BillController,
-    private val balanceController: BalanceController,
-    private val currencyUtils: CurrencyUtils,
 ) {
-    protected val scope = CoroutineScope(Dispatchers.IO)
+    private val scope = CoroutineScope(Dispatchers.IO)
 
     val state = billController.state.map {
         PaymentState(it)
     }.stateIn(scope, started = SharingStarted.Eagerly, initialValue = PaymentState())
 
-    protected val _eventFlow: MutableSharedFlow<PaymentEvent> = MutableSharedFlow()
+    private val _eventFlow: MutableSharedFlow<PaymentEvent> = MutableSharedFlow()
     val eventFlow: SharedFlow<PaymentEvent> = _eventFlow.asSharedFlow()
 
     fun presentPublicPaymentConfirmation(
@@ -156,21 +148,12 @@ open class PaymentController @Inject constructor(
     }
 
     fun presentMessageTipConfirmation(metadata: ExtendedMetadata, destination: PublicKey) {
-        val rawBalance = balanceController.rawBalance
-        val balance = formatAmountString(
-            resources,
-            Currency.Kin,
-            rawBalance,
-            suffix = resources.getKinSuffix()
-        )
-
         billController.update {
             it.copy(
                 messageTipPaymentConfirmation = MessageTipPaymentConfirmation(
                     state = ConfirmationState.AwaitingConfirmation,
                     metadata = metadata,
                     destination = destination,
-                    balance = balance,
                 )
             )
         }