Buy/Sell flow (New UI)

cw_core/lib/amount/money.dart

@@ -1,6 +1,7 @@
 import "dart:math";
 
 import "package:cw_core/amount/utils.dart";
+import "package:cw_core/crypto_amount_format.dart";
 import "package:cw_core/crypto_currency.dart";
 import "package:cw_core/currency.dart";
 import "package:cw_core/format_fixed.dart";
@@ -58,6 +59,14 @@ class Money implements Comparable<Money> {
     }
   }
 
+  static Money? trySafeParse(source, Currency currency, {bool isBaseUnit = false}) {
+    final amount = isBaseUnit
+        ? BigInt.tryParse(source.toString())
+        : tryParseFixed(source.toString().withDecimals(currency.decimals), currency.decimals);
+
+    return amount != null ? Money(amount, currency) : null;
+  }
+
   final BigInt amount;
   final Currency currency;
 

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';
+        return S.current.low_kyc;
       case ProviderRecommendation.successRate:
-        return 'HIGHEST SUCCESS RATE';
+        return S.current.highest_success_rate;
     }
   }
 }

lib/buy/payment_method.dart

@@ -115,7 +115,7 @@ extension PaymentTypeTitle on PaymentType {
       case PaymentType.creditCard:
       case PaymentType.debitCard:
       case PaymentType.yellowCardBankTransfer:
-        return 'assets/images/card.svg';
+        return 'assets/new-ui/buy_payment_methods/debit_card.svg';
       case PaymentType.bankTransfer:
         return 'assets/images/bank_light.svg';
       case PaymentType.skrill:
@@ -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) {
@@ -199,22 +209,22 @@ class PaymentMethod extends SelectableOption {
         paymentMethodType: type ?? PaymentType.unknown,
         customPaymentMethodType: json['paymentTypeId'] as String?,
         customTitle: json['name'] as String? ?? 'Unknown',
-        customIconPath: json['icon'] as String? ?? 'assets/images/card.png',
+        customIconPath: json['icon'] as String? ?? 'assets/new-ui/buy_payment_methods/debit_card.svg',
         customDescription: json['description'] as String?);
   }
 
   factory PaymentMethod.fromDFX(String paymentMethod, PaymentType paymentType) {
     return PaymentMethod(
         paymentMethodType: paymentType,
         customTitle: paymentMethod,
-        customIconPath: 'assets/images/card.png');
+        customIconPath: 'assets/new-ui/buy_payment_methods/debit_card.svg');
   }
 
   factory PaymentMethod.fromMoonPayJson(Map<String, dynamic> json, PaymentType paymentType) {
     return PaymentMethod(
         paymentMethodType: paymentType,
         customTitle: json['paymentMethod'] as String,
-        customIconPath: 'assets/images/card.png');
+        customIconPath: 'assets/new-ui/buy_payment_methods/debit_card.svg');
   }
 
   factory PaymentMethod.fromMeldJson(Map<String, dynamic> json) {
@@ -223,7 +233,7 @@ class PaymentMethod extends SelectableOption {
     return PaymentMethod(
         paymentMethodType: type ?? PaymentType.unknown,
         customTitle: json['name'] as String? ?? 'Unknown',
-        customIconPath: logos['dark'] as String? ?? 'assets/images/card.png',
+        customIconPath: logos['dark'] as String? ?? 'assets/new-ui/buy_payment_methods/debit_card.svg',
         customDescription: json['description'] as String?);
   }
 
@@ -232,7 +242,7 @@ class PaymentMethod extends SelectableOption {
     return PaymentMethod(
       paymentMethodType: type ?? PaymentType.unknown,
       customTitle: json['payment_method'] as String? ?? 'Unknown',
-      customIconPath: 'assets/images/card.png',
+      customIconPath: 'assets/new-ui/buy_payment_methods/debit_card.svg',
     );
   }
 

lib/di.dart

@@ -56,6 +56,9 @@ import 'package:cake_wallet/new-ui/new_dashboard.dart';
 import 'package:cake_wallet/new-ui/pages/about_page.dart';
 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';
@@ -65,6 +68,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';
@@ -1489,7 +1493,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>(), getIt.get<AddressResolverService>()));