Merge branch 'fix/tag-syncing' into feat/send-success-screen

jvsena42 · jvsena42 · commit 04c945c83a93 · 2025-08-29T06:38:27.000-03:00
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -2,6 +2,11 @@ name: E2E
 
 on:
   workflow_dispatch:
+    inputs:
+      e2e_branch:
+        description: "Branch of synonymdev/bitkit-e2e-tests to use"
+        required: false
+        default: "main"
   pull_request:
 
 env:
@@ -60,11 +65,17 @@ jobs:
     needs: build
 
     steps:
+      - name: Show selected E2E branch
+        env:
+          E2E_BRANCH: ${{ github.event.inputs.e2e_branch || 'main' }}
+        run: echo $E2E_BRANCH
+
       - name: Clone E2E tests
         uses: actions/checkout@v4
         with:
           repository: synonymdev/bitkit-e2e-tests
           path: bitkit-e2e-tests
+          ref: ${{ github.event.inputs.e2e_branch || 'main' }}
 
       - name: Enable KVM
         run: |
diff --git a/app/src/main/java/to/bitkit/data/SettingsStore.kt b/app/src/main/java/to/bitkit/data/SettingsStore.kt
@@ -88,7 +88,7 @@ data class SettingsData(
     val isPinOnIdleEnabled: Boolean = false,
     val isPinForPaymentsEnabled: Boolean = false,
     val isDevModeEnabled: Boolean = false,
-    val showWidgets: Boolean = false,
+    val showWidgets: Boolean = true,
     val showWidgetTitles: Boolean = false,
     val lastUsedTags: List<String> = emptyList(),
     val enableSwipeToHideBalance: Boolean = true,
diff --git a/app/src/main/java/to/bitkit/data/WidgetsStore.kt b/app/src/main/java/to/bitkit/data/WidgetsStore.kt
@@ -51,6 +51,7 @@ class WidgetsStore @Inject constructor(
             it.copy(calculatorValues = calculatorValues)
         }
     }
