diff --git a/lib/pages/exchange_view/confirm_change_now_send.dart b/lib/pages/exchange_view/confirm_change_now_send.dart
index 60d543719..85072c98c 100644
--- 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_4_view.dart b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart
index 874f57385..65270ca3e 100644
--- 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
index 1fbed82eb..655f2afe7 100644
--- 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),