Buy/Sell flow (New UI)

lib/buy/buy_provider.dart

@@ -43,8 +43,7 @@ abstract class BuyProvider {
           required double amount,
           required bool isBuyAction,
           required String cryptoCurrencyAddress,
-          String? countryCode}) =>
-      null;
+          String? countryCode}) => null;
 
   Future<String> requestUrl(String amount, String sourceCurrency) => throw UnimplementedError();
 

lib/buy/buy_quote.dart

@@ -5,6 +5,7 @@ import 'package:cake_wallet/entities/calculate_fiat_amount.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/provider_types.dart';
 import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cw_core/crypto_currency.dart';
 
 enum ProviderRecommendation { bestRate, lowKyc, successRate }
@@ -13,11 +14,11 @@ extension RecommendationTitle on ProviderRecommendation {
   String get title {
     switch (this) {
       case ProviderRecommendation.bestRate:
-        return 'BEST RATE';
+        return S.current.best_rate;
       case ProviderRecommendation.lowKyc:
         return 'LOW KYC';
       case ProviderRecommendation.successRate:
-        return 'HIGHEST SUCCESS RATE';
+        return S.current.highest_success_rate;
     }
   }
 }

lib/buy/payment_method.dart

@@ -132,24 +132,34 @@ extension PaymentTypeTitle on PaymentType {
   String? get darkIconPath {
     switch (this) {
       case PaymentType.all:
-        return 'assets/images/usd_round_dark.svg';
+        return 'assets/new-ui/buy_payment_methods/all_methods.svg';
       case PaymentType.creditCard:
       case PaymentType.debitCard:
       case PaymentType.yellowCardBankTransfer:
-        return 'assets/images/card_dark.svg';
+        return 'assets/new-ui/buy_payment_methods/debit_card.svg';
       case PaymentType.bankTransfer:
-        return 'assets/images/bank_dark.svg';
+        return 'assets/new-ui/buy_payment_methods/bank_transfer.svg';
       case PaymentType.skrill:
         return 'assets/images/skrill.svg';
       case PaymentType.applePay:
-        return 'assets/images/apple_pay_round_dark.svg';
+        return 'assets/new-ui/buy_payment_methods/apple_pay.svg';
+      case PaymentType.googlePay:
+        return "assets/new-ui/buy_payment_methods/google_pay.svg";
+      case PaymentType.paypal:
+        return "assets/new-ui/buy_payment_methods/paypal.svg";
       case PaymentType.revolutPay:
         return 'assets/images/revolut_dark.svg';
       default:
         return null;
     }
   }
 
+  bool get isMonochromeIcon => [
+    "assets/new-ui/buy_payment_methods/all_methods.svg",
+    "assets/new-ui/buy_payment_methods/debit_card.svg",
+    "assets/new-ui/buy_payment_methods/bank_transfer.svg"
+  ].contains(darkIconPath);
+
   String? get description {
     switch (this) {
       default:
@@ -190,7 +200,7 @@ class PaymentMethod extends SelectableOption {
     return PaymentMethod(
         paymentMethodType: PaymentType.all,
         customTitle: 'All Payment Methods',
-        customIconPath: 'assets/images/dollar_coin.svg');
+        customIconPath: 'assets/new-ui/buy_payment_methods/all_methods.svg');
   }
 
   factory PaymentMethod.fromOnramperJson(Map<String, dynamic> json) {

lib/di.dart

@@ -56,6 +56,7 @@ import 'package:cake_wallet/new-ui/pages/account_customizer.dart';
 import 'package:cake_wallet/new-ui/pages/bridge/bridge_amount_page.dart';
 import 'package:cake_wallet/new-ui/pages/bridge/bridge_network_page.dart';
 import 'package:cake_wallet/new-ui/pages/bridge/bridge_receiving_wallet_page.dart';
+import 'package:cake_wallet/new-ui/pages/buy_sell/buy_sell_amount_page.dart';
 import 'package:cake_wallet/new-ui/pages/coin_control_page.dart';
 import 'package:cake_wallet/new-ui/pages/addresses_page.dart';
 import 'package:cake_wallet/new-ui/pages/home_page.dart';
@@ -64,6 +65,7 @@ import 'package:cake_wallet/new-ui/pages/lightning_username_page.dart';
 import 'package:cake_wallet/new-ui/pages/receive_page.dart';
 import 'package:cake_wallet/new-ui/viewmodels/lightning_username/lightning_username_bloc.dart';
 import 'package:cake_wallet/new-ui/widgets/addresses_page/address_label_input.dart';
+import 'package:cake_wallet/new-ui/widgets/buy_sell/buy_sell_selector_modal.dart';
 import 'package:cake_wallet/new-ui/widgets/coins_page/assets_history/transaction_details_modal.dart';
 import 'package:cake_wallet/new-ui/widgets/receive_page/receive_label_modal.dart';
 import 'package:cake_wallet/new-ui/pages/swap_page.dart';
@@ -1492,7 +1494,11 @@ Future<void> setup({
 
   getIt.registerFactory(() => BuyAmountViewModel());
 
-  getIt.registerFactory(() => BuySellViewModel(getIt.get<AppStore>()));
+  getIt.registerFactoryParam<BuySellViewModel, BuySellPageMode, void>(
+      (mode, _) => BuySellViewModel(mode: mode, getIt.get<AppStore>(), fiatConversionStore: getIt.get<FiatConversionStore>()));
+
+  getIt.registerFactoryParam<NewBuySellAmountPage, BuySellPageMode, void>((mode, _) =>
+      NewBuySellAmountPage(buySellViewModel: getIt.get<BuySellViewModel>(param1: mode)));
 
   getIt.registerFactory(() => BuySellPage(getIt.get<BuySellViewModel>()));
 

lib/entities/new_ui_entities/list_item/list_item_regular_row.dart

@@ -22,6 +22,8 @@ class ListItemRegularRow extends ListItem {
     this.leadingIconSize,
     this.badgeIconSize,
     this.iconColor,
+    this.secondaryLabel,
+    this.subtitleColor,
   });
 
   final String? subtitle;
@@ -31,10 +33,12 @@ class ListItemRegularRow extends ListItem {
   final String? badgeIconPath;
   final String? copyableText;
   final VoidCallback? onTap;
+  final String? secondaryLabel;
   final bool showArrow;
   final Widget? bottomWidget;
   final Widget? trailingWidget;
   final bool truncateTrailingText;
+  final Color? subtitleColor;
   final Color? foregroundColor;
   final double? trailingIconSize;
   final Widget? leadingIconErrorWidget;