fix: default coin units length and banano unit names

This commit is contained in:
julian 2023-06-07 13:17:49 -06:00
parent 00d4ab11c9
commit b6ed690eb6
3 changed files with 94 additions and 92 deletions

View file

@ -46,6 +46,7 @@ class _ChooseUnitSheetState extends ConsumerState<ChooseUnitSheet> {
top: 10, top: 10,
bottom: 0, bottom: 0,
), ),
child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -71,7 +72,7 @@ class _ChooseUnitSheetState extends ConsumerState<ChooseUnitSheet> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"Phrase length", "Coin units",
style: STextStyles.pageTitleH2(context), style: STextStyles.pageTitleH2(context),
textAlign: TextAlign.left, textAlign: TextAlign.left,
), ),
@ -137,6 +138,7 @@ class _ChooseUnitSheetState extends ConsumerState<ChooseUnitSheet> {
], ],
), ),
), ),
),
); );
} }
} }

View file

@ -81,7 +81,8 @@ extension AmountUnitExt on AmountUnit {
return "gwei"; return "gwei";
} else if (coin == Coin.wownero || } else if (coin == Coin.wownero ||
coin == Coin.monero || coin == Coin.monero ||
coin == Coin.nano) { coin == Coin.nano ||
coin == Coin.banano) {
return "n${coin.ticker}"; return "n${coin.ticker}";
} else { } else {
return "sats"; return "sats";
@ -91,7 +92,8 @@ extension AmountUnitExt on AmountUnit {
return "mwei"; return "mwei";
} else if (coin == Coin.wownero || } else if (coin == Coin.wownero ||
coin == Coin.monero || coin == Coin.monero ||
coin == Coin.nano) { coin == Coin.nano ||
coin == Coin.banano) {
return "p${coin.ticker}"; return "p${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
@ -99,7 +101,7 @@ extension AmountUnitExt on AmountUnit {
case AmountUnit.femto: case AmountUnit.femto:
if (coin == Coin.ethereum) { if (coin == Coin.ethereum) {
return "kwei"; return "kwei";
} else if (coin == Coin.nano) { } else if (coin == Coin.nano || coin == Coin.banano) {
return "f${coin.ticker}"; return "f${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
@ -107,31 +109,31 @@ extension AmountUnitExt on AmountUnit {
case AmountUnit.atto: case AmountUnit.atto:
if (coin == Coin.ethereum) { if (coin == Coin.ethereum) {
return "wei"; return "wei";
} else if (coin == Coin.nano) { } else if (coin == Coin.nano || coin == Coin.banano) {
return "a${coin.ticker}"; return "a${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
} }
case AmountUnit.zepto: case AmountUnit.zepto:
if (coin == Coin.nano) { if (coin == Coin.nano || coin == Coin.banano) {
return "z${coin.ticker}"; return "z${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
} }
case AmountUnit.yocto: case AmountUnit.yocto:
if (coin == Coin.nano) { if (coin == Coin.nano || coin == Coin.banano) {
return "y${coin.ticker}"; return "y${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
} }
case AmountUnit.ronto: case AmountUnit.ronto:
if (coin == Coin.nano) { if (coin == Coin.nano || coin == Coin.banano) {
return "r${coin.ticker}"; return "r${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";
} }
case AmountUnit.quecto: case AmountUnit.quecto:
if (coin == Coin.nano) { if (coin == Coin.nano || coin == Coin.banano) {
return "q${coin.ticker}"; return "q${coin.ticker}";
} else { } else {
return "invalid"; return "invalid";

View file

@ -8,8 +8,6 @@
* *
*/ */
import 'dart:math';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:stackwallet/db/hive/db.dart'; import 'package:stackwallet/db/hive/db.dart';
import 'package:stackwallet/utilities/amount/amount_unit.dart'; import 'package:stackwallet/utilities/amount/amount_unit.dart';
@ -866,8 +864,8 @@ class Prefs extends ChangeNotifier {
boxName: DB.boxNamePrefs, boxName: DB.boxNamePrefs,
key: "maxDecimalsFor${coin.name}", key: "maxDecimalsFor${coin.name}",
) as int? ?? ) as int? ??
max(coin.decimals, (coin.decimals > 18 ? 18 : coin.decimals);
18); // use some sane max rather than up to 30 that nano uses // use some sane max rather than up to 30 that nano uses
_amountDecimals[coin] = decimals; _amountDecimals[coin] = decimals;
} }
} }