chore(flipcash/scanner): remove visibility tracking from airdrop requests; drive via state

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

Author: bmc08gt

apps/flipcash/features/scanner/src/main/kotlin/com/flipcash/app/scanner/internal/Scanner.kt

@@ -46,7 +46,7 @@ internal fun Scanner(deepLink: DeeplinkType?) {
     var isPaused by remember { mutableStateOf(false) }
 
     var previewing by remember {
-        mutableStateOf(false)
+        mutableStateOf<Boolean?>(null)
     }
 
     var deepLinkSaved by remember {
@@ -60,33 +60,19 @@ internal fun Scanner(deepLink: DeeplinkType?) {
     val focusManager = LocalFocusManager.current
     val biometricsState = LocalBiometricsState.current
 
-    var visibilityInfo by remember { mutableStateOf<VisibilityInfo?>(null) }
-
-    LaunchedEffect(
-        biometricsState,
-        visibilityInfo,
-    ) {
-        if (!biometricsState.passed) return@LaunchedEffect
-        val viz = visibilityInfo ?: return@LaunchedEffect
-        if (viz.isVisible) {
-            session.onCameraVisible()
-        }
-    }
-
-    LaunchedEffect(previewing) {
-        session.onCameraScanning(previewing)
-    }
-
     LaunchedEffect(
         biometricsState,
         previewing,
         deepLinkSaved
     ) {
-        if (previewing) {
+        if (previewing == true) {
             focusManager.clearFocus()
         }
 
         if (!biometricsState.passed) return@LaunchedEffect
+        if (previewing != null) {
+            session.onCameraScanning(previewing == true)
+        }
         val deeplink = deepLinkSaved ?: return@LaunchedEffect
 
         when (deeplink) {
@@ -101,20 +87,16 @@ internal fun Scanner(deepLink: DeeplinkType?) {
     }
 
     BillContainer(
-        modifier = Modifier.fillMaxSize().trackVisibility(
-            thresholdPercentage = 1f,
-            onVisibilityChanged = { visibilityInfo = it }
-        ),
         isPaused = isPaused,
-        isCameraReady = previewing,
+        isCameraReady = previewing == true,
         isCameraStarted = cameraStarted,
         onStartCamera = { cameraStarted = true },
         onAction = {
             navigator.show(ScreenRegistry.get(it.screen))
         },
         scannerView = {
             CodeScanner(
-                scanningEnabled = previewing,
+                scanningEnabled = previewing == true,
                 cameraGesturesEnabled = true,
                 invertedDragZoomEnabled = true,
                 onPreviewStateChanged = { previewing = it },

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/SessionController.kt

@@ -23,7 +23,6 @@ interface SessionController {
     val billState: StateFlow<BillState>
     fun onAppInForeground()
     fun onAppInBackground()
-    fun onCameraVisible()
     fun onCameraScanning(scanning: Boolean)
     fun onCameraPermissionResult(result: PermissionResult)
     fun showBill(bill: Bill, vibrate: Boolean = false)
@@ -39,7 +38,7 @@ data class SessionState(
     val logScanTimes: Boolean = false,
     val showNetworkOffline: Boolean = false,
     val autoStartCamera: Boolean? = true,
-    val isCameraScanEnabled: Boolean = true,
+    val isCameraUp: Boolean? = null,
     val billResult: BillDeterminationResult = BillDeterminationResult.None,
     val restrictionType: RestrictionType? = null,
     val isRemoteSendLoading: Boolean = false,

apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt

@@ -29,6 +29,7 @@ import com.flipcash.services.analytics.AnalyticsEvent
 import com.flipcash.services.analytics.FlipcashAnalyticsService
 import com.flipcash.services.billing.BillingClient
 import com.flipcash.services.controllers.AccountController
+import com.flipcash.services.user.AuthState
 import com.flipcash.services.user.UserManager
 import com.getcode.manager.BottomBarAction
 import com.getcode.manager.BottomBarManager
@@ -57,16 +58,21 @@ import com.kik.kikx.models.ScannableKikCode
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.scan
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -108,9 +114,15 @@ class RealSessionController @Inject constructor(
 
     private val scannedRendezvous = mutableListOf<String>()
 
-    private var welcomeBonus: LocalFiat? = null
-
     init {
+        // reset state on logouts
+        userManager.state
+            .map { it.authState }
+            .filterIsInstance<AuthState.LoggedOut>()
+            .onEach {
+                _state.update { SessionState() }
+            }.launchIn(scope)
+
         userManager.state
             .map { it.isTimelockUnlocked }
             .onEach { _state.update { it.copy(restrictionType = RestrictionType.TIMELOCK_UNLOCKED) } }
@@ -138,6 +150,18 @@ class RealSessionController @Inject constructor(
         featureFlagController.observe(FeatureFlag.VibrateOnScan)
             .onEach { enabled -> _state.update { it.copy(vibrateOnScan = enabled) } }
             .launchIn(scope)
+
+        state
+            .map { it.isCameraUp }
+            .distinctUntilChanged() // Emit only when value changes
+            .scan(Pair(null as Boolean?, null as Boolean?)) { previousPair, current ->
+                Pair(previousPair.second, current)
+            }
+            .mapNotNull { (previous, current) ->
+                if (previous == null && current != null) current else null
+            }
+            .onEach { checkForAirdrops() }
+            .launchIn(scope)
     }
 
     /**
@@ -146,7 +170,6 @@ class RealSessionController @Inject constructor(
      * This function performs several actions to ensure the app is up-to-date and ready for user interaction:
      * 1. Starts polling for updates (e.g., balance, exchange rates, activity feed).
      * 2. Updates user flags.
-     * 3. Requests an airdrop if applicable.
      * 4. Checks for pending items in the activity feed.
      * 5. Brings the activity feed to the current state.
      * 6. Checks for any pending share actions via the share sheet.
@@ -160,7 +183,6 @@ class RealSessionController @Inject constructor(
         )
         startPolling()
         updateUserFlags()
-        checkForAirdrops()
         checkPendingItemsInFeed()
         bringActivityFeedCurrent()
         shareSheetController.checkForShare()
@@ -215,16 +237,15 @@ class RealSessionController @Inject constructor(
         }
     }
 
-    private fun checkForAirdrops(onAirdropReceived: (LocalFiat) -> Unit = {}) {
+    private fun checkForAirdrops() {
         if (userManager.authState.canAccessAuthenticatedApis) {
             scope.launch {
                 userManager.accountCluster?.let {
                     transactionController.airdrop(
                         type = AirdropType.WelcomeBonus,
                         destination = it.authority.keyPair
                     ).onSuccess { amount ->
-                        welcomeBonus = amount
-                        onAirdropReceived(amount)
+                        presentWelcomeBonus(amount)
                     }
                 }
             }
@@ -280,19 +301,8 @@ class RealSessionController @Inject constructor(
         }
     }
 
-    override fun onCameraVisible() {
-        if (welcomeBonus != null) {
-            presentWelcomeBonus(welcomeBonus!!)
-            welcomeBonus = null
-        } else {
-            checkForAirdrops {
-                presentWelcomeBonus(it)
-            }
-        }
-    }
-
     override fun onCameraScanning(scanning: Boolean) {
-        _state.update { it.copy(isCameraScanEnabled = scanning) }
+        _state.update { it.copy(isCameraUp = scanning) }
     }
 
     override fun onCameraPermissionResult(result: PermissionResult) {

ui/scanner/src/main/kotlin/com/getcode/ui/scanner/CodeScanner.kt

@@ -56,6 +56,7 @@ fun CodeScanner(
     scanningEnabled: Boolean,
     cameraGesturesEnabled: Boolean,
     invertedDragZoomEnabled: Boolean,
+    modifier: Modifier = Modifier,
     onPreviewStateChanged: (Boolean) -> Unit,
     onCodeScanned: (ScannableKikCode) -> Unit,
     onError: (Throwable) -> Unit = { },
@@ -195,7 +196,7 @@ fun CodeScanner(
             }.launchIn(this)
     }
 
-    AndroidView(factory = { previewView }, modifier = Modifier.fillMaxSize())
+    AndroidView(factory = { previewView }, modifier = modifier.fillMaxSize())
 
     FocusIndicator(autoFocusPoint) {
         autoFocusPoint = Offset.Unspecified