Merge pull request #504 from code-payments/fix/slide-confirm-loading-…

…trigger chore(slideconfirm): make loading state visibility tied directly to l…
code-payments · Aug 12, 2024 · f7115fb · f7115fb
2 parents fcb492e + 8b949c0
commit f7115fb
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 48 deletions.
diff --git a/api/src/main/java/com/getcode/network/HistoryController.kt b/api/src/main/java/com/getcode/network/HistoryController.kt
@@ -34,6 +34,7 @@ import com.getcode.network.repository.encodeBase64
 import com.getcode.network.source.ChatMessagePagingSource
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.util.resources.ResourceType
+import com.getcode.utils.ErrorUtils
 import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import kotlinx.coroutines.CoroutineScope

diff --git a/api/src/main/java/com/getcode/network/repository/FeatureRepository.kt b/api/src/main/java/com/getcode/network/repository/FeatureRepository.kt
@@ -1,7 +1,9 @@
 package com.getcode.network.repository
 
 import com.getcode.model.BalanceCurrencyFeature
+import com.getcode.model.BetaFlag
 import com.getcode.model.BuyModuleFeature
+import com.getcode.model.Feature
 import com.getcode.model.PrefsBool
 import com.getcode.model.RequestKinFeature
 import com.getcode.model.TipCardFeature
