chore: handle timelock unlocked accounts in flipchat

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

Author: bmc08gt

app/src/main/java/com/getcode/SessionController.kt

@@ -80,6 +80,7 @@ import com.getcode.services.utils.catchSafely
 import com.getcode.services.utils.nonce
 import com.getcode.solana.organizer.GiftCardAccount
 import com.getcode.solana.organizer.Organizer
+import com.getcode.ui.components.restrictions.RestrictionType
 import com.getcode.util.permissions.PermissionChecker
 import com.getcode.util.permissions.PermissionResult
 import com.getcode.util.resources.ResourceHelper
@@ -173,12 +174,6 @@ sealed interface SessionEvent {
     data class OnChatPaidForSuccessfully(val intentId: com.getcode.model.ID, val user: SocialUser): SessionEvent
 }
 
-enum class RestrictionType {
-    ACCESS_EXPIRED,
-    FORCE_UPGRADE,
-    TIMELOCK_UNLOCKED
-}
-
 @SuppressLint("CheckResult")
 @Singleton
 class SessionController @Inject constructor(
@@ -1704,8 +1699,8 @@ class SessionController @Inject constructor(
                         cancelRemoteSend(giftCard, amount)
                         cancelSend(style = PresentationStyle.Slide)
                     },
-                    onClose = {
-                        if (it == null) {
+                    onClose = { fromAction ->
+                        if (!fromAction) {
                             cancelSend(style = PresentationStyle.Pop)
                             vibrator.vibrate()
                         }

app/src/main/java/com/getcode/view/main/scanner/ScannerScreen.kt

@@ -46,7 +46,6 @@ import com.getcode.SessionController
 import com.getcode.LocalBiometricsState
 import com.getcode.PresentationStyle
 import com.getcode.R
-import com.getcode.RestrictionType
 import com.getcode.manager.TopBarManager
 import com.getcode.models.Bill
 import com.getcode.models.DeepLinkRequest
@@ -72,7 +71,8 @@ import com.getcode.ui.modals.ReceivedKinConfirmation
 import com.getcode.util.permissions.PermissionResult
 import com.getcode.util.permissions.getPermissionLauncher
 import com.getcode.util.permissions.rememberPermissionHandler
-import com.getcode.view.main.scanner.views.HomeRestricted
+import com.getcode.ui.components.restrictions.ContentRestrictedView
+import com.getcode.ui.components.restrictions.RestrictionType
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -105,7 +105,7 @@ fun ScanScreen(
         RestrictionType.ACCESS_EXPIRED,
         RestrictionType.FORCE_UPGRADE,
         RestrictionType.TIMELOCK_UNLOCKED -> {
-            HomeRestricted(restrictionType) {
+            ContentRestrictedView(restrictionType) {
                 session.logout(it)
             }
         }

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

@@ -7,6 +7,7 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -16,6 +17,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.Lifecycle
 import cafe.adriel.voyager.core.registry.ScreenRegistry
 import cafe.adriel.voyager.navigator.Navigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import cafe.adriel.voyager.transitions.SlideTransition
 import com.getcode.navigation.NavScreenProvider
 import com.getcode.navigation.core.BottomSheetNavigator
@@ -28,6 +30,7 @@ import com.getcode.ui.components.OnLifecycleEvent
 import com.getcode.ui.components.bars.BottomBarContainer
 import com.getcode.ui.components.bars.TopBarContainer
 import com.getcode.ui.components.bars.rememberBarManager
+import com.getcode.ui.components.restrictions.RestrictionType
 import com.getcode.ui.decor.ScrimSupport
 import com.getcode.ui.theme.CodeScaffold
 import com.getcode.ui.utils.getActivity
@@ -38,6 +41,7 @@ import dev.theolm.rinku.compose.ext.DeepLinkListener
 import xyz.flipchat.app.features.home.HomeViewModel
 import xyz.flipchat.app.features.payments.PaymentScaffold
 import xyz.flipchat.app.theme.FlipchatTheme
+import xyz.flipchat.app.ui.LocalUserManager
 import xyz.flipchat.app.ui.navigation.AppScreenContent
 import xyz.flipchat.app.ui.navigation.MainRoot
 import xyz.flipchat.app.util.DeeplinkType
@@ -64,6 +68,9 @@ fun App(
         deepLink = it
     }
 
+    val userManager = LocalUserManager.currentOrThrow
+    val userState by userManager.state.collectAsState()
+
     FlipchatTheme {
         val barManager = rememberBarManager()
         AppScreenContent {
@@ -119,6 +126,12 @@ fun App(
                                         }
                                     }
 
+                                    LaunchedEffect(userState.isTimelockUnlocked) {
+                                        if (userState.isTimelockUnlocked) {
+                                            codeNavigator.replaceAll(ScreenRegistry.get(NavScreenProvider.AppRestricted(RestrictionType.TIMELOCK_UNLOCKED)))
+                                        }
+                                    }
+
                                     OnLifecycleEvent { _, event ->
                                         when (event) {
                                             Lifecycle.Event.ON_RESUME -> {

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/restricted/AppRestrictedScreen.kt

@@ -0,0 +1,27 @@
+package xyz.flipchat.app.features.restricted
+
+import android.os.Parcelable
+import androidx.compose.runtime.Composable
+import cafe.adriel.voyager.core.registry.ScreenRegistry
+import cafe.adriel.voyager.core.screen.Screen
+import com.getcode.navigation.NavScreenProvider
+import com.getcode.navigation.core.LocalCodeNavigator
+import com.getcode.navigation.extensions.getActivityScopedViewModel
+import com.getcode.ui.components.restrictions.ContentRestrictedView
+import com.getcode.ui.components.restrictions.RestrictionType
+import kotlinx.parcelize.Parcelize
+import xyz.flipchat.app.features.home.HomeViewModel
+
+@Parcelize
+class AppRestrictedScreen(private val restrictionType: RestrictionType): Screen, Parcelable {
+    @Composable
+    override fun Content() {
+        val homeViewModel = getActivityScopedViewModel<HomeViewModel>()
+        val navigator = LocalCodeNavigator.current
+        ContentRestrictedView(restrictionType) {
+            homeViewModel.logout(it) {
+                navigator.replaceAll(ScreenRegistry.get(NavScreenProvider.Login.Home()))
+            }
+        }
+    }
+}

flipchatApp/src/main/kotlin/xyz/flipchat/app/ui/navigation/AppScreenContent.kt

@@ -22,10 +22,15 @@ import xyz.flipchat.app.features.login.register.PurchaseAccountScreen
 import xyz.flipchat.app.features.login.register.RegisterInfoScreen
 import xyz.flipchat.app.features.login.register.RegisterModalScreen
 import xyz.flipchat.app.features.login.register.RegisterScreen
+import xyz.flipchat.app.features.restricted.AppRestrictedScreen
 
 @Composable
 fun AppScreenContent(content: @Composable () -> Unit) {
     ScreenRegistry {
+        register<NavScreenProvider.AppRestricted> {
+            AppRestrictedScreen(it.restrictionType)
+        }
+
         register<NavScreenProvider.Login.Home> {
             LoginScreen(it.seed)
         }

flipchatApp/src/main/res/values/strings.xml

@@ -236,4 +236,6 @@
 
     <string name="subtitle_balance">Balance: ⬢ %1$s</string>
     <string name="subtitle_you">You</string>
+
+    <string name="subtitle_updateRequiredDescription">We\'ve made some changes to improve the experience. You\'ll need to update the app to keep using Flipchat.</string>
 </resources>

libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt

@@ -19,7 +19,7 @@ object BottomBarManager {
         val subtitle: String = "",
         val actions: List<BottomBarAction> = emptyList(),
         val showCancel: Boolean = true,
-        val onClose: () -> Unit = {},
+        val onClose: (fromAction: Boolean) -> Unit = {},
         val type: BottomBarMessageType = BottomBarMessageType.DESTRUCTIVE,
         val isDismissible: Boolean = true,
         val showScrim: Boolean = false,
@@ -86,7 +86,7 @@ object BottomBarManager {
             onPositive: () -> Unit,
             onNegative: () -> Unit = {},
             onTertiary: () -> Unit = {},
-            onClose: () -> Unit = {},
+            onClose: (fromAction: Boolean) -> Unit = {},
             type: BottomBarMessageType = BottomBarMessageType.DESTRUCTIVE,
             isDismissible: Boolean = true,
             showScrim: Boolean = false,

services/flipchat/core/src/main/kotlin/xyz/flipchat/services/user/UserManager.kt

@@ -71,6 +71,7 @@ class UserManager @Inject constructor(
         val displayName: String? = null,
         val organizer: Organizer? = null,
         val flags: UserFlags? = null,
+        val isTimelockUnlocked: Boolean = false,
         val openRoom: ID? = null,
     )
 
@@ -132,6 +133,16 @@ class UserManager @Inject constructor(
         }
     }
 
+    fun didDetectUnlockedAccount() {
+        _state.update {
+            if (!it.isTimelockUnlocked) {
+                it.copy(isTimelockUnlocked = true)
+            } else {
+                it
+            }
+        }
+    }
+
     fun isSelf(id: ID?) = userId == id
 
     private fun associate() {

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

@@ -1,5 +1,6 @@
 package com.getcode.network
 
+import com.codeinc.gen.user.v1.user
 import com.getcode.model.Currency
 import com.getcode.model.CurrencyCode
 import com.getcode.model.Rate
@@ -171,6 +172,10 @@ open class BalanceController @Inject constructor(
 
             organizer.setAccountInfo(accountInfo)
             userManager.set(organizer = organizer)
+            if (organizer.isUnuseable) {
+                userManager.didDetectUnlockedAccount()
+            }
+            
             balanceRepository.setBalance(organizer.availableBalance.toKinValueDouble())
             transactionReceiver.receiveFromIncoming(organizer)
             scope.launch {