Release Vexta Wallet v0.6.2

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
         applicationId = "org.vextaproject.wallet"
         minSdk = 26
         targetSdk = 36
-        versionCode = 31
+        versionCode = 32
-        versionName = "0.6.1"
+        versionName = "0.6.2"
     }
 
     signingConfigs {

app/src/main/java/org/vextaproject/wallet/WalletActivity.kt

@@ -89,6 +89,10 @@ class WalletActivity : FragmentActivity() {
             "last_confirmed_balance"
         private const val PREF_BALANCE_INITIALIZED =
             "balance_notification_initialized"
+        private const val PREF_KNOWN_INCOMING_TXIDS =
+            "known_incoming_txids"
+        private const val PREF_TX_NOTIFICATIONS_INITIALIZED =
+            "tx_notifications_initialized"
         private const val PREF_RECEIVE_ADDRESS_INDEX =
             "receive_address_index"
         private const val PREF_RESTORE_ADDRESS_DISCOVERY =
@@ -429,41 +433,56 @@ class WalletActivity : FragmentActivity() {
         }
     }
 
-    private fun updateBalanceAndNotify(
+    private fun updateIncomingTransactionsAndNotify(
-        confirmedBalanceSatoshis: Long
+        transactions: List<BlockScanner.WalletTransaction>
     ) {
         val preferences =
             getSharedPreferences(PREFS, Context.MODE_PRIVATE)
 
+        val incoming =
+            transactions.filter { it.netSatoshis > 0L }
+
+        val currentTxids =
+            incoming.map { it.txid }.toSet()
+
         val initialized = preferences.getBoolean(
-            PREF_BALANCE_INITIALIZED,
+            PREF_TX_NOTIFICATIONS_INITIALIZED,
             false
         )
 
-        val previousBalance = preferences.getLong(
+        if (!initialized) {
-            PREF_LAST_CONFIRMED_BALANCE,
-            confirmedBalanceSatoshis
-        )
-
             preferences.edit()
-            .putBoolean(PREF_BALANCE_INITIALIZED, true)
+                .putBoolean(PREF_TX_NOTIFICATIONS_INITIALIZED, true)
-            .putLong(
+                .putStringSet(
-                PREF_LAST_CONFIRMED_BALANCE,
+                    PREF_KNOWN_INCOMING_TXIDS,
-                confirmedBalanceSatoshis
+                    currentTxids
                 )
                 .apply()
-
-        if (
-            !initialized ||
-            confirmedBalanceSatoshis <= previousBalance
-        ) {
             return
         }
 
-        val receivedSatoshis =
+        val knownTxids =
-            confirmedBalanceSatoshis - previousBalance
+            preferences.getStringSet(
+                PREF_KNOWN_INCOMING_TXIDS,
+                emptySet()
+            )?.toMutableSet() ?: mutableSetOf()
 
-        showIncomingPaymentNotification(receivedSatoshis)
+        incoming
+            .filter { it.txid !in knownTxids }
+            .sortedBy { it.height }
+            .forEach { transaction ->
+                showIncomingPaymentNotification(
+                    transaction.netSatoshis
+                )
+                knownTxids.add(transaction.txid)
+            }
+
+        preferences.edit()
+            .putStringSet(
+                PREF_KNOWN_INCOMING_TXIDS,
+                knownTxids
+            )
+            .apply()
     }
 
     private fun showIncomingPaymentNotification(
@@ -1025,7 +1044,7 @@ class WalletActivity : FragmentActivity() {
                         100_000_000.0
                 )
 
-                updateBalanceAndNotify(balanceSatoshis)
+                updateIncomingTransactionsAndNotify(mergedTransactions)
 
                 if (restoreAddressDiscovery) {
                     setCurrentReceiveAddressIndex(