From de00a6eb517c07ebd64be4027cfa2b85334ba552 Mon Sep 17 00:00:00 2001
From: Carter Jernigan <git@carterjernigan.com>
Date: Mon, 22 May 2023 11:47:58 -0400
Subject: [PATCH] Adopt SDK 1.17.0-beta01 changes

---
 gradle.properties                                        | 2 +-
 .../zcash/ui/fixture/WalletSnapshotFixture.kt            | 1 +
 .../zcash/ui/screen/home/model/WalletDisplayValues.kt    | 3 +--
 .../electriccoin/zcash/ui/screen/home/view/HomeView.kt   | 9 ++-------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 29fdef66..bb1303a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -153,7 +153,7 @@ ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
 ZCASH_BIP39_VERSION=1.0.4
 # TODO [#279]: Revert to stable SDK before app release
 # TODO [#279]: https://github.com/zcash/secant-android-wallet/issues/279
-ZCASH_SDK_VERSION=1.17.0-beta01-SNAPSHOT
+ZCASH_SDK_VERSION=1.17.0-beta01
 ZXING_VERSION=3.5.1
 
 
diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt
index 210a8a53..68c77500 100644
--- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt
+++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt
@@ -25,6 +25,7 @@ object WalletSnapshotFixture {
             null,
             null,
             null,
+            null
         ),
         orchardBalance: WalletBalance = ORCHARD_BALANCE,
         saplingBalance: WalletBalance = SAPLING_BALANCE,
diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletDisplayValues.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletDisplayValues.kt
index 63af57f2..e95a9712 100644
--- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletDisplayValues.kt
+++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletDisplayValues.kt
@@ -51,8 +51,7 @@ data class WalletDisplayValues(
                     }
                     statusText = context.getString(R.string.home_status_syncing_format, progressPercent)
                 }
-                Synchronizer.Status.SYNCED,
-                Synchronizer.Status.ENHANCING -> {
+                Synchronizer.Status.SYNCED -> {
                     statusText = if (updateAvailable) {
                         context.getString(R.string.home_status_update)
                     } else {
diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt
index 94588258..e24b634f 100644
--- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt
+++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt
@@ -314,7 +314,7 @@ private fun HomeMainContent(
     ) {
         Status(walletSnapshot, isUpdateAvailable, isFiatConversionEnabled, isCircularProgressBarEnabled)
 
-        if (isSyncing(walletSnapshot.status)) {
+        if (walletSnapshot.status == Synchronizer.Status.SYNCING) {
             Spacer(modifier = Modifier.height(ZcashTheme.dimens.spacingLarge))
             Body(text = stringResource(id = R.string.home_information))
         }
@@ -340,17 +340,12 @@ private fun HomeMainContent(
 
         History(transactionHistory)
 
-        if (isKeepScreenOnDuringSync == true && isSyncing(walletSnapshot.status)) {
+        if (isKeepScreenOnDuringSync == true && walletSnapshot.status == Synchronizer.Status.SYNCING) {
             DisableScreenTimeout()
         }
     }
 }
 
-private fun isSyncing(status: Synchronizer.Status): Boolean {
-    return status == Synchronizer.Status.SYNCING ||
-        status == Synchronizer.Status.ENHANCING
-}
-
 @Composable
 @Suppress("LongMethod", "MagicNumber")
 private fun Status(