Merge pull request #1476 from SatoshiPortal/tranfer-flow-improvements

More intuitive transfer flow for receive exact amount and max toggle

Author: i5hi

lib/features/swap/presentation/transfer_bloc.dart

@@ -87,7 +87,7 @@ class TransferBloc extends Bloc<TransferEvent, TransferState> {
     on<TransferConfirmed>(_onConfirmed);
     on<TransferSendToExternalToggled>(_onSendToExternalToggled);
     on<TransferExternalAddressChanged>(_onExternalAddressChanged);
-    on<TransferSendExactAmountToggled>(_onSendExactAmountToggled);
+    on<TransferReceiveExactAmountToggled>(_onReceiveExactAmountToggled);
   }
 
   final GetSettingsUsecase _getSettingsUsecase;
@@ -288,7 +288,7 @@ class TransferBloc extends Bloc<TransferEvent, TransferState> {
               : ConvertAmount.btcToSats(double.parse(event.amount));
 
       int paymentAmountSat = inputAmountSat;
-      if (state.sendExactAmount) {
+      if (state.receiveExactAmount) {
         final swapFees = state.swapFees;
         if (swapFees == null) {
           emit(
@@ -531,6 +531,7 @@ class TransferBloc extends Bloc<TransferEvent, TransferState> {
         sendToExternal: event.enabled,
         externalAddress: event.enabled ? state.externalAddress : '',
         externalAddressError: event.enabled ? null : null,
+        receiveExactAmount: event.enabled,
       ),
     );
   }
@@ -654,9 +655,9 @@ class TransferBloc extends Bloc<TransferEvent, TransferState> {
           state.copyWith(
             externalAddress: address,
             externalAddressError: null,
-            sendExactAmount:
+            receiveExactAmount:
                 // ignore: avoid_bool_literals_in_conditional_expressions
-                bip21AmountSat != null ? true : state.sendExactAmount,
+                bip21AmountSat != null ? true : state.receiveExactAmount,
             amount: bip21AmountText ?? state.amount,
           ),
         );
@@ -692,11 +693,11 @@ class TransferBloc extends Bloc<TransferEvent, TransferState> {
     }
   }
 
-  Future<void> _onSendExactAmountToggled(
-    TransferSendExactAmountToggled event,
+  Future<void> _onReceiveExactAmountToggled(
+    TransferReceiveExactAmountToggled event,
     Emitter<TransferState> emit,
   ) async {
-    emit(state.copyWith(sendExactAmount: event.enabled));
+    emit(state.copyWith(receiveExactAmount: event.enabled));
   }
 
   Future<void> _onConfirmed(

lib/features/swap/presentation/transfer_event.dart

@@ -15,6 +15,6 @@ sealed class TransferEvent with _$TransferEvent {
       TransferSendToExternalToggled;
   const factory TransferEvent.externalAddressChanged(String address) =
       TransferExternalAddressChanged;
-  const factory TransferEvent.sendExactAmountToggled(bool enabled) =
-      TransferSendExactAmountToggled;
+  const factory TransferEvent.receiveExactAmountToggled(bool enabled) =
+      TransferReceiveExactAmountToggled;
 }

lib/features/swap/presentation/transfer_state.dart

@@ -27,7 +27,7 @@ sealed class TransferState with _$TransferState {
     @Default(false) bool sendToExternal,
     @Default('') String externalAddress,
     String? externalAddressError,
-    @Default(true) bool sendExactAmount,
+    @Default(false) bool receiveExactAmount,
     @Default('') String amount,
   }) = _TransferState;
   const TransferState._();

lib/features/swap/ui/pages/swap_page.dart

@@ -190,21 +190,21 @@ class _SwapPageState extends State<SwapPage> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       BlocSelector<TransferBloc, TransferState, bool>(
-                        selector: (state) => state.sendExactAmount,
-                        builder: (context, sendExactAmount) {
+                        selector: (state) => state.receiveExactAmount,
+                        builder: (context, receiveExactAmount) {
                           return Text(
-                            sendExactAmount
-                                ? 'Send exact amount'
+                            receiveExactAmount
+                                ? 'Receive exact amount'
                                 : 'Subtract fees from amount',
                             style: context.font.bodyLarge,
                           );
                         },
                       ),
                       BlocSelector<TransferBloc, TransferState, bool>(
-                        selector: (state) => state.sendExactAmount,
-                        builder: (context, sendExactAmount) {
+                        selector: (state) => state.receiveExactAmount,
+                        builder: (context, receiveExactAmount) {
                           return Switch(
-                            value: sendExactAmount,
+                            value: receiveExactAmount,
                             activeColor: context.colour.onSecondary,
                             activeTrackColor: context.colour.secondary,
                             inactiveThumbColor: context.colour.onSecondary,
@@ -214,7 +214,7 @@ class _SwapPageState extends State<SwapPage> {
                             >((Set<WidgetState> states) => Colors.transparent),
                             onChanged: (value) {
                               context.read<TransferBloc>().add(
-                                TransferEvent.sendExactAmountToggled(value),
+                                TransferEvent.receiveExactAmountToggled(value),
                               );
                             },
                           );

lib/features/swap/ui/widgets/swap_balance_row.dart

@@ -35,8 +35,8 @@ class SwapBalanceRow extends StatelessWidget {
             ? maxAmountSat
             : ConvertAmount.satsToBtc(maxAmountSat ?? 0);
 
-    final sendExactAmount = context.select(
-      (TransferBloc bloc) => bloc.state.sendExactAmount,
+    final receiveExactAmount = context.select(
+      (TransferBloc bloc) => bloc.state.receiveExactAmount,
     );
 
     return Row(
@@ -58,8 +58,11 @@ class SwapBalanceRow extends StatelessWidget {
           textColor: context.colour.secondary,
           textStyle: context.font.labelLarge,
           disabled:
-              sendExactAmount || maxAmountSat == null || maxAmountSat <= 0,
+              receiveExactAmount || maxAmountSat == null || maxAmountSat <= 0,
           onPressed: () {
+            context.read<TransferBloc>().add(
+              const TransferEvent.receiveExactAmountToggled(false),
+            );
             amountController.text = maxAmount.toString();
           },
         ),