Merge pull request #1786 from SatoshiPortal/recipients-reuse-improvements

Recipients reuse improvements

Author: kumulynja

lib/core/exchange/data/datasources/bullbitcoin_api_datasource.dart

@@ -405,23 +405,29 @@ class BullbitcoinApiDatasource implements BitcoinPriceDatasource {
     }
     if (error != null) {
       final reason = error['data']['reason'];
-      final limitReason = reason['limit'];
-      if (limitReason != null) {
-        final isBelowLimit =
-            limitReason['conditionalOperator'] == 'GREATER_THAN_OR_EQUAL';
-        final limitAmount = limitReason['amount'] as String;
-        final limitCurrency = limitReason['currencyCode'] as String;
-        if (isBelowLimit) {
-          throw BullBitcoinApiMinAmountException(
-            minAmount: double.parse(limitAmount),
-            currency: limitCurrency,
-          );
-        } else {
-          throw BullBitcoinApiMaxAmountException(
-            maxAmount: double.parse(limitAmount),
-            currency: limitCurrency,
-          );
+      if (reason != null) {
+        final limitReason = reason['limit'];
+        if (limitReason != null) {
+          final isBelowLimit =
+              limitReason['conditionalOperator'] == 'GREATER_THAN_OR_EQUAL';
+          final limitAmount = limitReason['amount'] as String;
+          final limitCurrency = limitReason['currencyCode'] as String;
+          if (isBelowLimit) {
+            throw BullBitcoinApiMinAmountException(
+              minAmount: double.parse(limitAmount),
+              currency: limitCurrency,
+            );
+          } else {
+            throw BullBitcoinApiMaxAmountException(
+              maxAmount: double.parse(limitAmount),
+              currency: limitCurrency,
+            );
+          }
         }
+      } else {
+        throw Exception(
+          'Failed to create sell to recipient order: ${error['message']}',
+        );
       }
     }
 
@@ -776,10 +782,7 @@ class BullbitcoinApiDatasource implements BitcoinPriceDatasource {
         'id': 1,
         'method': 'createMyKYCIDDocument',
         'params': {
-          'element': {
-            'idTypeCode': docType,
-            'sourceDetail': sourceDetail,
-          },
+          'element': {'idTypeCode': docType, 'sourceDetail': sourceDetail},
         },
       }),
     });

lib/core/widgets/cards/action_card.dart

@@ -6,8 +6,6 @@ import 'package:bb_mobile/features/buy/ui/buy_router.dart';
 import 'package:bb_mobile/features/exchange/presentation/exchange_cubit.dart';
 import 'package:bb_mobile/features/exchange/ui/exchange_router.dart';
 import 'package:bb_mobile/features/pay/ui/pay_router.dart';
-import 'package:bb_mobile/features/recipients/frameworks/ui/routing/recipients_router.dart';
-import 'package:bb_mobile/features/recipients/interface_adapters/presenters/models/recipient_view_model.dart';
 import 'package:bb_mobile/features/sell/ui/sell_router.dart';
 import 'package:bb_mobile/features/settings/presentation/bloc/settings_cubit.dart';
 import 'package:bb_mobile/features/swap/ui/swap_router.dart';
