Merge branch 'main' into feature/home-onboarding-redesign

# Conflicts: # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt # ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt
2025-04-14 09:56:40 +02:00 · 2025-04-14 09:56:40 +02:00 · 54b0bb202d
parent 03177e29f8 7cc98528e9
commit 54b0bb202d
11 changed files with 76 additions and 15 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@ -82,7 +82,7 @@ jobs:
          ref: main
          fetch-depth: 0  # To fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@ -85,7 +85,7 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -110,7 +110,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -152,7 +152,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -194,7 +194,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -239,7 +239,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -285,7 +285,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -351,7 +351,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -401,7 +401,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -454,7 +454,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -513,7 +513,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
@ -608,7 +608,7 @@ jobs:
        with:
          fetch-depth: 0 # to fetch all commits
      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -70,7 +70,7 @@ jobs:
          gpg --import private.pgp

      - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
        timeout-minutes: 1
        with:
          distribution: 'temurin'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,22 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2

 ## [Unreleased]

+## [1.5.2 (929)] - 2025-04-09
+
+### Changed
+- The Security Warning screen has been removed from onboarding of the FOSS app build type
+
+## [1.5.2 (926)] - 2025-04-03
+
+### Changed
+- Adopted Zcash SDK v2.2.11
+
+### Fixed
+- Database migration bugs in SDK's `zcash_client_sqlite 0.16.0` and `0.16.1` have
+  been fixed by updating to `zcash_client_sqlite 0.16.2`. These caused a few
+  wallets to stop working after the Zcash SDK v2.2.9 upgrade due to failed database
+  migrations.
+
 ## [1.5.1 (925)] - 2025-03-31

 ### Changed
--- a/docs/whatsNew/WHATS_NEW_EN.md
+++ b/docs/whatsNew/WHATS_NEW_EN.md
@ -12,6 +12,21 @@ directly impact users rather than highlighting other key architectural updates.*

 ## [Unreleased]

+## [1.5.2 (929)] - 2025-04-09
+
+### Fixed
+- 1.5 Bug Fix release!
+- We fixed a migration issue impacting some users on 1.5 app version.
+- We also removed the redundant Security Warning screen which was incorrectly informing the user about crash 
+  reporting not included in Zashi Android FOSS version.
+
+
+## [1.5.2 (926)] - 2025-04-03
+
+### Fixed:
+- 1.5 Bug Fix release!
+- We fixed a migration issue impacting some users on 1.5 app version.
+
 ## [1.5.1 (925)] - 2025-03-31

 ### Added:
--- a/docs/whatsNew/WHATS_NEW_ES.md
+++ b/docs/whatsNew/WHATS_NEW_ES.md
@ -12,6 +12,20 @@ directly impact users rather than highlighting other key architectural updates.*

 ## [Unreleased]

+## [1.5.2 (929)] - 2025-04-09
+
+### Corregido
+- ¡Corrección de errores 1.5!
+- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app.
+- También eliminamos la pantalla de Advertencia de Seguridad redundante que informaba incorrectamente al usuario 
+  sobre informes de fallas no incluidos en la versión Zashi Android FOSS.
+
+## [1.5.2 (926)] - 2025-04-03
+
+### Corregido:
+- ¡Corrección de errores 1.5!
+- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app.
+
 ## [1.5.1 (925)] - 2025-03-31

 ### Añadido:
--- a/fastlane/metadata/android/en-US/changelogs/926.txt
+++ b/fastlane/metadata/android/en-US/changelogs/926.txt
@ -0,0 +1,3 @@
+Fixed:
+- 1.5 Bug Fix release!
+- We fixed a migration issue impacting some users on 1.5 app version.
--- a/fastlane/metadata/android/en-US/changelogs/929.txt
+++ b/fastlane/metadata/android/en-US/changelogs/929.txt
@ -0,0 +1,5 @@
+Fixed:
+- 1.5 Bug Fix release!
+- We fixed a migration issue impacting some users on 1.5 app version.
+- We also removed the redundant Security Warning screen which was incorrectly informing the user about crash reporting
+not included in Zashi Android FOSS version.
--- a/fastlane/metadata/android/es/changelogs/926.txt
+++ b/fastlane/metadata/android/es/changelogs/926.txt
@ -0,0 +1,3 @@
+Corregido:
+- ¡Corrección de errores 1.5!
+- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app.
--- a/fastlane/metadata/android/es/changelogs/929.txt
+++ b/fastlane/metadata/android/es/changelogs/929.txt
@ -0,0 +1,5 @@
+Corregido:
+- ¡Corrección de errores 1.5!
+- Solucionamos un problema de migración que afectaba a algunos usuarios de la versión 1.5 de la app.
+- También eliminamos la pantalla de Advertencia de Seguridad redundante que informaba incorrectamente al usuario sobre
+informes de fallas no incluidos en la versión Zashi Android FOSS.
--- a/gradle.properties
+++ b/gradle.properties
@ -61,7 +61,7 @@ NDK_DEBUG_SYMBOL_LEVEL=symbol_table
 # VERSION_CODE is effectively ignored. VERSION_NAME is suffixed with the version code.
 # If not using automated Google Play deployment, then these serve as the actual version numbers.
 ZCASH_VERSION_CODE=1
-ZCASH_VERSION_NAME=1.5.1
+ZCASH_VERSION_NAME=1.5.2

 # Set these fields, as you need them (e.g. with values "Zcash X" and "co.electriccoin.zcash.x")
 # to distinguish a different release build that can be installed alongside the official version
@ -211,7 +211,7 @@ ZIP_321_VERSION = 0.0.6
 # WARNING: Ensure a non-snapshot version is used before releasing to production
 ZCASH_BIP39_VERSION=1.0.9
 # WARNING: Ensure a non-snapshot version is used before releasing to production
-ZCASH_SDK_VERSION=2.2.10-SNAPSHOT
+ZCASH_SDK_VERSION=2.2.11

 # Toolchain is the Java version used to build the application, which is separate from the
 # Java version used to run the application.