diff --git a/app/src/main/java/to/bitkit/services/MigrationService.kt b/app/src/main/java/to/bitkit/services/MigrationService.kt index 7f2e1c493..568856ae1 100644 --- a/app/src/main/java/to/bitkit/services/MigrationService.kt +++ b/app/src/main/java/to/bitkit/services/MigrationService.kt @@ -364,6 +364,7 @@ class MigrationService @Inject constructor( suspend fun markChannelRecoveryChecked() { val key = stringPreferencesKey(RN_CHANNEL_RECOVERY_CHECKED_KEY) rnMigrationStore.edit { it[key] = "true" } + Logger.info("markChannelRecoveryChecked", context = TAG) } suspend fun hasRNWalletData(): Boolean { @@ -1488,6 +1489,7 @@ class MigrationService @Inject constructor( } if (monitors.isNotEmpty()) { + Logger.info("Found ${monitors.size} channel monitors", context = TAG) pendingChannelMigration = PendingChannelMigration( channelManager = managerData, channelMonitors = monitors, @@ -1643,6 +1645,7 @@ class MigrationService @Inject constructor( ) null } + else -> TransferEntity( id = txId, type = TransferType.TO_SPENDING, diff --git a/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt index e2e8f54f4..ffc4d407f 100644 --- a/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt +++ b/app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt @@ -335,7 +335,10 @@ class WalletViewModel @Inject constructor( val allMonitorsRetrieved = runCatching { val allRetrieved = migrationService.fetchRNRemoteLdkData() - val channelMigration = buildChannelMigrationIfAvailable() + // don't overwrite channel manager, we only need the monitors for the sweep + val channelMigration = buildChannelMigrationIfAvailable()?.let { + ChannelDataMigration(channelManager = null, channelMonitors = it.channelMonitors) + } if (channelMigration == null) { Logger.info("No channel monitors found on RN backup", context = TAG)