@@ -15,7 +17,7 @@ import javax.inject.Inject
  * Collates [BetaOptions] with server availability (stored in [PrefRepository]).
  */
 class FeatureRepository @Inject constructor(
-    betaFlags: BetaFlagsRepository,
+    private val betaFlags: BetaFlagsRepository,
     prefRepository: PrefRepository,
 ) {
     val buyModule = combine(
@@ -31,4 +33,6 @@ class FeatureRepository @Inject constructor(
     val requestKin = betaFlags.observe().map { RequestKinFeature(it.giveRequestsEnabled) }
 
     val balanceCurrencySelection = betaFlags.observe().map { BalanceCurrencyFeature(it.balanceCurrencySelectionEnabled) }
+
+    suspend fun isEnabled(feature: PrefsBool): Boolean = betaFlags.isEnabled(feature)
 }
diff --git a/api/src/main/java/com/getcode/network/repository/MessagingRepository.kt b/api/src/main/java/com/getcode/network/repository/MessagingRepository.kt
@@ -171,6 +171,7 @@ class MessagingRepository @Inject constructor(
             .build()
 
         return networkOracle.managedRequest(messagingApi.pollMessages(request))
+            .observeOn(Schedulers.io())
             .map { response ->
                 Timber.d("response=${response.messagesList}")
                 response.messagesList.mapNotNull { m -> StreamMessage.getInstance(m) }

diff --git a/api/src/main/java/com/getcode/network/repository/PaymentRepository.kt b/api/src/main/java/com/getcode/network/repository/PaymentRepository.kt
@@ -18,10 +18,12 @@ import com.getcode.network.exchange.Exchange
 import com.getcode.solana.keys.PublicKey
 import com.getcode.utils.ErrorUtils
 import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.schedulers.Schedulers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.coroutines.resume
@@ -90,7 +92,9 @@ class PaymentRepository @Inject constructor(
     @SuppressLint("CheckResult")
     suspend fun completePayment(amount: KinAmount, rendezvousKey: KeyPair) {
         // 1. ensure we have exchange rates and compute the fees for this transaction
-        exchange.fetchRatesIfNeeded()
+        withContext(Dispatchers.IO) {
+            exchange.fetchRatesIfNeeded()
+        }
 
         var paymentAmount = amount
         return suspendCancellableCoroutine { cont ->
@@ -156,7 +160,7 @@ class PaymentRepository @Inject constructor(
                     Completable.concatArray(
                         balanceController.fetchBalance(),
                         client.fetchLimits(isForce = true)
-                    ).doOnComplete {
+                    ).observeOn(Schedulers.io()).doOnComplete {
                         analytics.transfer(
                             amount = paymentAmount,
                             successful = true,
@@ -209,7 +213,7 @@ class PaymentRepository @Inject constructor(
                     Completable.concatArray(
                         balanceController.fetchBalance(),
                         client.fetchLimits(isForce = true)
-                    ).doOnComplete {
+                    ).observeOn(Schedulers.io()).doOnComplete {
                         analytics.transferForTip(amount = amount, successful = true)
                         cont.resume(Unit)
                     }.subscribe()

diff --git a/app/src/main/java/com/getcode/ui/components/SlideToConfirm.kt b/app/src/main/java/com/getcode/ui/components/SlideToConfirm.kt
@@ -3,6 +3,7 @@
 package com.getcode.ui.components
 
 import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.animateFloatAsState
@@ -178,7 +179,7 @@ fun SlideToConfirm(
 
     val hapticFeedback = LocalHapticFeedback.current
     val swipeState = rememberSwipeableState(
-        initialValue = if (loading) Anchor.End else Anchor.Start,
+        initialValue = Anchor.Start,
     )
 
     val composeScope = rememberCoroutineScope()
@@ -217,7 +218,6 @@ fun SlideToConfirm(
             hint(swipeFraction, PaddingValues(horizontal = Thumb.Size + CodeTheme.dimens.grid.x2), label)
         }
 
-
         if (isSuccess) {
             Image(
                 painter = painterResource(id = R.drawable.ic_check),
@@ -227,9 +227,13 @@ fun SlideToConfirm(
                     .align(Alignment.Center),
             )
         } else {
+            val loadingColor by animateColorAsState(
+                targetValue = if (loading) Color.White else Color.Transparent
+            )
+
             CodeCircularProgressIndicator(
                 strokeWidth = CodeTheme.dimens.thickBorder,
-                color = calculateLoadingColor(swipeFraction),
+                color = loadingColor,
                 modifier = Modifier
                     .size(CodeTheme.dimens.grid.x4)
                     .align(Alignment.Center),
@@ -362,10 +366,6 @@ private fun calculateHintTextColor(swipeFraction: Float): Color {
     return lerp(Color.White, Color.White.copy(alpha = 0f), fraction)
 }
 
-private fun calculateLoadingColor(swipeFraction: Float): Color {
-    if (swipeFraction < 0.1f) return Color.White.copy(0f)
-    return Color.White
-}
 
 @Preview
 @Composable

diff --git a/app/src/main/java/com/getcode/util/DeeplinkHandler.kt b/app/src/main/java/com/getcode/util/DeeplinkHandler.kt
@@ -5,23 +5,17 @@ import android.content.Intent
 import android.net.Uri
 import androidx.core.net.toUri
 import cafe.adriel.voyager.core.screen.Screen
-import com.getcode.model.BetaFlag
 import com.getcode.model.PrefsBool
 import com.getcode.models.DeepLinkRequest
-import com.getcode.models.encode
 import com.getcode.navigation.screens.HomeScreen
 import com.getcode.navigation.screens.LoginScreen
 import com.getcode.network.repository.BetaFlagsRepository
-import com.getcode.network.repository.encodeBase64
 import com.getcode.network.repository.urlDecode
-import com.getcode.ui.utils.getActivity
 import com.getcode.utils.TraceType
 import com.getcode.utils.base64EncodedData
 import com.getcode.utils.trace
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton

diff --git a/app/src/main/java/com/getcode/view/main/balance/BalanceSheetViewModel.kt b/app/src/main/java/com/getcode/view/main/balance/BalanceSheetViewModel.kt
@@ -10,6 +10,7 @@ import com.getcode.model.PrefsBool
 import com.getcode.model.Rate
 import com.getcode.network.BalanceController
 import com.getcode.network.HistoryController
+import com.getcode.network.repository.BetaFlagsRepository
 import com.getcode.network.repository.FeatureRepository
 import com.getcode.network.repository.PrefRepository
 import com.getcode.util.Kin
@@ -18,6 +19,7 @@ import com.getcode.view.BaseViewModel2
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
@@ -124,6 +126,7 @@ class BalanceSheetViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.OnOpened>()
+            .filter { features.isEnabled(PrefsBool.TIPS_CHAT_ENABLED) }
             .onEach { historyController.fetchChats(true) }
             .launchIn(viewModelScope)
     }

diff --git a/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt b/app/src/main/java/com/getcode/view/main/home/HomeViewModel.kt
@@ -883,30 +883,28 @@ class HomeViewModel @Inject constructor(
 
         val isReceived = payload != null
         val presentationStyle = if (isReceived) PresentationStyle.Pop else PresentationStyle.Slide
-        withContext(Dispatchers.Main) {
-            uiFlow.update {
-                var billState = it.billState.copy(
-                    bill = Bill.Payment(amount, code, request),
-                    valuation = PaymentValuation(amount),
-                    primaryAction = null,
-                )
-
-                if (isReceived) {
-                    billState = billState.copy(
-                        paymentConfirmation = PaymentConfirmation(
-                            state = ConfirmationState.AwaitingConfirmation,
-                            payload = code,
-                            requestedAmount = amount,
-                            localAmount = amount.replacing(exchange.localRate)
-                        ),
-                    )
-                }
+        uiFlow.update {
+            var billState = it.billState.copy(
+                bill = Bill.Payment(amount, code, request),
+                valuation = PaymentValuation(amount),
+                primaryAction = null,
+            )
 
-                it.copy(
-                    presentationStyle = presentationStyle,
-                    billState = billState,
+            if (isReceived) {
+                billState = billState.copy(
+                    paymentConfirmation = PaymentConfirmation(
+                        state = ConfirmationState.AwaitingConfirmation,
+                        payload = code,
+                        requestedAmount = amount,
+                        localAmount = amount.replacing(exchange.localRate)
+                    ),
                 )
             }
+
+            it.copy(
+                presentationStyle = presentationStyle,
+                billState = billState,
+            )
         }
 
         analytics.requestShown(amount = amount)
@@ -929,17 +927,14 @@ class HomeViewModel @Inject constructor(
         cashLinkManager.cancelBillTimeout()
 
         val paymentConfirmation = uiFlow.value.billState.paymentConfirmation ?: return@launch
-        withContext(Dispatchers.Main) {
-            uiFlow.update {
-                val billState = it.billState
-                it.copy(
-                    billState = billState.copy(
-                        paymentConfirmation = paymentConfirmation.copy(state = ConfirmationState.Sending)
-                    ),
-                )
-            }
+        uiFlow.update {
+            val billState = it.billState
+            it.copy(
+                billState = billState.copy(
+                    paymentConfirmation = paymentConfirmation.copy(state = ConfirmationState.Sending)
+                ),
+            )
         }
-
         runCatching {
             paymentRepository.completePayment(
                 paymentConfirmation.requestedAmount,