Display only 3 decimals within fee amount (#1387)
- The proper solution will be added with #1047
This commit is contained in:
parent
66ba050719
commit
45ca274f98
|
@ -47,6 +47,7 @@ import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
import cash.z.ecc.android.sdk.ext.convertZatoshiToZecString
|
||||||
import cash.z.ecc.android.sdk.model.FiatCurrencyConversionRateState
|
import cash.z.ecc.android.sdk.model.FiatCurrencyConversionRateState
|
||||||
import cash.z.ecc.android.sdk.model.Zatoshi
|
import cash.z.ecc.android.sdk.model.Zatoshi
|
||||||
import cash.z.ecc.android.sdk.model.toZecString
|
import cash.z.ecc.android.sdk.model.toZecString
|
||||||
|
@ -318,6 +319,8 @@ private fun BalancesMainContent(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const val DEFAULT_LESS_THAN_FEE = 100_000L
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun TransparentBalancePanel(
|
fun TransparentBalancePanel(
|
||||||
onShielding: () -> Unit,
|
onShielding: () -> Unit,
|
||||||
|
@ -366,8 +369,7 @@ fun TransparentBalancePanel(
|
||||||
id = R.string.balances_transparent_balance_fee,
|
id = R.string.balances_transparent_balance_fee,
|
||||||
// TODO [#1047]: Representing Zatoshi amount
|
// TODO [#1047]: Representing Zatoshi amount
|
||||||
// TODO [#1047]: https://github.com/Electric-Coin-Company/zashi-android/issues/1047
|
// TODO [#1047]: https://github.com/Electric-Coin-Company/zashi-android/issues/1047
|
||||||
@Suppress("MagicNumber")
|
Zatoshi(DEFAULT_LESS_THAN_FEE).convertZatoshiToZecString(maxDecimals = 3)
|
||||||
Zatoshi(100_000L).toZecString()
|
|
||||||
),
|
),
|
||||||
textFontWeight = FontWeight.SemiBold
|
textFontWeight = FontWeight.SemiBold
|
||||||
)
|
)
|
||||||
|
|
|
@ -46,12 +46,12 @@ import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.text.input.KeyboardType
|
import androidx.compose.ui.text.input.KeyboardType
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
|
import cash.z.ecc.android.sdk.ext.convertZatoshiToZecString
|
||||||
import cash.z.ecc.android.sdk.model.Memo
|
import cash.z.ecc.android.sdk.model.Memo
|
||||||
import cash.z.ecc.android.sdk.model.MonetarySeparators
|
import cash.z.ecc.android.sdk.model.MonetarySeparators
|
||||||
import cash.z.ecc.android.sdk.model.Zatoshi
|
import cash.z.ecc.android.sdk.model.Zatoshi
|
||||||
import cash.z.ecc.android.sdk.model.ZecSend
|
import cash.z.ecc.android.sdk.model.ZecSend
|
||||||
import cash.z.ecc.android.sdk.model.ZecSendExt
|
import cash.z.ecc.android.sdk.model.ZecSendExt
|
||||||
import cash.z.ecc.android.sdk.model.toZecString
|
|
||||||
import cash.z.ecc.android.sdk.type.AddressType
|
import cash.z.ecc.android.sdk.type.AddressType
|
||||||
import cash.z.ecc.sdk.fixture.ZatoshiFixture
|
import cash.z.ecc.sdk.fixture.ZatoshiFixture
|
||||||
import cash.z.ecc.sdk.type.ZcashCurrency
|
import cash.z.ecc.sdk.type.ZcashCurrency
|
||||||
|
@ -434,7 +434,7 @@ fun SendButton(
|
||||||
id = R.string.send_fee,
|
id = R.string.send_fee,
|
||||||
// TODO [#1047]: Representing Zatoshi amount
|
// TODO [#1047]: Representing Zatoshi amount
|
||||||
// TODO [#1047]: https://github.com/Electric-Coin-Company/zashi-android/issues/1047
|
// TODO [#1047]: https://github.com/Electric-Coin-Company/zashi-android/issues/1047
|
||||||
Zatoshi(DEFAULT_LESS_THAN_FEE).toZecString()
|
Zatoshi(DEFAULT_LESS_THAN_FEE).convertZatoshiToZecString(maxDecimals = 3)
|
||||||
),
|
),
|
||||||
textFontWeight = FontWeight.SemiBold,
|
textFontWeight = FontWeight.SemiBold,
|
||||||
modifier =
|
modifier =
|
||||||
|
|
Loading…
Reference in New Issue