Skip to content

fix: guard wallet operations until required restore completes #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ben-kaufman wants to merge 4 commits into
base: fix/usdt-recovery-parity
Choose a base branch
from
+2,639 −153
Open

fix: guard wallet operations until required restore completes #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bb36af
fix: guard wallet operations while required restore is pending
ben-kaufman Oct 24, 2026
837aa1c
chore: rename changelog fragment
ben-kaufman Oct 24, 2026
55b31ee
fix: preserve connection recovery during required wallet restore
ben-kaufman Oct 26, 2026
8d72053
fix: preserve ordinary startup recovery and editor cancellation
ben-kaufman Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions app/src/androidTest/java/to/bitkit/ui/onboarding/WalletConnectionRecoveryViewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
package to.bitkit.ui.onboarding

import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollTo
import org.junit.Rule
import org.junit.Test
import to.bitkit.data.WalletConnectionRecovery
import to.bitkit.test.annotations.ComposeUi
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.viewmodels.ConnectionRecoveryUiState
import kotlin.test.assertEquals

@ComposeUi
class WalletConnectionRecoveryViewTest {
@get:Rule
val composeTestRule = createComposeRule()

@Test
fun requiredRestoreCanSaveConnectionsWithoutProceedingOrRetrying() {
var editing by mutableStateOf(false)
var state by mutableStateOf(
ConnectionRecoveryUiState(
owner = WalletConnectionRecovery.Owner(0, "test-wallet", 0),
electrum = "ssl://electrum.example:50002",
)
)
var retries = 0
composeTestRule.setContent {
AppThemeSurface {
CompositionLocalProvider(LocalInspectionMode provides true) {
if (editing) {
WalletConnectionRecoveryView(
state = state,
onBack = { editing = false },
onElectrum = { state = state.copy(electrum = it) },
onRgs = { state = state.copy(rgs = it) },
onResetElectrum = {},
onResetRgs = {},
onSave = { state = state.copy(saved = true) },
onRetry = { retries++ },
)
} else {
WalletRestoreErrorView(
retryCount = 3,
allowProceedWithoutRestore = false,
onRetry = { retries++ },
onConnectionSettings = { editing = true },
onProceedWithoutRestore = { error("Required restoration must remain gated") },
)
}
}
}
}
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.onNodeWithTag("ConnectionRecoveryButton").performClick()
composeTestRule.onNodeWithTag("WalletConnectionRecovery").assertIsDisplayed()
composeTestRule.onNodeWithTag("RecoveryElectrumSave").performScrollTo().performClick()
composeTestRule.onNodeWithTag("RecoverySaved").performScrollTo().assertIsDisplayed()
composeTestRule.runOnIdle { assertEquals(0, retries) }
composeTestRule.onNodeWithTag("RecoveryRetry").performScrollTo().performClick()
composeTestRule.runOnIdle { assertEquals(1, retries) }
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
}

@Test
fun unavailableOwnerDisablesEditsButKeepsExplicitRetryReachable() {
var retries = 0
composeTestRule.setContent {
AppThemeSurface {
CompositionLocalProvider(LocalInspectionMode provides true) {
WalletConnectionRecoveryView(
state = ConnectionRecoveryUiState(error = "Stored connection unavailable"),
onBack = {},
onElectrum = { error("Unavailable owner must not edit") },
onRgs = { error("Unavailable owner must not edit") },
onResetElectrum = { error("Unavailable owner must not edit") },
onResetRgs = { error("Unavailable owner must not edit") },
onSave = { error("Unavailable owner must not save") },
onRetry = { retries++ },
)
}
}
}
composeTestRule.onNodeWithTag("RecoveryElectrumSave").assertIsNotEnabled()
composeTestRule.onNodeWithTag("RecoveryRgsSave").assertIsNotEnabled()
composeTestRule.onNodeWithTag("RecoveryError").performScrollTo().assertIsDisplayed()
composeTestRule.onNodeWithTag("RecoveryRetry").performScrollTo().performClick()
composeTestRule.runOnIdle { assertEquals(1, retries) }
}
}
111 changes: 111 additions & 0 deletions app/src/androidTest/java/to/bitkit/ui/onboarding/WalletRestoreErrorViewTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
package to.bitkit.ui.onboarding