@@ -37,10 +35,7 @@ class _ActionRow extends StatelessWidget {
       decoration: BoxDecoration(
         color: context.appColors.background,
         border: Border(
-          bottom: BorderSide(
-            color: context.appColors.outline,
-            width: 1,
-          ),
+          bottom: BorderSide(color: context.appColors.outline, width: 1),
         ),
       ),
       child: Material(
@@ -50,116 +45,92 @@ class _ActionRow extends StatelessWidget {
         child: SizedBox(
           height: 80,
           child: Row(
-          children: [
-            _ActionButton(
-              icon: Assets.icons.btc.path,
-              label: 'Buy',
-              onPressed: () {
-                if (Platform.isIOS) {
-                  final isSuperuser =
-                      context.read<SettingsCubit>().state.isSuperuser ?? false;
-                  if (isSuperuser) {
-                    context.pushNamed(BuyRoute.buy.name);
-                  } else {
-                    context.goNamed(ExchangeRoute.exchangeLanding.name);
-                  }
-                } else {
-                  context.pushNamed(BuyRoute.buy.name);
-                }
-              },
-              position: _ButtonPosition.first,
-              disabled: false,
-            ),
-            const Gap(1),
-            _ActionButton(
-              icon: Assets.icons.dollar.path,
-              label: 'Sell',
-              onPressed: () {
-                if (Platform.isIOS) {
-                  final isSuperuser =
-                      context.read<SettingsCubit>().state.isSuperuser ?? false;
-                  if (isSuperuser) {
-                    context.pushNamed(SellRoute.sell.name);
+            children: [
+              _ActionButton(
+                icon: Assets.icons.btc.path,
+                label: 'Buy',
+                onPressed: () {
+                  if (Platform.isIOS) {
+                    final isSuperuser =
+                        context.read<SettingsCubit>().state.isSuperuser ??
+                        false;
+                    if (isSuperuser) {
+                      context.pushNamed(BuyRoute.buy.name);
+                    } else {
+                      context.goNamed(ExchangeRoute.exchangeLanding.name);
+                    }
                   } else {
-                    context.goNamed(ExchangeRoute.exchangeLanding.name);
+                    context.pushNamed(BuyRoute.buy.name);
                   }
-                } else {
-                  context.pushNamed(SellRoute.sell.name);
-                }
-              },
-              position: _ButtonPosition.middle,
-              disabled: false,
-            ),
-            const Gap(1),
-            _ActionButton(
-              icon: Assets.icons.rightArrow.path,
-              label: 'Pay',
-              onPressed: () {
-                final notLoggedIn =
-                    context.read<ExchangeCubit>().state.notLoggedIn;
-
-                if (notLoggedIn) {
-                  context.goNamed(ExchangeRoute.exchangeLanding.name);
-                } else {
+                },
+                position: _ButtonPosition.first,
+                disabled: false,
+              ),
+              const Gap(1),
+              _ActionButton(
+                icon: Assets.icons.dollar.path,
+                label: 'Sell',
+                onPressed: () {
                   if (Platform.isIOS) {
                     final isSuperuser =
                         context.read<SettingsCubit>().state.isSuperuser ??
                         false;
                     if (isSuperuser) {
-                      // Reuse the recipients screen to select a recipient before
-                      // navigating to the Pay screen.
-                      context.pushNamed(
-                        RecipientsRoute.recipients.name,
-                        extra: RecipientsRouteExtra(
-                          onRecipientSelected: (
-                            RecipientViewModel recipient,
-                          ) async {
-                            await context.pushNamed(
-                              PayRoute.pay.name,
-                              extra: recipient,
-                            );
-                          },
-                        ),
-                      );
+                      context.pushNamed(SellRoute.sell.name);
                     } else {
                       context.goNamed(ExchangeRoute.exchangeLanding.name);
                     }
                   } else {
-                    // Reuse the recipients screen to select a recipient before
-                    // navigating to the Pay screen.
-                    context.pushNamed(
-                      RecipientsRoute.recipients.name,
-                      extra: RecipientsRouteExtra(
-                        onRecipientSelected: (
-                          RecipientViewModel recipient,
-                        ) async {
-                          await context.pushNamed(
-                            PayRoute.pay.name,
-                            extra: recipient,
-                          );
-                        },
-                      ),
-                    );
+                    context.pushNamed(SellRoute.sell.name);
+                  }
+                },
+                position: _ButtonPosition.middle,
+                disabled: false,
+              ),
+              const Gap(1),
+              _ActionButton(
+                icon: Assets.icons.rightArrow.path,
+                label: 'Pay',
+                onPressed: () {
+                  final notLoggedIn = context
+                      .read<ExchangeCubit>()
+                      .state
+                      .notLoggedIn;
+
+                  if (notLoggedIn) {
+                    context.goNamed(ExchangeRoute.exchangeLanding.name);
+                  } else {
+                    if (Platform.isIOS) {
+                      final isSuperuser =
+                          context.read<SettingsCubit>().state.isSuperuser ??
+                          false;
+                      if (isSuperuser) {
+                        context.pushNamed(PayRoute.pay.name);
+                      } else {
+                        context.goNamed(ExchangeRoute.exchangeLanding.name);
+                      }
+                    } else {
+                      context.pushNamed(PayRoute.pay.name);
+                    }
                   }
-                }
-              },
-              position: _ButtonPosition.middle,
-              disabled: false,
-            ),
-            const Gap(1),
-            _ActionButton(
-              icon: Assets.icons.swap.path,
-              label: 'Transfer',
-              onPressed: () {
-                context.pushNamed(SwapRoute.swap.name);
-              },
-              position: _ButtonPosition.last,
-              disabled: false,
-            ),
-          ],
+                },
+                position: _ButtonPosition.middle,
+                disabled: false,
+              ),
+              const Gap(1),
+              _ActionButton(
+                icon: Assets.icons.swap.path,
+                label: 'Transfer',
+                onPressed: () {
+                  context.pushNamed(SwapRoute.swap.name);
+                },
+                position: _ButtonPosition.last,
+                disabled: false,
+              ),
+            ],
+          ),
         ),
       ),
-      ),
     );
   }
 }

lib/features/pay/pay_locator.dart

@@ -11,7 +11,6 @@ import 'package:bb_mobile/core/wallet/domain/usecases/get_wallet_utxos_usecase.d
 import 'package:bb_mobile/features/pay/domain/create_pay_order_usecase.dart';
 import 'package:bb_mobile/features/pay/domain/refresh_pay_order_usecase.dart';
 import 'package:bb_mobile/features/pay/presentation/pay_bloc.dart';
-import 'package:bb_mobile/features/recipients/interface_adapters/presenters/models/recipient_view_model.dart';
 import 'package:bb_mobile/features/send/domain/usecases/calculate_bitcoin_absolute_fees_usecase.dart';
 import 'package:bb_mobile/features/send/domain/usecases/calculate_liquid_absolute_fees_usecase.dart';
 
