Merge pull request #390 from kumulynja/fix-amount-change-send-button-…

…issue fix: check balance on amount change
SatoshiPortal · Dec 24, 2024 · 697d3f0 · 697d3f0
2 parents 37e7c97 + 03344eb
commit 697d3f0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/lib/send/bloc/send_cubit.dart b/lib/send/bloc/send_cubit.dart
@@ -266,9 +266,6 @@ class SendCubit extends Cubit<SendState> {
     if (changeWallet == true) {
       selectWallets();
     }
-    if (_currencyCubit.state.amount != 0) {
-      _checkBalance();
-    }
   }
 
   void selectWallets({bool fromStart = false}) {
@@ -365,7 +362,7 @@ class SendCubit extends Cubit<SendState> {
       if (amt == 0) {
         emit(state.copyWith(showSendButton: false));
       } else {
-        _checkBalance();
+        checkBalance();
       }
       // emit(state.copyWith(showSendButton: true));
 
@@ -408,7 +405,7 @@ class SendCubit extends Cubit<SendState> {
     if (amt == 0) {
       emit(state.copyWith(showSendButton: false));
     } else {
-      _checkBalance();
+      checkBalance();
     }
 
     // emit(state.copyWith(showSendButton: true));
@@ -456,7 +453,7 @@ class SendCubit extends Cubit<SendState> {
     if (amount == 0) {
       emit(state.copyWith(showSendButton: false));
     } else {
-      _checkBalance();
+      checkBalance();
     }
 
     // emit(state.copyWith(showSendButton: true));
@@ -492,15 +489,20 @@ class SendCubit extends Cubit<SendState> {
     if (amount == 0) {
       emit(state.copyWith(showSendButton: false));
     } else {
-      _checkBalance();
+      checkBalance();
     }
     // emit(state.copyWith(showSendButton: true));
   }
 
-  void _checkBalance() {
+  void checkBalance() {
     final balance = state.selectedWalletBloc?.state.balanceSats() ?? 0;
     final amount = _currencyCubit.state.amount;
 
+    if (amount == 0) {
+      emit(state.copyWith(showSendButton: false));
+      return;
+    }
+
     if (balance < amount) {
       emit(
         state.copyWith(
@@ -544,7 +546,7 @@ class SendCubit extends Cubit<SendState> {
   void updateWalletBloc(WalletBloc walletBloc) {
     emit(state.copyWith(selectedWalletBloc: walletBloc));
     sendAllCoin(false);
-    _checkBalance();
+    checkBalance();
   }
 
   void disabledDropdownClicked() {
@@ -601,7 +603,7 @@ class SendCubit extends Cubit<SendState> {
     _currencyCubit.updateAmountDirect(amount);
     _currencyCubit.updateAmount(amount == 0 ? '' : amount.toString());
 
-    _checkBalance();
+    checkBalance();
   }
 
   void togglePayjoin(bool toggle) {

diff --git a/lib/send/listeners.dart b/lib/send/listeners.dart
@@ -23,6 +23,12 @@ class SendListeners extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocListener(
       listeners: [
+        BlocListener<CurrencyCubit, CurrencyState>(
+          listenWhen: (previous, current) => previous.amount != current.amount,
+          listener: (context, state) {
+            context.read<SendCubit>().checkBalance();
+          },
+        ),
         BlocListener<CreateSwapCubit, SwapState>(
           listenWhen: (previous, current) => previous.swapTx != current.swapTx,
           listener: (context, state) async {