Merge pull request #91 from synonymdev/feat/navigate-send-detail

Navigate to Send Detail Screen

Author: ovitrif

app/src/main/java/to/bitkit/models/NewTransactionSheetDetails.kt

@@ -6,6 +6,8 @@ import kotlinx.serialization.Serializable
 import to.bitkit.data.APP_PREFS
 import to.bitkit.di.json
 import to.bitkit.utils.Logger
+import uniffi.bitkitcore.ActivityFilter
+import uniffi.bitkitcore.PaymentType
 
 @Serializable
 data class NewTransactionSheetDetails(
@@ -60,3 +62,20 @@ enum class NewTransactionSheetType {
 enum class NewTransactionSheetDirection {
     SENT, RECEIVED
 }
+
+fun NewTransactionSheetDirection.toTxType(): PaymentType {
+    return if (this == NewTransactionSheetDirection.SENT) {
+        PaymentType.SENT
+    } else {
+        PaymentType.RECEIVED
+    }
+}
+
+fun NewTransactionSheetType.toActivityFilter(): ActivityFilter {
+    return if (this == NewTransactionSheetType.ONCHAIN) {
+        ActivityFilter.ONCHAIN
+    } else {
+        ActivityFilter.LIGHTNING
+    }
+}
+

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -81,6 +81,7 @@ import to.bitkit.viewmodels.AppViewModel
 import to.bitkit.viewmodels.BlocktankViewModel
 import to.bitkit.viewmodels.CurrencyViewModel
 import to.bitkit.viewmodels.ExternalNodeViewModel
+import to.bitkit.viewmodels.MainScreenEffect
 import to.bitkit.viewmodels.TransferViewModel
 import to.bitkit.viewmodels.WalletViewModel
 
@@ -138,6 +139,14 @@ fun ContentView(
         walletViewModel.observeLdkWallet()
     }
 
+    LaunchedEffect(appViewModel) {
+        appViewModel.mainScreenEffect.collect {
+            when (it) {
+                is MainScreenEffect.NavigateActivityDetail -> navController.navigate(Routes.ActivityItem(it.activityId))
+            }
+        }
+    }
+
     val walletUiState by walletViewModel.uiState.collectAsState()
     val nodeLifecycleState = walletUiState.nodeLifecycleState
 

app/src/main/java/to/bitkit/ui/screens/wallets/sheets/NewTransactionSheet.kt

@@ -26,7 +26,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieClipSpec
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.rememberLottieComposition
 import to.bitkit.R
@@ -51,7 +50,11 @@ fun NewTransactionSheet(
     NewTransactionSheet(
         onDismissRequest = { appViewModel.hideNewTransactionSheet() },
         details = appViewModel.newTransaction,
-        onCloseClick = { appViewModel.hideNewTransactionSheet() }
+        onCloseClick = { appViewModel.hideNewTransactionSheet() },
+        onDetailClick = {
+            appViewModel.hideNewTransactionSheet()
+            appViewModel.onClickActivityDetail()
+        },
     )
 }
 
@@ -60,7 +63,8 @@ fun NewTransactionSheet(
 fun NewTransactionSheet(
     onDismissRequest: () -> Unit,
     details: NewTransactionSheetDetails,
-    onCloseClick: () -> Unit
+    onCloseClick: () -> Unit,
+    onDetailClick: () -> Unit
 ) {
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
@@ -77,7 +81,7 @@ fun NewTransactionSheet(
         NewTransactionSheetView(
             details = details,
             onCloseClick = onCloseClick,
-            onDetailClick = onCloseClick //TODO IMPLEMENT
+            onDetailClick = onDetailClick
         )
     }
 }

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -29,6 +29,8 @@ import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NewTransactionSheetDirection
 import to.bitkit.models.NewTransactionSheetType
 import to.bitkit.models.Toast
+import to.bitkit.models.toActivityFilter
+import to.bitkit.models.toTxType
 import to.bitkit.services.CoreService
 import to.bitkit.services.LdkNodeEventBus
 import to.bitkit.services.LightningService
@@ -69,6 +71,10 @@ class AppViewModel @Inject constructor(
     val sendEffect = _sendEffect.asSharedFlow()
     private fun setSendEffect(effect: SendEffect) = viewModelScope.launch { _sendEffect.emit(effect) }
 
+    private val _mainScreenEffect = MutableSharedFlow<MainScreenEffect>(replay = 0, extraBufferCapacity = 1)
+    val mainScreenEffect = _mainScreenEffect.asSharedFlow()
+    private fun mainScreenEffect(effect: MainScreenEffect) = viewModelScope.launch { _mainScreenEffect.emit(effect) }
+
     private val sendEvents = MutableSharedFlow<SendEvent>()
     fun setSendEvent(event: SendEvent) = viewModelScope.launch { sendEvents.emit(event) }
 
@@ -505,6 +511,27 @@ class AppViewModel @Inject constructor(
         }
     }
 
+    fun onClickActivityDetail() {
+        val filter = newTransaction.type.toActivityFilter()
+        val paymentType = newTransaction.direction.toTxType()
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val activity = coreService.activity.get(filter = filter, txType = paymentType, limit = 1u).firstOrNull()
+
+            if (activity == null) {
+                Logger.error(msg = "Activity not found")
+                return@launch
+            }
+
+            val id = when(activity) {
+                is Activity.Lightning -> activity.v1.id
+                is Activity.Onchain -> activity.v1.id
+            }
+
+            mainScreenEffect(MainScreenEffect.NavigateActivityDetail(id))
+        }
+    }
+
     private fun attachTagsToActivity(paymentHashOrTxId: String?, type: ActivityFilter) {
         val tags = _sendUiState.value.selectedTags
         Logger.debug("attachTagsToActivity $tags")
@@ -730,6 +757,10 @@ sealed class SendEffect {
     data class PaymentSuccess(val sheet: NewTransactionSheetDetails? = null) : SendEffect()
 }
 
+sealed class MainScreenEffect {
+    data class NavigateActivityDetail(val activityId: String) : MainScreenEffect()
+}
+
 sealed class SendEvent {
     data object EnterManually : SendEvent()
     data class Paste(val data: String) : SendEvent()