diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt index 52077825f9..9e3ed99e95 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/Interfaces.kt @@ -300,9 +300,10 @@ interface IBalanceAdapter { data class BalanceData( val available: BigDecimal, val timeLocked: BigDecimal = BigDecimal.ZERO, - val notRelayed: BigDecimal = BigDecimal.ZERO + val notRelayed: BigDecimal = BigDecimal.ZERO, + val pending: BigDecimal = BigDecimal.ZERO, ) { - val total get() = available + timeLocked + notRelayed + val total get() = available + timeLocked + notRelayed + pending } interface IReceiveAdapter { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/zcash/ZcashAdapter.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/zcash/ZcashAdapter.kt index 2e2aab03f6..ae7542d08f 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/zcash/ZcashAdapter.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/adapters/zcash/ZcashAdapter.kt @@ -156,7 +156,7 @@ class ZcashAdapter( get() = adapterStateUpdatedSubject.toFlowable(BackpressureStrategy.BUFFER) override val balanceData: BalanceData - get() = BalanceData(balance, balanceLocked) + get() = BalanceData(balance, pending = balancePending) val statusInfo: Map get() { @@ -173,7 +173,7 @@ class ZcashAdapter( return walletBalance.available.convertZatoshiToZec(decimalCount) } - private val balanceLocked: BigDecimal + private val balancePending: BigDecimal get() { val walletBalance = synchronizer.saplingBalances.value ?: return BigDecimal.ZERO return walletBalance.pending.convertZatoshiToZec(decimalCount) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewItemFactory.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewItemFactory.kt index c0eeb4d8dc..977ec4db5a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewItemFactory.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/balance/BalanceViewItemFactory.kt @@ -207,7 +207,24 @@ class BalanceViewItemFactory { LockedValue( title = TranslatableString.ResString(R.string.Balance_LockedAmount_Title), infoTitle = TranslatableString.ResString(R.string.Info_LockTime_Title), - info = TranslatableString.ResString(R.string.Info_LockTime_Description_Static), + info = TranslatableString.ResString(R.string.Info_ProcessingBalance_Description), + coinValue = it + ) + ) + } + + lockedCoinValue( + state, + item.balanceData.pending, + hideBalance, + wallet.decimal, + wallet.token + )?.let { + add( + LockedValue( + title = TranslatableString.ResString(R.string.Balance_ProcessingBalance_Title), + infoTitle = TranslatableString.ResString(R.string.Info_ProcessingBalance_Title), + info = TranslatableString.ResString(R.string.Info_ProcessingBalance_Description), coinValue = it ) ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d99b7a0d32..01e05fffc1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -435,6 +435,7 @@ Set Amount Address type Locked + Processing Broadcasting Memo (Tag) Can\'t recognize @@ -932,6 +933,9 @@ Broadcast The transaction holding this amount is broadcasted but not yet accepted by the network. + Processing amount + Transactions with this amount still syncing. And when they are confirmed, these tokens will be available for spending + Double Spend Double Spend Risk! There is another transaction on the blockchain that is trying to spend inputs used in this transaction. Only one transaction will be accepted by the network This Tx