+
     suspend fun updateArticles(articles: List<ArticleDTO>) {
         store.updateData {
             it.copy(articles = articles)
@@ -147,7 +148,11 @@ class WidgetsStore @Inject constructor(
 
 @Serializable
 data class WidgetsData(
-    val widgets: List<WidgetWithPosition> = emptyList(),
+    val widgets: List<WidgetWithPosition> = listOf(
+        WidgetWithPosition(type = WidgetType.PRICE, position = 0),
+        WidgetWithPosition(type = WidgetType.BLOCK, position = 1),
+        WidgetWithPosition(type = WidgetType.NEWS, position = 2),
+    ),
     val headlinePreferences: HeadlinePreferences = HeadlinePreferences(),
     val factsPreferences: FactsPreferences = FactsPreferences(),
     val blocksPreferences: BlocksPreferences = BlocksPreferences(),
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt
@@ -74,7 +74,7 @@ import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.rememberBiometricAuthSupported
 import to.bitkit.ui.utils.withAccent
-import to.bitkit.viewmodels.AmountWarning
+import to.bitkit.viewmodels.SanityWarning
 import to.bitkit.viewmodels.LnurlParams
 import to.bitkit.viewmodels.SendEvent
 import to.bitkit.viewmodels.SendMethod
@@ -238,13 +238,13 @@ private fun Content(
             )
         }
 
-        uiState.showAmountWarningDialog?.let { dialog ->
+        uiState.showSanityWarningDialog?.let { dialog ->
             AppAlertDialog(
                 title = stringResource(R.string.common__are_you_sure),
                 text = stringResource(dialog.message),
                 confirmText = stringResource(R.string.wallet__send_yes),
                 dismissText = stringResource(R.string.common__cancel),
-                onConfirm = { onEvent(SendEvent.ConfirmAmountWarning) },
+                onConfirm = { onEvent(SendEvent.ConfirmAmountWarning(dialog)) },
                 onDismiss = {
                     onEvent(SendEvent.DismissAmountWarning)
                     onBack()
@@ -660,7 +660,7 @@ private fun PreviewDialog() {
         BottomSheetPreview {
             Content(
                 uiState = sendUiState().copy(
-                    showAmountWarningDialog = AmountWarning.VALUE_OVER_100_USD,
+                    showSanityWarningDialog = SanityWarning.VALUE_OVER_100_USD,
                 ),
                 isLoading = false,
                 showBiometrics = true,
diff --git a/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
@@ -293,7 +293,7 @@ class AppViewModel @Inject constructor(
 
                     SendEvent.SpeedAndFee -> setSendEffect(SendEffect.NavigateToFee)
                     SendEvent.SwipeToPay -> onSwipeToPay()
-                    SendEvent.ConfirmAmountWarning -> onConfirmAmountWarning()
+                    is SendEvent.ConfirmAmountWarning -> onConfirmAmountWarning(it.warning)
                     SendEvent.DismissAmountWarning -> onDismissAmountWarning()
                     SendEvent.PayConfirmed -> onConfirmPay()
                     SendEvent.BackToAmount -> setSendEffect(SendEffect.PopBack(SendRoute.Amount))
@@ -818,29 +818,36 @@ class AppViewModel @Inject constructor(
             val amount = _sendUiState.value.amount
 
             handleSanityChecks(amount)
-            if (_sendUiState.value.showAmountWarningDialog != null) return@launch // await for dialog UI interaction
+            if (_sendUiState.value.showSanityWarningDialog != null) return@launch // await for dialog UI interaction
 
             _sendUiState.update { it.copy(shouldConfirmPay = true) }
         }
     }
 
     private suspend fun handleSanityChecks(amountSats: ULong) {
-        if (_sendUiState.value.showAmountWarningDialog != null) return
+        if (_sendUiState.value.showSanityWarningDialog != null) return
 
         val settings = settingsStore.data.first()
-        val amountInUsd = currencyRepo.convertSatsToFiat(amountSats.toLong(), "USD").getOrNull() ?: return
-        if (amountInUsd.value > BigDecimal(SEND_AMOUNT_WARNING_THRESHOLD) && settings.enableSendAmountWarning) {
+
+        if (
+            amountSats > BigDecimal.valueOf(walletRepo.balanceState.value.totalSats.toLong())
+                .times(BigDecimal(MAX_BALANCE_FRACTION)).toLong().toUInt() &&
+            SanityWarning.OVER_HALF_BALANCE !in _sendUiState.value.confirmedWarnings
+        ) {
             _sendUiState.update {
-                it.copy(showAmountWarningDialog = AmountWarning.VALUE_OVER_100_USD)
+                it.copy(showSanityWarningDialog = SanityWarning.OVER_HALF_BALANCE)
             }
             return
         }
 
-        if (amountSats > BigDecimal.valueOf(walletRepo.balanceState.value.totalSats.toLong())
-                .times(BigDecimal(0.5)).toLong().toUInt()
+        val amountInUsd = currencyRepo.convertSatsToFiat(amountSats.toLong(), "USD").getOrNull() ?: return
+        if (
+            amountInUsd.value > BigDecimal(SEND_AMOUNT_WARNING_THRESHOLD) &&
+            settings.enableSendAmountWarning &&
+            SanityWarning.VALUE_OVER_100_USD !in _sendUiState.value.confirmedWarnings
         ) {
             _sendUiState.update {
-                it.copy(showAmountWarningDialog = AmountWarning.OVER_HALF_BALANCE)
+                it.copy(showSanityWarningDialog = SanityWarning.VALUE_OVER_100_USD)
             }
             return
         }
@@ -854,25 +861,31 @@ class AppViewModel @Inject constructor(
             utxosToSpend = _sendUiState.value.selectedUtxos,
         ).getOrNull() ?: return
 
-        if (totalFee > BigDecimal.valueOf(amountSats.toLong())
-                .times(BigDecimal(0.5)).toLong().toUInt()
+        if (
+            totalFee > BigDecimal.valueOf(
+                amountSats.toLong()
+            ).times(BigDecimal(MAX_FEE_AMOUNT_RATIO)).toLong().toUInt() &&
+            SanityWarning.FEE_OVER_HALF_VALUE !in _sendUiState.value.confirmedWarnings
         ) {
             _sendUiState.update {
-                it.copy(showAmountWarningDialog = AmountWarning.FEE_OVER_HALF_VALUE)
+                it.copy(showSanityWarningDialog = SanityWarning.FEE_OVER_HALF_VALUE)
             }
             return
         }
 
-        val feeInUsd = currencyRepo.convertSatsToFiat(amountSats.toLong(), "USD").getOrNull() ?: return
-        if (feeInUsd.value > BigDecimal(10)) {
+        val feeInUsd = currencyRepo.convertSatsToFiat(totalFee.toLong(), "USD").getOrNull() ?: return
+        if (
+            feeInUsd.value > BigDecimal(TEN_USD) &&
+            SanityWarning.FEE_OVER_10_USD !in _sendUiState.value.confirmedWarnings
+        ) {
             _sendUiState.update {
-                it.copy(showAmountWarningDialog = AmountWarning.FEE_OVER_10_USD)
+                it.copy(showSanityWarningDialog = SanityWarning.FEE_OVER_10_USD)
             }
             return
         }
 
         _sendUiState.update {
-            it.copy(showAmountWarningDialog = null)
+            it.copy(showSanityWarningDialog = null)
         }
     }
 
@@ -1401,20 +1414,21 @@ class AppViewModel @Inject constructor(
         }
     }
 
-    private fun onConfirmAmountWarning() {
+    private fun onConfirmAmountWarning(warning: SanityWarning) {
         viewModelScope.launch {
             _sendUiState.update {
                 it.copy(
-                    showAmountWarningDialog = null,
-                    shouldConfirmPay = true,
+                    showSanityWarningDialog = null,
+                    confirmedWarnings = it.confirmedWarnings + warning
                 )
             }
         }
+        onSwipeToPay()
     }
 
     private fun onDismissAmountWarning() {
         _sendUiState.update {
-            it.copy(showAmountWarningDialog = null)
+            it.copy(showSanityWarningDialog = null)
         }
     }
 
@@ -1434,6 +1448,9 @@ class AppViewModel @Inject constructor(
     companion object {
         private const val TAG = "AppViewModel"
         private const val SEND_AMOUNT_WARNING_THRESHOLD = 100.0
+        private const val TEN_USD = 10
+        private const val MAX_BALANCE_FRACTION = 0.5
+        private const val MAX_FEE_AMOUNT_RATIO = 0.5
     }
 }
 
@@ -1450,7 +1467,8 @@ data class SendUiState(
     val payMethod: SendMethod = SendMethod.ONCHAIN,
     val selectedTags: List<String> = listOf(),
     val decodedInvoice: LightningInvoice? = null,
-    val showAmountWarningDialog: AmountWarning? = null,
+    val showSanityWarningDialog: SanityWarning? = null,
+    val confirmedWarnings: List<SanityWarning> = listOf(),
     val shouldConfirmPay: Boolean = false,
     val selectedUtxos: List<SpendableUtxo>? = null,
     val lnurl: LnurlParams? = null,
@@ -1462,7 +1480,7 @@ data class SendUiState(
     val fees: Map<FeeRate, Long> = emptyMap(),
 )
 
-enum class AmountWarning(@StringRes val message: Int, val testTag: String) {
+enum class SanityWarning(@StringRes val message: Int, val testTag: String) {
     VALUE_OVER_100_USD(R.string.wallet__send_dialog1, "SendDialog1"),
     OVER_HALF_BALANCE(R.string.wallet__send_dialog2, "SendDialog2"),
     FEE_OVER_HALF_VALUE(R.string.wallet__send_dialog3, "SendDialog3"),
@@ -1513,7 +1531,7 @@ sealed interface SendEvent {
     data object SwipeToPay : SendEvent
     data object SpeedAndFee : SendEvent
     data object PaymentMethodSwitch : SendEvent
-    data object ConfirmAmountWarning : SendEvent
+    data class ConfirmAmountWarning(val warning: SanityWarning) : SendEvent
     data object DismissAmountWarning : SendEvent
     data object PayConfirmed : SendEvent
     data object BackToAmount : SendEvent
