Merge pull request #718 from cypherstack/wallets_refactor

Wallets refactor
cypherstack · Jan 17, 2024 · d521188 · d521188
2 parents d3cd8d9 + 393e27b
commit d521188
Show file tree

Hide file tree

Showing 30 changed files with 309 additions and 5,633 deletions.
diff --git a/lib/pages/exchange_view/confirm_change_now_send.dart b/lib/pages/exchange_view/confirm_change_now_send.dart
@@ -111,7 +111,7 @@ class _ConfirmChangeNowSendViewState
 
     try {
       if (wallet is FiroWallet && widget.shouldSendPublicFiroFunds == false) {
-        txidFuture = wallet.confirmSendLelantus(txData: widget.txData);
+        txidFuture = wallet.confirmSendSpark(txData: widget.txData);
       } else {
         txidFuture = wallet.confirmSend(txData: widget.txData);
       }

diff --git a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
@@ -224,8 +224,10 @@ class _Step2ViewState extends ConsumerState<Step2View> {
 
                                           _toController.text = wallet.info.name;
                                           model.recipientAddress = (await wallet
-                                                  .getCurrentReceivingAddress())!
-                                              .value;
+                                                      .getCurrentReceivingAddress())
+                                                  ?.value ??
+                                              wallet
+                                                  .info.cachedReceivingAddress;
 
                                           setState(() {
                                             enableNext =

diff --git a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart
@@ -241,10 +241,8 @@ class _Step4ViewState extends ConsumerState<Step4View> {
 
       Future<TxData> txDataFuture;
 
-      // TODO: [prio=high] Firo spark
-
       if (wallet is FiroWallet && !firoPublicSend) {
-        txDataFuture = wallet.prepareSendLelantus(
+        txDataFuture = wallet.prepareSendSpark(
           txData: TxData(
             recipients: [
               (

diff --git a/lib/pages/exchange_view/send_from_view.dart b/lib/pages/exchange_view/send_from_view.dart
@@ -287,7 +287,8 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
             recipients: [
               (
                 address: address,
-                amount: amount, isChange: false,
+                amount: amount,
+                isChange: false,
               ),
             ],
             memo: memo,
@@ -303,19 +304,21 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
               recipients: [
                 (
                   address: address,
-                  amount: amount, isChange: false,
+                  amount: amount,
+                  isChange: false,
                 ),
               ],
               feeRateType: FeeRateType.average,
             ),
           );
         } else {
-          txDataFuture = firoWallet.prepareSendLelantus(
+          txDataFuture = firoWallet.prepareSendSpark(
             txData: TxData(
               recipients: [
                 (
                   address: address,
-                  amount: amount, isChange: false,
+                  amount: amount,
+                  isChange: false,
                 ),
               ],
               // feeRateType: FeeRateType.average,
@@ -481,7 +484,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
                             ),
                             Text(
                               ref.watch(pAmountFormatter(coin)).format(ref
-                                  .watch(pWalletBalance(walletId))
+                                  .watch(pWalletBalanceTertiary(walletId))
                                   .spendable),
                               style: STextStyles.itemSubtitle(context),
                             ),
@@ -543,8 +546,7 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
                             Text(
                               ref.watch(pAmountFormatter(coin)).format(
                                     ref
-                                        .watch(
-                                            pWalletBalanceSecondary(walletId))
+                                        .watch(pWalletBalance(walletId))
                                         .spendable,
                                   ),
                               style: STextStyles.itemSubtitle(context),

diff --git a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
@@ -234,7 +234,10 @@ class _DesktopChooseFromStackState
                         CustomTextButton(
                           text: "Select wallet",
                           onTap: () async {
-                            final address = wallet.info.cachedReceivingAddress;
+                            final address =
+                                (await wallet.getCurrentReceivingAddress())
+                                        ?.value ??
+                                    wallet.info.cachedReceivingAddress;
 
                             if (mounted) {
                               Navigator.of(context).pop(