Adopt SDK 1.17.0-beta01 changes
This commit is contained in:
parent
8ca30f19c4
commit
de00a6eb51
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ object WalletSnapshotFixture {
|
|||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
),
|
||||
orchardBalance: WalletBalance = ORCHARD_BALANCE,
|
||||
saplingBalance: WalletBalance = SAPLING_BALANCE,
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Reference in New Issue