Merge branch 'code/cash' into dependabot/gradle/code/cash/io.michaelrocks-libphonenumber-android-9.0.31

bmc08gt · web-flow · commit a319db9f5efd · 2026-05-29T15:55:20.000-04:00
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/phone/PhoneVerificationViewModel.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/phone/PhoneVerificationViewModel.kt
@@ -17,12 +17,13 @@ import com.flipcash.services.user.UserManager
 import com.flipcash.services.models.PhoneVerificationError
 import com.getcode.manager.BottomBarManager
 import com.getcode.util.resources.ResourceHelper
+import com.getcode.utils.TraceType
+import com.getcode.utils.trace
 import com.getcode.view.BaseViewModel
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.launchIn
@@ -95,6 +96,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
         data object OnVerifyCodeClicked : Event
         data object OnCodeVerified : Event
         data object LinkForPayment : Event
+        data object OnPhoneVerificationComplete : Event
 
         data object OnMaxAttemptsReached : Event
     }
@@ -166,11 +168,15 @@ internal class PhoneVerificationViewModel @Inject constructor(
                 val cleanedNumber = phoneUtils.cleanNumber(number, locale)
                 ContactMethod.Phone(cleanedNumber)
             }
-            .onEach { dispatchEvent(Event.OnVerifyingCodeChanged(loading = true)) }
+            .onEach {
+                trace(message = "Verifying code", type = TraceType.Process)
+                dispatchEvent(Event.OnVerifyingCodeChanged(loading = true))
+            }
             .map { method ->
                 verificationController.checkVerificationCode(method, stateFlow.value.codeTextFieldState.text.toString())
             }.onResult(
                 onSuccess = {
+                    trace(message = "Code verified successfully", type = TraceType.Process)
                     stopTimer()
                     dispatchEvent(Event.OnVerifyingCodeChanged(success = true))
                     viewModelScope.launch {
@@ -184,6 +190,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
                     }
                 },
                 onError = {
+                    trace(message = "Code verification failed: $it", type = TraceType.Error)
                     dispatchEvent(Event.OnVerifyingCodeChanged())
                     val (title, message) = when (it) {
                         is PhoneVerificationError -> when (it) {
@@ -206,18 +213,24 @@ internal class PhoneVerificationViewModel @Inject constructor(
 
         eventFlow
             .filterIsInstance<Event.LinkForPayment>()
-            .filter {
-                featureFlags.observe(FeatureFlag.PhoneNumberSend).value ||
-                    userManager.state.value.flags?.enablePhoneNumberSend == true
-            }
             .map {
                 val number = stateFlow.value.numberTextFieldState.text.toString()
                 val locale = stateFlow.value.selectedLocale
                 val cleanedNumber = phoneUtils.cleanNumber(number, locale)
+                trace(message = "Calling linkForPayment", type = TraceType.Process)
                 ContactMethod.Phone(cleanedNumber)
             }
-            .map { verificationController.linkForPayment(it) }
-            .launchIn(viewModelScope)
+            .map { method -> verificationController.linkForPayment(method) }
+            .onResult(
+                onSuccess = {
+                    trace(message = "linkForPayment succeeded", type = TraceType.Process)
+                    dispatchEvent(Event.OnPhoneVerificationComplete)
+                },
+                onError = {
+                    trace(message = "linkForPayment failed: $it", type = TraceType.Error)
+                    dispatchEvent(Event.OnPhoneVerificationComplete)
+                }
+            ).launchIn(viewModelScope)
     }
 
     private suspend fun handleSendVerificationCode(method: ContactMethod) {
@@ -268,6 +281,17 @@ internal class PhoneVerificationViewModel @Inject constructor(
             }
     }
 
+    suspend fun awaitLinkForPayment() {
+        val isEnabled = featureFlags.observe(FeatureFlag.PhoneNumberSend).value ||
+            userManager.state.value.flags?.enablePhoneNumberSend == true
+        if (!isEnabled) return
+
+        val number = stateFlow.value.numberTextFieldState.text.toString()
+        val locale = stateFlow.value.selectedLocale
+        val cleanedNumber = phoneUtils.cleanNumber(number, locale)
+        verificationController.linkForPayment(ContactMethod.Phone(cleanedNumber))
+    }
+
     private fun startTimer() {
         dispatchEvent(
             Event.OnTimerTick(
@@ -319,6 +343,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
                 Event.OnVerifyCodeClicked -> { state -> state }
                 Event.OnCodeVerified -> { state -> state }
                 Event.LinkForPayment -> { state -> state }
+                Event.OnPhoneVerificationComplete -> { state -> state }
                 is Event.OnPhoneNumberFormatted -> { state -> state.copy(formattedPhone = event.formatted) }
                 Event.OnSendCodeClicked -> { state -> state.copy(attempts = state.attempts + 1) }
                 Event.OnMaxAttemptsReached -> { state -> state }
diff --git a/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCodeScreen.kt b/apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/phone/PhoneCodeScreen.kt
@@ -56,13 +56,23 @@ fun PhoneCodeContent(
             .launchIn(this)
     }
 
-    LaunchedEffect(viewModel, includeEmail, linkForPayment) {
+    LaunchedEffect(viewModel, linkForPayment) {
         viewModel.eventFlow
             .filterIsInstance<PhoneVerificationViewModel.Event.OnCodeVerified>()
             .onEach {
                 if (linkForPayment) {
                     viewModel.dispatchEvent(PhoneVerificationViewModel.Event.LinkForPayment)
+                } else {
+                    viewModel.dispatchEvent(PhoneVerificationViewModel.Event.OnPhoneVerificationComplete)
                 }
+            }
+            .launchIn(this)
+    }
+
+    LaunchedEffect(viewModel, includeEmail) {
+        viewModel.eventFlow
+            .filterIsInstance<PhoneVerificationViewModel.Event.OnPhoneVerificationComplete>()
+            .onEach {
                 if (includeEmail) {
                     flowNavigator.navigateTo(VerificationStep.EmailEntry)
                 } else {
diff --git a/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/MyAccountScreen.kt b/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/MyAccountScreen.kt
@@ -77,12 +77,13 @@ fun MyAccountScreen() {
 
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
-            .filterIsInstance<MyAccountScreenViewModel.Event.OnVerifyPhoneClicked>()
+            .filterIsInstance<MyAccountScreenViewModel.Event.ConnectPhoneClicked>()
             .onEach {
                 val flow = AppRoute.Verification(
                     origin = AppRoute.Menu.MyAccount,
                     includePhone = true,
                     includeEmail = false,
+                    linkForPayment = it.linkForPayment
                 )
 
                 navigator.push(flow) }
diff --git a/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt b/apps/flipcash/features/myaccount/src/main/kotlin/com/flipcash/app/myaccount/internal/MyAccountScreenViewModel.kt
@@ -4,6 +4,7 @@ import android.content.ClipboardManager
 import androidx.lifecycle.viewModelScope
 import com.flipcash.app.auth.AuthManager
 import com.flipcash.app.core.extensions.setText
+import com.flipcash.app.featureflags.FeatureFlag
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.menu.MenuItem
 import com.flipcash.features.myaccount.R
@@ -54,14 +55,16 @@ internal class MyAccountScreenViewModel @Inject constructor(
         val accountId: String? = null,
         val publicKey: String? = null,
         val pushToken: String? = null,
+        val linkForPayment: Boolean = false,
         val items: List<MenuItem<Event>> = FullMenuList
     )
 
     internal sealed interface Event {
         data class OnUserAssociated(
             val userId: String?,
             val publicKey: String?,
-            val pushToken: String? = null
+            val pushToken: String? = null,
+            val linkForPayment: Boolean = false,
         ) : Event
 
         data class OnBetaFeaturesUnlocked(val unlocked: Boolean) : Event
@@ -71,6 +74,7 @@ internal class MyAccountScreenViewModel @Inject constructor(
         data object OnViewAccessKey : Event
         data object OnVerifyEmailClicked : Event
         data object OnVerifyPhoneClicked : Event
+        data class ConnectPhoneClicked(val linkForPayment: Boolean) : Event
         data object OnDeleteAccountClicked : Event
         data object OnAccountDeleted : Event
         data object CopyPublicKey : Event
@@ -81,19 +85,26 @@ internal class MyAccountScreenViewModel @Inject constructor(
     }
 
     init {
-        userManager.state
-            .onEach {
-                val userId = it.accountId?.base64
-                val publicKey = it.cluster?.authorityPublicKey?.base58()
+        combine(
+            userManager.state,
+            featureFlagController.observe(FeatureFlag.PhoneNumberSend),
+        ) { state, sendEnabled ->
+            val userId = state.accountId?.base64
+            val publicKey = state.cluster?.authorityPublicKey?.base58()
 
-                dispatchEvent(
-                    Event.OnUserAssociated(
-                        userId = userId,
-                        publicKey = publicKey,
-                        pushToken = it.pushToken
-                    )
+            val linkForPayment = sendEnabled ||
+                    state.flags?.enablePhoneNumberSend == true
+
+            dispatchEvent(
+                Event.OnUserAssociated(
+                    userId = userId,
+                    publicKey = publicKey,
+                    pushToken = state.pushToken,
+                    linkForPayment = linkForPayment,
                 )
-            }.launchIn(viewModelScope)
+            )
+
+        }.launchIn(viewModelScope)
 
         combine(
             featureFlagController.observeOverride(),
@@ -183,6 +194,12 @@ internal class MyAccountScreenViewModel @Inject constructor(
                 )
             }.launchIn(viewModelScope)
 
+        eventFlow
+            .filterIsInstance<Event.OnVerifyPhoneClicked>()
+            .onEach {
+                dispatchEvent(Event.ConnectPhoneClicked(stateFlow.value.linkForPayment))
+            }.launchIn(viewModelScope)
+
         eventFlow
             .filterIsInstance<Event.OnLogOutClicked>()
             .onEach {
@@ -228,13 +245,15 @@ internal class MyAccountScreenViewModel @Inject constructor(
                     state.copy(
                         accountId = event.userId,
                         publicKey = event.publicKey,
-                        pushToken = event.pushToken
+                        pushToken = event.pushToken,
+                        linkForPayment = event.linkForPayment,
                     )
                 }
 
                 Event.OnLogOutClicked,
                 Event.OnLoggedOutCompletely,
                 Event.OnVerifyPhoneClicked,
+                is Event.ConnectPhoneClicked,
                 Event.OnVerifyEmailClicked,
                 Event.OnViewAccessKey,
                 Event.CopyPublicKey,
diff --git a/apps/flipcash/shared/currency-selection/ui/src/main/kotlin/com/flipcash/app/currency/internal/RegionSelectionModalContent.kt b/apps/flipcash/shared/currency-selection/ui/src/main/kotlin/com/flipcash/app/currency/internal/RegionSelectionModalContent.kt
@@ -54,7 +54,9 @@ internal fun RegionSelectionModalContent(viewModel: CurrencyViewModel) {
                 .launchIn(this)
         }
         SearchInput(
-            modifier = Modifier.padding(top = CodeTheme.dimens.grid.x3),
+            modifier = Modifier
+                .padding(horizontal = CodeTheme.dimens.grid.x3)
+                .padding(top = CodeTheme.dimens.grid.x3),
             state = state.searchState,
             contentPadding = PaddingValues(start = CodeTheme.dimens.grid.x1),
             placeholder = stringResource(R.string.subtitle_searchRegions)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ androidx-webkit = "1.15.0"
 
 sqlcipher = "4.5.4"
 
-compose-bom = "2026.04.01"
+compose-bom = "2026.05.01"
 compose-activities = "1.13.0"
 compose-view-models = "2.10.0"
 compose-paging = "3.5.0"
@@ -63,7 +63,7 @@ protobuf-plugin = "0.10.0"
 protovalidate-kt = "0.1.1"
 
 lib-phone-number-port = "9.0.31"
-lib-phone-number-google = "9.0.29"
+lib-phone-number-google = "9.0.31"
 zxing = "3.5.4"
 
 androidx-test-runner = "1.7.0"
@@ -102,7 +102,7 @@ screenshot = "0.0.1-alpha15"
 secrets-gradle-plugin = "2.0.1"
 firebase-perf-plugin = "2.0.2"
 uiToolingPreview = "1.11.2"
-uiTooling = "1.11.1"
+uiTooling = "1.11.2"
 
 [libraries]
 # Desugaring
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/CircularIconButton.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/CircularIconButton.kt
@@ -0,0 +1,40 @@
+package com.getcode.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.getcode.ui.components.AppBarDefaults.IconSize
+import com.getcode.ui.core.rememberedClickable
+
+private val ButtonSize = 40.dp
+private val ButtonBackground = Color.White.copy(alpha = 0.1f)
+
+
+@Composable
+fun CircularIconButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    testTag: String? = null,
+    content: @Composable (Dp) -> Unit,
+) {
+    Box(
+        modifier = modifier
+            .size(ButtonSize)
+            .background(ButtonBackground, CircleShape)
+            .clip(CircleShape)
+            .rememberedClickable { onClick() }
+            .then(if (testTag != null) Modifier.testTag(testTag) else Modifier),
+        contentAlignment = Alignment.Center,
+    ) {
+        content(IconSize)
+    }
+}
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/SearchInput.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/SearchInput.kt
@@ -5,8 +5,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.text.input.clearText
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.outlined.Close
@@ -24,8 +24,7 @@ fun SearchInput(
     placeholder: String = stringResource(R.string.action_search),
 ) {
     TextInput(
-        modifier = modifier
-            .padding(horizontal = CodeTheme.dimens.grid.x3),
+        modifier = modifier,
         state = state,
         contentPadding = contentPadding,
         leadingIcon = {
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/TitleBar.kt
diff --git a/ui/navigation/src/main/kotlin/com/getcode/navigation/flow/FlowHost.kt b/ui/navigation/src/main/kotlin/com/getcode/navigation/flow/FlowHost.kt
