Merge branch 'code/cash' into dependabot/gradle/code/cash/androidx.compose.ui-ui-tooling-android-1.10.5

Author: bmc08gt

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

@@ -94,7 +94,7 @@ internal fun AppScreenContent(content: @Composable () -> Unit) {
         }
 
         register<AppRoute.Token.TxProcessing> {
-            TokenTxProcessingScreen(it.swapId)
+            TokenTxProcessingScreen(it.swapId, it.awaitExternalWallet)
         }
 
         register<AppRoute.Token.SellReceipt> {

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt

@@ -68,7 +68,7 @@ sealed interface AppRoute : ScreenProvider, Parcelable {
         data class Info(val mint: Mint, val forNeededFunds: Boolean = false, val fromDeeplink: Boolean = false): Token
         data class Transactions(val mint: Mint): Token
         data class SwapTransact(val purpose: TokenSwapPurpose, val forNeededFunds: Boolean = false): Token
-        data class TxProcessing(val swapId: SwapId): Token
+        data class TxProcessing(val swapId: SwapId, val awaitExternalWallet: Boolean = false): Token
         data object SellReceipt: Token
     }
 

apps/flipcash/core/src/main/res/drawable/ic_social_discord.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <group>
+    <clip-path
+        android:pathData="M0,0h17.244v17.632h-17.244z"/>
+    <path
+        android:pathData="M14.648,3.818C13.535,3.297 12.357,2.927 11.146,2.718C10.995,2.99 10.819,3.357 10.697,3.649C9.391,3.453 8.097,3.453 6.815,3.649C6.694,3.357 6.514,2.99 6.361,2.718C5.149,2.927 3.97,3.298 2.856,3.821C0.64,7.17 0.039,10.437 0.339,13.657C1.809,14.755 3.234,15.422 4.635,15.858C4.983,15.379 5.291,14.873 5.555,14.343C5.052,14.151 4.567,13.915 4.106,13.638C4.227,13.548 4.346,13.454 4.461,13.357C7.255,14.663 10.29,14.663 13.05,13.357C13.166,13.453 13.284,13.547 13.405,13.638C12.943,13.916 12.458,14.153 11.954,14.344C12.219,14.876 12.526,15.383 12.874,15.859C14.276,15.423 15.702,14.756 17.172,13.657C17.524,9.924 16.57,6.688 14.648,3.818ZM5.935,11.677C5.097,11.677 4.409,10.894 4.409,9.94C4.409,8.987 5.082,8.203 5.935,8.203C6.789,8.203 7.476,8.986 7.462,9.94C7.463,10.894 6.789,11.677 5.935,11.677ZM11.576,11.677C10.737,11.677 10.05,10.894 10.05,9.94C10.05,8.987 10.722,8.203 11.576,8.203C12.429,8.203 13.117,8.986 13.102,9.94C13.102,10.894 12.429,11.677 11.576,11.677Z"
+        android:strokeAlpha="0.4"
+        android:fillColor="#ffffff"
+        android:fillAlpha="0.4"/>
+  </group>
+</vector>

apps/flipcash/core/src/main/res/values/strings.xml

@@ -417,6 +417,8 @@
 
     <string name="label_social_website">Website</string>
     <string name="label_social_x">\@%1$s</string>
+    <string name="label_social_tg">Telegram</string>
+    <string name="label_social_discord">Discord</string>
 
     <string name="action_retry">Retry</string>
     <string name="error_unableToLoadChartData">Unable To Load</string>

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt

@@ -4,8 +4,15 @@ import android.os.Parcelable
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
+import com.flipcash.app.onramp.LocalExternalWalletState
+import com.flipcash.app.onramp.internal.ExternalWalletState
 import com.flipcash.app.tokens.internal.TokenTxProcessingScreen
 import com.flipcash.app.tokens.ui.BuySellSwapTokenViewModel
 import com.flipcash.app.tokens.ui.BuySellSwapTokenViewModel.Event
@@ -14,14 +21,19 @@ import com.getcode.navigation.extensions.getStackScopedViewModel
 import com.getcode.navigation.screens.ModalScreen
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.ui.utils.DisableSheetGestures
+import com.getcode.view.LoadingSuccessState
 import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-class TokenTxProcessingScreen(val swapId: SwapId) : ModalScreen, Parcelable {
+class TokenTxProcessingScreen(
+    val swapId: SwapId,
+    val awaitExternalWallet: Boolean = false,
+) : ModalScreen, Parcelable {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -33,10 +45,40 @@ class TokenTxProcessingScreen(val swapId: SwapId) : ModalScreen, Parcelable {
     override fun ModalContent() {
         val navigator = LocalCodeNavigator.current
         val viewModel = getStackScopedViewModel<BuySellSwapTokenViewModel>(BuySellFlow.key)
-        TokenTxProcessingScreen(viewModel)
 
-        LaunchedEffect(viewModel, swapId) {
-            viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
+        // When awaiting external wallet, show a local loading indicator that doesn't
+        // affect the ViewModel's processingProgress timer. Once OnSwapIdChanged is
+        // dispatched the ViewModel takes over with its own loading state and fresh timer.
+        var awaitingWallet by remember { mutableStateOf(awaitExternalWallet) }
+
+        TokenTxProcessingScreen(
+            viewModel = viewModel,
+            processingProgressOverride = if (awaitingWallet) LoadingSuccessState(loading = true) else null,
+        )
+
+        if (awaitExternalWallet) {
+            val externalWalletState = LocalExternalWalletState.current
+            LaunchedEffect(viewModel, swapId) {
+                // Wait for the transaction to be submitted before starting swap polling
+                snapshotFlow { externalWalletState.deeplinkState }
+                    .first { it == ExternalWalletState.TRANSACTED }
+
+                externalWalletState.reset()
+                viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
+
+                // Wait for the ViewModel's own loading state before dropping override.
+                // Both are LoadingSuccessState(loading=true) — data class equality means
+                // the indicator's remember(processingState) won't reset, so the timer
+                // and progress continue seamlessly with no jump.
+                snapshotFlow { viewModel.stateFlow.value.processingProgress }
+                    .first { it.loading }
+
+                awaitingWallet = false
+            }
+        } else {
+            LaunchedEffect(viewModel, swapId) {
+                viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
+            }
         }
 
         LaunchedEffect(viewModel) {
@@ -62,4 +104,4 @@ class TokenTxProcessingScreen(val swapId: SwapId) : ModalScreen, Parcelable {
         BackHandler { /* intercept */ }
         DisableSheetGestures()
     }
-}
+}

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenTxProcessingScreen.kt

@@ -45,10 +45,16 @@ import com.getcode.view.LoadingSuccessState
 
 @Composable
 internal fun TokenTxProcessingScreen(
-    viewModel: BuySellSwapTokenViewModel
+    viewModel: BuySellSwapTokenViewModel,
+    processingProgressOverride: LoadingSuccessState? = null,
 ) {
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
-    TokenTxProcessingScreen(state = state, dispatch = viewModel::dispatchEvent)
+    val effectiveState = if (processingProgressOverride != null) {
+        state.copy(processingProgress = processingProgressOverride)
+    } else {
+        state
+    }
+    TokenTxProcessingScreen(state = effectiveState, dispatch = viewModel::dispatchEvent)
 }
 
 @Composable

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/components/info/SocialChip.kt

@@ -47,6 +47,8 @@ internal fun SocialChip(
                 when (socialLink) {
                     is SocialLink.Website -> R.drawable.ic_social_web
                     is SocialLink.X -> R.drawable.ic_social_x
+                    is SocialLink.Discord -> R.drawable.ic_social_discord
+                    is SocialLink.Telegram -> R.drawable.ic_social_tg
                 }
             ),
             contentDescription = null,
@@ -57,6 +59,8 @@ internal fun SocialChip(
             text = when (socialLink) {
                 is SocialLink.Website -> stringResource(R.string.label_social_website)
                 is SocialLink.X -> stringResource(R.string.label_social_x, socialLink.username)
+                is SocialLink.Discord -> stringResource(R.string.label_social_discord)
+                is SocialLink.Telegram -> stringResource(R.string.label_social_tg)
             },
             color = CodeTheme.colors.textMain,
             style = CodeTheme.typography.textMedium

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/components/marketcap/MarketCapChart.kt

@@ -82,17 +82,23 @@ internal fun MarketCapChart(
         mutableStateOf<List<MarketCapPoint>>(emptyList())
     }
 
-    LaunchedEffect(data) {
+    // Track the period that corresponds to the current historicalData so we
+    // don't collapse stale data with a new period (which produces an
+    // intermediate curve that causes Vico to animate from the bottom).
+    var dataPeriod by remember { mutableStateOf(selectedPeriod) }
+
+    LaunchedEffect(data, selectedPeriod) {
         if (data.isNotEmpty()) {
             historicalData = data
+            dataPeriod = selectedPeriod
         }
     }
 
     val modelProducer = remember { CartesianChartModelProducer() }
 
-    val windowedData by remember(historicalData, selectedPeriod) {
+    val windowedData by remember(historicalData, dataPeriod) {
         derivedStateOf {
-            historicalData.collapse(selectedPeriod, currentValue = currentValue)
+            historicalData.collapse(dataPeriod, currentValue = currentValue)
         }
     }
 

apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt

@@ -5,7 +5,11 @@ import android.annotation.SuppressLint
 import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.lifecycle.Lifecycle
@@ -75,6 +79,9 @@ fun ExternalWalletOnRampHandler(
             }
         } ?: run { navigator.popAll() }
     }
+    var preNavigatedToEntry by remember { mutableStateOf(false) }
+    var preNavigatedToProcessing by remember { mutableStateOf(false) }
+
     val uriHandler = LocalUriHandler.current
     val context = LocalContext.current
 
@@ -167,6 +174,19 @@ fun ExternalWalletOnRampHandler(
                     type = TraceType.Process
                 )
                 if (uri?.canNativelyHandle(context) == true) {
+                    val origin = state.origin
+                    if (origin is AppRoute.Token.Info) {
+                        preNavigatedToEntry = true
+                        navigator.push(
+                            ScreenRegistry.get(
+                                AppRoute.Token.SwapTransact(
+                                    TokenSwapPurpose.FundWithWallet(origin.mint),
+                                    forNeededFunds = origin.forNeededFunds
+                                )
+                            )
+                        )
+                    }
+
                     analytics.connectWallet(state.provider!!)
                     uriHandler.openUri(uri.toString())
                     state.deeplinkState = ExternalWalletState.CONNECTING
@@ -196,19 +216,24 @@ fun ExternalWalletOnRampHandler(
                         message = "wallet connected",
                         type = TraceType.Process
                     )
-                    when (val origin = state.origin) {
-                        is AppRoute.Token.Info -> {
-                            navigator.push(
-                                ScreenRegistry.get(
-                                    AppRoute.Token.SwapTransact(
-                                        TokenSwapPurpose.FundWithWallet(origin.mint),
-                                        forNeededFunds = origin.forNeededFunds
+                    if (preNavigatedToEntry) {
+                        // Already pushed SwapTransact at STARTED
+                        preNavigatedToEntry = false
+                    } else {
+                        when (val origin = state.origin) {
+                            is AppRoute.Token.Info -> {
+                                navigator.push(
+                                    ScreenRegistry.get(
+                                        AppRoute.Token.SwapTransact(
+                                            TokenSwapPurpose.FundWithWallet(origin.mint),
+                                            forNeededFunds = origin.forNeededFunds
+                                        )
                                     )
                                 )
-                            )
-                        }
-                        else -> {
-                            navigator.push(ScreenRegistry.get(AppRoute.OnRamp.AmountEntry))
+                            }
+                            else -> {
+                                navigator.push(ScreenRegistry.get(AppRoute.OnRamp.AmountEntry))
+                            }
                         }
                     }
                 }
@@ -226,6 +251,17 @@ fun ExternalWalletOnRampHandler(
                     message = "wallet transact uri: $uri",
                     type = TraceType.Process
                 )
+
+                val swapId = state.swapId
+                if (state.origin is AppRoute.Token.Info && swapId != null) {
+                    preNavigatedToProcessing = true
+                    navigator.push(
+                        ScreenRegistry.get(
+                            AppRoute.Token.TxProcessing(swapId, awaitExternalWallet = true)
+                        )
+                    )
+                }
+
                 analytics.amountSelectedForWalletTransfer(state.provider!!, state.amount!!.underlyingTokenAmount)
                 uriHandler.openUri(uri.toString())
             }
@@ -255,6 +291,12 @@ fun ExternalWalletOnRampHandler(
                 )
                 analytics.transactionSubmittedToWallet(state.provider!!)
 
+                if (preNavigatedToProcessing) {
+                    // TxProcessingScreen observes TRANSACTED, calls reset() and dispatches OnSwapIdChanged
+                    preNavigatedToProcessing = false
+                    return@LaunchedEffect
+                }
+
                 val swapId = state.swapId
                 state.reset()
 

apps/flipcash/shared/persistence/db/src/main/kotlin/com/flipcash/app/persistence/converters/TokenTypeConverters.kt

@@ -51,6 +51,14 @@ sealed interface SocialLinkSerialized {
     @Serializable
     @SerialName("x")
     data class X(val username: String) : SocialLinkSerialized
+
+    @Serializable
+    @SerialName("tg")
+    data class Telegram(val username: String) : SocialLinkSerialized
+
+    @Serializable
+    @SerialName("discord")
+    data class Discord(val inviteCode: String) : SocialLinkSerialized
 }
 
 @Serializable