Merge branch 'main' into release/1.4.0

# Conflicts:
#	app/build.gradle

CHANGELOG.md

@@ -6,21 +6,24 @@
 
 - Optimized user experience during the onboarding process
 
+### Changed
+
+- When going to Concordex DEX, there's no need to select or copy account address,
+  as it is a WalletConnect-based DEX which fetches the wallet data itself.
+- The "," separator sign used on all balances in the wallet - to make it easier to read
+  large numbers
+- Use the new customizable page allowing pre-setting the address and the token for the Swipelux
+  payment gateway
+
+## [1.3.2] - 2024-11-27
+
 ### Fixed
 
 - Crash on launch when Google Play Services is disabled
 - Inconsistent transaction fee for invoke smart contract
-- Crashing when first launching the app offline 
+- Crashing when first launching the app offline
+- Not receiving CIS-2 transaction notifications when they are disabled for CCD transactions
 
-### Changed
-
-- When going to Concordex DEX, there's no need to select or copy account address, 
- as it is a WalletConnect-based DEX which fetches the wallet data itself.
-- The "," separator sign used on all balances in the wallet - to make it easier to read 
- large numbers
-- Use the new customizable page allowing pre-setting the address and the token for the Swipelux
- payment gateway
-
 ## [1.3.1] - 2024-11-07
 
 ### Fixed
@@ -146,7 +149,9 @@
   attributes
 - CIS-2 tokens with corrupted or missing metadata can no longer be added
 
-[Unreleased]: https://github.com/Concordium/cryptox-android/compare/1.3.1...HEAD
+[Unreleased]: https://github.com/Concordium/cryptox-android/compare/1.3.2...HEAD
+
+[1.3.2]: https://github.com/Concordium/cryptox-android/compare/1.3.1...1.3.2
 
 [1.3.1]: https://github.com/Concordium/cryptox-android/compare/1.3.0...1.3.1
 

app/build.gradle

@@ -20,10 +20,10 @@ android {
     // This project uses semantic versioning
     // https://semver.org/
     def versionMajor = 1
-    def versionMinor = 4
-    def versionPatch = 0
-    def versionMeta = "-qa.9"
-    def versionCodeIncremental = 1415
+    def versionMinor = 3
+    def versionPatch = 2
+    def versionMeta = ""
+    def versionCodeIncremental = 1416
 
     compileSdkVersion 34
 

app/src/main/java/com/concordium/wallet/core/notifications/TransactionNotificationsManager.kt

@@ -35,7 +35,7 @@ class TransactionNotificationsManager(
         get() = areNotificationsEnabled && notificationsPreferences.areCcdTxNotificationsEnabled
 
     private val areCis2TxNotificationsEnabled: Boolean
-        get() = areNotificationsEnabled && notificationsPreferences.areCcdTxNotificationsEnabled
+        get() = areNotificationsEnabled && notificationsPreferences.areCis2TxNotificationsEnabled
 
     @SuppressLint("MissingPermission")
     fun notifyCcdTransaction(