Merge branch 'master' of https://github.com/dashevo/dash-wallet into …

…dashpay-quick-voting
dashpay · Nov 15, 2024 · 8f22dc9 · 8f22dc9
2 parents 299d9bd + 384deb9
commit 8f22dc9
Show file tree

Hide file tree

Showing 28 changed files with 601 additions and 396 deletions.
diff --git a/wallet/CHANGES b/wallet/CHANGES
@@ -1,4 +1,22 @@
 Dash Wallet
+v11.0.3
+* Improve Username Voting screen
+* UI fixes
+* Update translations
+* Fix Username request and recover bugs
+* Fix CrowdNode signup on Android 14
+
+v11.0.2
+* Fix username requests
+* Add DashPay Event tracking
+
+v11.0.1
+* Fix UI items
+
+v11.0.0
+* DashPay
+* use dashj 21.1.1
+
 v10.3.2
 * Fix ANR when using CoinJoin
 * Fix missing Send button on Home Screen

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -208,8 +208,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 34
         // version code: MMmmppbb; MM = Major Version, mm = minor version, pp == patch version, bb = build
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 11000201
-        versionName project.hasProperty('versionName') ? project.property('versionName') : "11.0.2"
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 11000312
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "11.0.3"
         multiDexEnabled true
         generatedDensities = ['hdpi', 'xhdpi']
         vectorDrawables.useSupportLibrary = true
@@ -346,16 +346,16 @@ android {
         }
         staging {
             applicationId = "org.dash.dashpay.testnet"
-            def imgurClientId = props.getProperty("UPHOLD_CLIENT_ID_SANDBOX")
-            def imgurClientSecret = props.getProperty("UPHOLD_CLIENT_SECRET_SANDBOX")
-            if (imgurClientId == null) {
-                imgurClientId = "\"UPHOLD_CLIENT_ID\""
+            def upholdClientId = props.getProperty("UPHOLD_CLIENT_ID_SANDBOX")
+            def upholdClientSecret = props.getProperty("UPHOLD_CLIENT_SECRET_SANDBOX")
+            if (upholdClientId == null) {
+                upholdClientId = "\"UPHOLD_CLIENT_ID\""
             }
-            if (imgurClientSecret == null) {
-                imgurClientSecret = "\"UPHOLD_CLIENT_SECRET\""
+            if (upholdClientSecret == null) {
+                upholdClientSecret = "\"UPHOLD_CLIENT_SECRET\""
             }
-            buildConfigField("String", "UPHOLD_CLIENT_ID", imgurClientId)
-            buildConfigField("String", "UPHOLD_CLIENT_SECRET", imgurClientSecret)
+            buildConfigField("String", "UPHOLD_CLIENT_ID", upholdClientId)
+            buildConfigField("String", "UPHOLD_CLIENT_SECRET", upholdClientSecret)
             def topperKeyId = props.getProperty("TOPPER_KEY_ID_SANDBOX", "\"TOPPER_KEY_ID\"")
             def topperWidgetId = props.getProperty("TOPPER_WIDGET_ID_SANDBOX", "\"TOPPER_WIDGET_ID\"")
             def topperPrivateKey = props.getProperty("TOPPER_PRIVATE_KEY_SANDBOX", "\"TOPPER_PRIVATE_KEY\"")