Merge branch 'master' into mainnet

Author: dpad85

phoenix-android/build.gradle.kts

@@ -25,8 +25,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 34
-        versionCode = 96
-        versionName = "2.4.3"
+        versionCode = 97
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations.addAll(listOf("en", "fr", "de", "es", "b+es+419", "cs", "pt-rBR", "sk", "vi", "sw"))
     }

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt

@@ -406,7 +406,7 @@ fun AppView(
                         AboutView()
                     }
                     composable("${Screen.PaymentSettings.route}?showAuthSchemeDialog={showAuthSchemeDialog}", arguments = listOf(
-                        navArgument("showAuthSchemeDialog") { type = NavType.BoolType }
+                        navArgument("showAuthSchemeDialog") { type = NavType.BoolType ; defaultValue = false }
                     )) {
                         val showAuthSchemeDialog = it.arguments?.getBoolean("showAuthSchemeDialog") ?: false
                         PaymentSettingsView(initialShowLnurlAuthSchemeDialog = showAuthSchemeDialog)

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/home/HomeBalance.kt

@@ -185,7 +185,7 @@ private fun OnChainBalance(
                                 OnChainBalanceEntry(
                                     label = stringResource(id = R.string.home_swapin_ready_title),
                                     icon = if (expiringSoon) R.drawable.ic_alert_triangle else R.drawable.ic_sleep,
-                                    amount = fundsBeingConfirmed,
+                                    amount = fundsConfirmedNotLocked.toMilliSatoshi(),
                                     description = {
                                         Column {
                                             Text(

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/services/BootReceiver.kt

@@ -27,7 +27,6 @@ class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         if (Intent.ACTION_BOOT_COMPLETED == intent.action) {
             ChannelsWatcher.schedule(context)
-            DailyConnect.schedule(context)
             InflightPaymentsWatcher.scheduleOnce(context)
         }
     }

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/services/NodeService.kt

@@ -232,7 +232,6 @@ class NodeService : Service() {
             log.info("starting node from service state=${_state.value?.name} with checkLegacyChannels=$requestCheckLegacyChannels")
             doStartBusiness(decryptedMnemonics, requestCheckLegacyChannels)
             ChannelsWatcher.schedule(applicationContext)
-            DailyConnect.schedule(applicationContext)
             ContactsPhotoCleaner.scheduleASAP(applicationContext)
             _state.postValue(NodeServiceState.Running)
         }

phoenix-legacy/build.gradle.kts

@@ -30,7 +30,7 @@ android {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
-    val libCode = 96
+    val libCode = 97
     getByName("debug") {
       resValue("string", "CHAIN", chain)
       buildConfigField("String", "CHAIN", chain)

phoenix-legacy/src/main/kotlin/fr/acinq/phoenix/legacy/main/MigrationFragmentDialog.kt

@@ -289,7 +289,7 @@ class MigrationDialogViewModel : ViewModel() {
           state.value = MigrationScreenState.Complete(swapInAddress, channelsPublicationStatusMap.keys)
 
           // pause then update preferences to switch to the new app
-          delay(3_000)
+          delay(2_000)
           LegacyPrefsDatastore.savePrefsMigrationExpected(context, true)
           LegacyPrefsDatastore.saveDataMigrationExpected(context, true)
           LegacyPrefsDatastore.saveHasMigratedFromLegacy(context, true)
@@ -304,12 +304,12 @@ class MigrationDialogViewModel : ViewModel() {
     return channels.any {
       when (val data = it.data()) {
         is DATA_CLOSING -> {
-          data.remoteCommitPublished().isDefined
-            || !data.revokedCommitPublished().isEmpty
-            || !data.customRemoteCommitPublished().isEmpty
-            || data.futureRemoteCommitPublished().isDefined
-            || data.localCommitPublished().isDefined
-            || data.nextRemoteCommitPublished().isDefined
+            (data.remoteCommitPublished().nonEmpty() && data.remoteCommitPublished().get().irrevocablySpent().isEmpty) // potentially a remote close but remote commit is not confirmed
+              || data.revokedCommitPublished().nonEmpty()
+              || data.customRemoteCommitPublished().nonEmpty()
+              || data.futureRemoteCommitPublished().nonEmpty()
+              || data.localCommitPublished().nonEmpty()
+              || data.nextRemoteCommitPublished().nonEmpty()
         }
         else -> false
       }