Merge branch 'master' into fix/node-stopping-bg-payments

Author: jvsena42

app/src/main/java/to/bitkit/repositories/BackupRepo.kt

@@ -546,6 +546,8 @@ class BackupRepo @Inject constructor(
             }
 
             Logger.info("Full restore success", context = TAG)
+        }.onSuccess {
+            settingsStore.update { it.copy(backupVerified = true) }
         }.onFailure { e ->
             Logger.warn("Full restore error", e = e, context = TAG)
         }

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -300,8 +300,6 @@ class WalletRepo @Inject constructor(
                 keychain.saveString(Keychain.Key.BIP39_PASSPHRASE.name, bip39Passphrase)
             }
             setWalletExistsState()
-        }.onSuccess {
-            settingsStore.update { it.copy(backupVerified = true) }
         }.onFailure {
             Logger.error("restoreWallet error", it, context = TAG)
         }

app/src/main/java/to/bitkit/services/MigrationService.kt

@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
@@ -1212,6 +1211,8 @@ class MigrationService @Inject constructor(
             val bitkitFiles = rnBackupClient.listFiles(fileGroup = "bitkit")?.list ?: emptyList()
             retrieveAndApplyBitkitBackups(bitkitFiles)
             markMigrationCompleted()
+        }.onSuccess {
+            settingsStore.update { it.copy(backupVerified = true) }
         }.onFailure { e ->
             Logger.error("RN remote backup restore failed", e, context = TAG)
             throw e
@@ -1419,6 +1420,7 @@ class MigrationService @Inject constructor(
                     Logger.warn("Paid order $orderId not found in fetched orders", context = TAG)
                     null
                 }
+
                 order.state2 == com.synonym.bitkitcore.BtOrderState2.EXECUTED -> null
                 else -> TransferEntity(
                     id = txId,

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

@@ -156,7 +156,6 @@ fun NewTransactionSheetView(
 
             BalanceHeaderView(
                 sats = details.sats,
-                onClick = onDetailClick,
                 modifier = Modifier
                     .fillMaxWidth()
                     .testTag("ReceivedTransaction")
@@ -174,8 +173,7 @@ fun NewTransactionSheetView(
                     SecondaryButton(
                         text = stringResource(R.string.wallet__send_details),
                         onClick = onDetailClick,
-                        enabled = details.paymentHashOrTxId != null,
-                        isLoading = details.isLoadingDetails,
+                        enabled = details.paymentHashOrTxId != null && !details.isLoadingDetails,
                         modifier = Modifier
                             .weight(1f)
                             .testTag("Details")

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

@@ -1591,10 +1591,12 @@ class AppViewModel @Inject constructor(
                                 direction = NewTransactionSheetDirection.SENT,
                                 paymentHashOrTxId = txId,
                                 sats = amount.toLong(),
+                                isLoadingDetails = true,
                             )
                         )
                         lightningRepo.sync()
                         activityRepo.syncActivities()
+                        _successSendUiState.update { it.copy(isLoadingDetails = false) }
                     }.onFailure { e ->
                         Logger.error(msg = "Error sending onchain payment", e = e, context = TAG)
                         toast(

app/src/test/java/to/bitkit/repositories/WalletRepoTest.kt

@@ -167,24 +167,13 @@ class WalletRepoTest : BaseUnitTest() {
     }
 
     @Test
-    fun `restoreWallet should set backupVerified to true on success`() = test {
+    fun `restoreWallet should not call settingsStore`() = test {
         val mnemonic = "restore mnemonic"
         whenever(keychain.saveString(any(), any())).thenReturn(Unit)
 
         val result = sut.restoreWallet(mnemonic, null)
 
         assertTrue(result.isSuccess)
-        verify(settingsStore).update(any())
-    }
-
-    @Test
-    fun `restoreWallet should not set backupVerified when keychain fails`() = test {
-        val mnemonic = "restore mnemonic"
-        whenever(keychain.saveString(any(), any())).thenThrow(error)
-
-        val result = sut.restoreWallet(mnemonic, null)
-
-        assertTrue(result.isFailure)
         verify(settingsStore, never()).update(any())
     }