fix(flipcash/iap): make GPBC a singleton; await for connection

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountScreenContent.kt

@@ -37,6 +37,7 @@ import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
+import com.getcode.ui.theme.CodeCircularProgressIndicator
 import com.getcode.ui.theme.CodeScaffold
 import com.getcode.util.getActivity
 import com.getcode.util.permissions.LocalPermissionChecker
@@ -86,6 +87,7 @@ internal fun PurchaseAccountScreenContent(viewModel: PurchaseAccountViewModel) {
                     modifier = Modifier
                         .fillMaxWidth(),
                     buttonState = ButtonState.Filled,
+                    enabled = state.hasProduct,
                     isLoading = state.creatingAccount.loading,
                     isSuccess = state.creatingAccount.success,
                     text = stringResource(R.string.action_purchaseAccount),
@@ -142,20 +144,24 @@ internal fun PurchaseAccountScreenContent(viewModel: PurchaseAccountViewModel) {
                     contentDescription = null,
                 )
 
-                Text(
-                    modifier = Modifier.padding(top = CodeTheme.dimens.grid.x10),
-                    text = state.title,
-                    style = CodeTheme.typography.textLarge,
-                    textAlign = TextAlign.Center,
-                    color = CodeTheme.colors.textMain
-                )
+                if (state.hasProduct) {
+                    Text(
+                        modifier = Modifier.padding(top = CodeTheme.dimens.grid.x10),
+                        text = state.title,
+                        style = CodeTheme.typography.textLarge,
+                        textAlign = TextAlign.Center,
+                        color = CodeTheme.colors.textMain
+                    )
 
-                Text(
-                    text = state.subtitle,
-                    style = CodeTheme.typography.textMedium,
-                    textAlign = TextAlign.Center,
-                    color = CodeTheme.colors.textSecondary
-                )
+                    Text(
+                        text = state.subtitle,
+                        style = CodeTheme.typography.textMedium,
+                        textAlign = TextAlign.Center,
+                        color = CodeTheme.colors.textSecondary
+                    )
+                } else {
+                    CodeCircularProgressIndicator()
+                }
             }
         }
     }

apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt

@@ -43,6 +43,9 @@ internal class PurchaseAccountViewModel @Inject constructor(
         private val costOfAccount: String = "",
         val creatingAccount: LoadingSuccessState = LoadingSuccessState(),
     ) {
+        val hasProduct: Boolean
+            get() = productToBuy != null
+
         private val receivedWelcomeBonus
             get() = productToBuy != IapProduct.CreateAccountWithWelcomeBonus
 
@@ -89,7 +92,6 @@ internal class PurchaseAccountViewModel @Inject constructor(
     init {
         billingClient.state
             .filter { it == BillingClientState.Connected }
-            .distinctUntilChanged()
             .onEach {
                 val receivedWelcomeBonus =
                     billingClient.hasPaidFor(IapProduct.CreateAccountWithWelcomeBonus)

services/flipcash/src/main/kotlin/com/flipcash/services/inject/FlipcashModule.kt

@@ -102,6 +102,7 @@ internal object FlipcashModule {
     ): PushRepository = InternalPushRepository(service)
 
     @Provides
+    @Singleton
     internal fun providesBillingClient(
         @ApplicationContext context: Context,
         repository: PurchaseRepository,

services/flipcash/src/main/kotlin/com/flipcash/services/internal/billing/GooglePlayBillingClient.kt

@@ -29,7 +29,6 @@ import com.flipcash.services.internal.model.billing.IapMetadata
 import com.flipcash.services.internal.model.billing.Receipt
 import com.flipcash.services.repository.PurchaseRepository
 import com.flipcash.services.user.UserManager
-import com.getcode.opencode.model.core.uuid
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import com.google.common.collect.ImmutableList
@@ -67,12 +66,8 @@ internal class GooglePlayBillingClient(
     override val eventFlow: SharedFlow<IapPaymentEvent> = _eventFlow.asSharedFlow()
 
     private val _stateFlow = MutableStateFlow(BillingClientState.Disconnected)
-    override val state: StateFlow<BillingClientState> = _stateFlow.asStateFlow()
-
-    data class State(
-        val connected: Boolean = false,
-        val failedToConnect: Boolean = false,
-    )
+    override val state: StateFlow<BillingClientState>
+        get() = _stateFlow.asStateFlow()
 
     private val client = GooglePlayBillingClient.newBuilder(context)
         .setListener(this)
@@ -179,7 +174,7 @@ internal class GooglePlayBillingClient(
 
                 val details = productDetails[item.products.first()]
                 val price = details?.oneTimePurchaseOfferDetails?.priceAmountMicros
-                    ?.let { priceMicros -> priceMicros / 1_000_000.0 }?.toFloat() ?: 0.0f
+                    ?.let { priceMicros -> priceMicros / 1_000_000.0 } ?: 0.0
                 val currency = details?.oneTimePurchaseOfferDetails?.priceCurrencyCode ?: "USD"
 
                 purchaseRepository.onPurchaseCompleted(