@@ -54,9 +53,8 @@ class PayLocator {
   }
 
   static void registerBlocs(GetIt locator) {
-    locator.registerFactoryParam<PayBloc, RecipientViewModel, void>(
-      (recipient, _) => PayBloc(
-        recipient: recipient,
+    locator.registerFactory<PayBloc>(
+      () => PayBloc(
         getExchangeUserSummaryUsecase: locator<GetExchangeUserSummaryUsecase>(),
         placePayOrderUsecase: locator<PlacePayOrderUsecase>(),
         refreshPayOrderUsecase: locator<RefreshPayOrderUsecase>(),

lib/features/pay/presentation/pay_bloc.dart

@@ -37,7 +37,6 @@ part 'pay_state.dart';
 
 class PayBloc extends Bloc<PayEvent, PayState> {
   PayBloc({
-    required RecipientViewModel recipient,
     required GetExchangeUserSummaryUsecase getExchangeUserSummaryUsecase,
     required PlacePayOrderUsecase placePayOrderUsecase,
     required RefreshPayOrderUsecase refreshPayOrderUsecase,
@@ -76,8 +75,9 @@ class PayBloc extends Bloc<PayEvent, PayState> {
        _getAddressAtIndexUsecase = getAddressAtIndexUsecase,
        _getWalletUtxosUsecase = getWalletUtxosUsecase,
        _getOrderUsecase = getOrderUsecase,
-       super(PayAmountInputState(selectedRecipient: recipient)) {
+       super(PayRecipientSelectionState()) {
     on<PayStarted>(_onStarted);
+    on<PayRecipientSelected>(_onRecipientSelected);
     on<PayAmountInputContinuePressed>(_onAmountInputContinuePressed);
     on<PayWalletSelected>(_onWalletSelected);
     on<PayExternalWalletNetworkSelected>(_onExternalWalletNetworkSelected);
@@ -111,31 +111,55 @@ class PayBloc extends Bloc<PayEvent, PayState> {
   Timer? _pollingTimer;
 
   Future<void> _onStarted(PayStarted event, Emitter<PayState> emit) async {
-    final amountInputState = state.cleanAmountInputState;
-    emit(amountInputState!.copyWith(isLoadingUserSummary: true));
+    final recipientSelectionState = state.cleanRecipientSelectionState;
+    emit(recipientSelectionState!.copyWith(isLoadingUserSummary: true));
     try {
       final userSummary = await _getExchangeUserSummaryUsecase.execute();
 
-      emit(amountInputState.copyWith(userSummary: userSummary));
+      emit(recipientSelectionState.copyWith(userSummary: userSummary));
     } on ApiKeyException catch (e) {
       // Handle API key error by showing error in current state
 
       emit(
-        (state as PayAmountInputState).copyWith(
+        recipientSelectionState.copyWith(
           error: PayError.unexpected(message: e.message),
         ),
       );
     } on GetExchangeUserSummaryException catch (e) {
       emit(
-        (state as PayAmountInputState).copyWith(
+        recipientSelectionState.copyWith(
           error: PayError.unexpected(message: e.message),
         ),
       );
     } finally {
-      emit(
-        (state as PayAmountInputState).copyWith(isLoadingUserSummary: false),
-      );
+      if (state is PayRecipientSelectionState) {
+        emit(
+          (state as PayRecipientSelectionState).copyWith(
+            isLoadingUserSummary: false,
+          ),
+        );
+      }
+    }
+  }
+
+  Future<void> _onRecipientSelected(
+    PayRecipientSelected event,
+    Emitter<PayState> emit,
+  ) async {
+    final recipientSelectionState = state.cleanRecipientSelectionState;
+    if (recipientSelectionState == null) {
+      log.severe('Expected to be on PayRecipientSelectionState but on: $state');
+      return;
     }
+
+    // First emit the recipient selection state again since we went back to it,
+    // So that the change to amount input state can be listened to properly.
+    emit(recipientSelectionState);
+
+    final amountInputState = recipientSelectionState.toAmountInputState(
+      selectedRecipient: event.recipient,
+    );
+    emit(amountInputState);
   }
 
   Future<void> _onAmountInputContinuePressed(
@@ -159,7 +183,10 @@ class PayBloc extends Bloc<PayEvent, PayState> {
 
     final fiatAmount = FiatAmount(amount);
 
-    emit(amountInputState.toWalletSelectionState(amount: fiatAmount));
+    final walletSelectionState = amountInputState.toWalletSelectionState(
+      amount: fiatAmount,
+    );
+    emit(walletSelectionState);
   }
 
   // From Sell: Select internal wallet, calculate fees, create pay order
@@ -172,6 +199,7 @@ class PayBloc extends Bloc<PayEvent, PayState> {
       log.severe('Expected to be on PayWalletSelectionState but on: $state');
       return;
     }
+
     emit(walletSelectionState.copyWith(isCreatingPayOrder: true));
 
     int requiredAmountSat;
@@ -306,6 +334,7 @@ class PayBloc extends Bloc<PayEvent, PayState> {
       log.severe('Expected to be on PayWalletSelectionState but on: $state');
       return;
     }
+
     emit(walletSelectionState.copyWith(isCreatingPayOrder: true));
 
     try {