import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Rule
import org.junit.Test
import to.bitkit.R
import to.bitkit.test.annotations.ComposeUi
import to.bitkit.ui.theme.AppThemeSurface
import to.bitkit.viewmodels.ConnectionStartupFailure
import to.bitkit.viewmodels.RestoreState
import to.bitkit.viewmodels.canProceedWithoutRestore
import kotlin.test.assertEquals

@ComposeUi
class WalletRestoreErrorViewTest {
@get:Rule
val composeTestRule = createComposeRule()

@Test
fun ordinaryStartupFailureUsesProductionGateAndDismissesOnlyAfterConfirmation() {
var failure by mutableStateOf<ConnectionStartupFailure?>(ConnectionStartupFailure("storage unavailable", true))
var restore by mutableStateOf<RestoreState>(RestoreState.Retry(0))
var dismissed = 0
composeTestRule.setContent {
AppThemeSurface {
CompositionLocalProvider(LocalInspectionMode provides true) {
if (failure != null || restore is RestoreState.BackupFailed) {
WalletRestoreErrorView(
retryCount = restore.retryCount(),
allowProceedWithoutRestore = canProceedWithoutRestore(restore, failure?.canProceedWithoutRestore),
onRetry = {},
onProceedWithoutRestore = {
failure = null
restore = RestoreState.Settled
dismissed++
},
)
}
}
}
}
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.runOnIdle { restore = RestoreState.Retry(1) }
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.runOnIdle { restore = RestoreState.Retry(2) }
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertIsDisplayed().performClick()
composeTestRule.onNodeWithTag("ProceedWithoutBackupDialog").assertIsDisplayed()
composeTestRule.runOnIdle { failure = failure?.copy(canProceedWithoutRestore = false) }
composeTestRule.onNodeWithTag("ProceedWithoutBackupDialog").assertDoesNotExist()
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.runOnIdle { failure = failure?.copy(canProceedWithoutRestore = true) }
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").performClick()
val confirm = InstrumentationRegistry.getInstrumentation().targetContext.getString(R.string.common__yes_proceed)
composeTestRule.onNodeWithText(confirm).performClick()
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.onNodeWithTag("TryAgainButton").assertDoesNotExist()
composeTestRule.runOnIdle { assertEquals(1, dismissed) }
}

@Test
fun pendingRecoveryOnlyOffersRetryAfterRepeatedFailures() {
var retries = 0
composeTestRule.setContent {
AppThemeSurface {
CompositionLocalProvider(LocalInspectionMode provides true) {
WalletRestoreErrorView(
retryCount = 3,
allowProceedWithoutRestore = false,
onRetry = { retries++ },
onProceedWithoutRestore = { error("Pending recovery must not be dismissed") },
)
}
}
}
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
composeTestRule.onNodeWithTag("TryAgainButton").assertIsDisplayed().performClick()
composeTestRule.runOnIdle { assertEquals(1, retries) }
}

@Test
fun pendingRecoveryRemovesAnAlreadyOpenProceedDialog() {
var allowed by mutableStateOf(true)
composeTestRule.setContent {
AppThemeSurface {
CompositionLocalProvider(LocalInspectionMode provides true) {
WalletRestoreErrorView(
retryCount = 3,
allowProceedWithoutRestore = allowed,
onRetry = {},
onProceedWithoutRestore = { error("Pending recovery must not be dismissed") },
)
}
}
}
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").performClick()
composeTestRule.onNodeWithTag("ProceedWithoutBackupDialog").assertIsDisplayed()
composeTestRule.runOnIdle { allowed = false }
composeTestRule.onNodeWithTag("ProceedWithoutBackupDialog").assertDoesNotExist()
composeTestRule.onNodeWithTag("ProceedWithoutBackupButton").assertDoesNotExist()
}
}
Loading
Loading