From 2c9bd6c5dac9512d9140fdfe13b370ecfdaeff83 Mon Sep 17 00:00:00 2001 From: fosse Date: Wed, 6 Sep 2023 09:37:52 -0400 Subject: [PATCH] nano fixes pt.1 --- cw_nano/lib/cw_nano.dart | 2 +- cw_nano/lib/nano_balance.dart | 6 +----- .../wallet_address_list/wallet_address_list_view_model.dart | 3 --- lib/view_model/wallet_keys_view_model.dart | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/cw_nano/lib/cw_nano.dart b/cw_nano/lib/cw_nano.dart index af9ea7ee0..08e23a232 100644 --- a/cw_nano/lib/cw_nano.dart +++ b/cw_nano/lib/cw_nano.dart @@ -1,4 +1,4 @@ -library cw_ethereum; +library cw_nano; /// A Calculator. class Calculator { diff --git a/cw_nano/lib/nano_balance.dart b/cw_nano/lib/nano_balance.dart index 23abc242e..231aaa480 100644 --- a/cw_nano/lib/nano_balance.dart +++ b/cw_nano/lib/nano_balance.dart @@ -3,12 +3,8 @@ import 'package:cw_core/currency.dart'; import 'package:cw_core/monero_amount_format.dart'; import 'package:cw_nano/nano_util.dart'; -String rawToFormattedAmount(BigInt amount, Currency currency) { - return ""; -} - BigInt stringAmountToBigInt(String amount) { - return BigInt.zero; + return BigInt.parse(NanoUtil.getAmountAsRaw(amount, NanoUtil.rawPerNano)); } class NanoBalance extends Balance { diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart index 1f65f0bef..b35c76cdd 100644 --- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart +++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart @@ -133,9 +133,6 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo _cryptoNumberFormat = NumberFormat(_cryptoNumberPattern), hasAccounts = appStore.wallet!.type == WalletType.monero || appStore.wallet!.type == WalletType.haven, - /* || - appStore.wallet!.type == WalletType.nano || - appStore.wallet!.type == WalletType.banano,*/ // TODO: nano additional accounts disabled for now amount = '', super(appStore: appStore) { _init(); diff --git a/lib/view_model/wallet_keys_view_model.dart b/lib/view_model/wallet_keys_view_model.dart index c54bac3a2..fbf9311de 100644 --- a/lib/view_model/wallet_keys_view_model.dart +++ b/lib/view_model/wallet_keys_view_model.dart @@ -110,7 +110,7 @@ abstract class WalletKeysViewModelBase with Store { final keys = nano!.getKeys(_appStore.wallet!); // we don't necessarily have the seed phrase for nano / banano: - if (_appStore.wallet!.seed != "") { + if (_appStore.wallet!.seed != null) { items.addAll([ StandartListItem(title: S.current.wallet_seed, value: _appStore.wallet!.seed!), ]);