CW-942-New-Swap-UI-Flow

integration_test/robots/send_page_robot.dart

@@ -51,7 +51,7 @@ class SendPageRobot {
       commonTestCases.hasValueKey('send_page_fiat_amount_textfield_key');
     }
 
-    if (sendViewModel.hasFees) {
+    if (sendViewModel.feesViewModel.hasFees) {
       commonTestCases.hasValueKey('send_page_select_fee_priority_button_key');
     }
 
@@ -104,12 +104,12 @@ class SendPageRobot {
     SendPage sendPage = tester.widget(find.byType(SendPage));
     final sendViewModel = sendPage.sendViewModel;
 
-    if (!sendViewModel.hasFees || priority == null) return;
+    if (!sendViewModel.feesViewModel.hasFees || priority == null) return;
 
     final transactionPriorityPickerKey = 'send_page_select_fee_priority_button_key';
     await commonTestCases.tapItemByKey(transactionPriorityPickerKey);
 
-    if (priority == sendViewModel.transactionPriority) {
+    if (priority == sendViewModel.feesViewModel.transactionPriority) {
       await commonTestCases
           .tapItemByKey('picker_items_index_${priority.title}_selected_item_button_key');
       return;
@@ -188,8 +188,8 @@ class SendPageRobot {
       await authPageRobot.enterPinCode(CommonTestConstants.pin);
     }
 
-  final onAuthPageDesktop = authPageRobot.onAuthPageDesktop();
-  if (onAuthPageDesktop) {
+    final onAuthPageDesktop = authPageRobot.onAuthPageDesktop();
+    if (onAuthPageDesktop) {
       await authPageRobot.enterPassword(CommonTestConstants.pin.join(""));
     }
   }

lib/di.dart

@@ -48,6 +48,7 @@ import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
 import 'package:cake_wallet/view_model/dashboard/sign_view_model.dart';
+import 'package:cake_wallet/view_model/send/fees_view_model.dart';
 import 'package:cw_core/receive_page_option.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';
@@ -750,6 +751,7 @@ Future<void> setup({
       getIt.get<AppStore>().wallet!.isHardwareWallet ? getIt.get<LedgerViewModel>() : null,
       coinTypeToSpendFrom: coinTypeToSpendFrom ?? UnspentCoinType.any,
       getIt.get<UnspentCoinsListViewModel>(param1: coinTypeToSpendFrom),
+      getIt.get<FeesViewModel>(),
     ),
   );
 
@@ -1022,20 +1024,35 @@ Future<void> setup({
 
   getIt.registerFactoryParam<WebViewPage, String, Uri>((title, uri) => WebViewPage(title, uri));
 
-  getIt.registerFactory(() => ExchangeViewModel(
+  getIt.registerFactory(
+    () => ExchangeViewModel(
       getIt.get<AppStore>(),
       _tradesSource,
       getIt.get<ExchangeTemplateStore>(),
       getIt.get<TradesStore>(),
       getIt.get<AppStore>().settingsStore,
       getIt.get<SharedPreferences>(),
-      getIt.get<ContactListViewModel>()));
+      getIt.get<ContactListViewModel>(),
+      getIt.get<FeesViewModel>(),
+    ),
+  );
+
+  getIt.registerFactory<FeesViewModel>(
+    () => FeesViewModel(
+      getIt.get<AppStore>(),
+      getIt.get<BalanceViewModel>(),
+    ),
+  );
 
-  getIt.registerFactory(() => ExchangeTradeViewModel(
+  getIt.registerFactory(
+    () => ExchangeTradeViewModel(
       wallet: getIt.get<AppStore>().wallet!,
       trades: _tradesSource,
       tradesStore: getIt.get<TradesStore>(),
-      sendViewModel: getIt.get<SendViewModel>()));
+      sendViewModel: getIt.get<SendViewModel>(),
+      feesViewModel: getIt.get<FeesViewModel>(),
+    ),
+  );
 
   getIt.registerFactoryParam<ExchangePage, PaymentRequest?, void>(
       (PaymentRequest? paymentRequest, __) {

lib/src/screens/exchange/exchange_page.dart

@@ -248,7 +248,7 @@ class ExchangePage extends BasePage {
                   Observer(
                       builder: (_) => LoadingPrimaryButton(
                           key: ValueKey('exchange_page_exchange_button_key'),
-                          text: exchangeViewModel.isAvailableInSelected ? S.of(context).exchange : S.of(context).change_selected_exchanges,
+                          text: exchangeViewModel.isAvailableInSelected ? S.of(context).swap : S.of(context).change_selected_exchanges,
                           onPressed: exchangeViewModel.isAvailableInSelected ? () {
                             FocusScope.of(context).unfocus();
 
@@ -377,7 +377,7 @@ class ExchangePage extends BasePage {
       return;
     }
 
-    if (exchangeViewModel.isLowFee) {
+    if (exchangeViewModel.feesViewModel.isLowFee) {
       _showFeeAlert(context);
     }
 
@@ -640,7 +640,7 @@ class ExchangePage extends BasePage {
             }) ??
         false;
     if (confirmed) {
-      exchangeViewModel.setDefaultTransactionPriority();
+      exchangeViewModel.feesViewModel .setDefaultTransactionPriority();
     }
   }
 

lib/src/screens/exchange/widgets/present_provider_picker.dart

@@ -35,10 +35,11 @@ class PresentProviderPicker extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
-                Text(S.of(context).exchange,
+                Text(S.of(context).swap,
                     style: TextStyle(
                         fontSize: 16.0,
                         fontWeight: FontWeight.w600,
+
                         color: Colors.white)),
                 Observer(
                     builder: (_) => Text(

lib/src/screens/exchange_trade/exchange_confirm_page.dart

@@ -21,7 +21,7 @@ class ExchangeConfirmPage extends BasePage {
   final Trade trade;
 
   @override
-  String get title => S.current.copy_id;
+  String get title => S.current.swap;
 
   @override
   Widget body(BuildContext context) {
@@ -40,7 +40,7 @@ class ExchangeConfirmPage extends BasePage {
                   style: TextStyle(
                       fontSize: 18.0,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+                      color:  Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
                 ),
               )),
               Container(

lib/src/screens/exchange_trade/exchange_trade_item.dart

@@ -1,13 +1,13 @@
-import 'package:flutter/cupertino.dart';
-
 class ExchangeTradeItem {
   ExchangeTradeItem({
     required this.title,
     required this.data,
     required this.isCopied,
+    required this.isReceiveDetail,
   });
 
   String title;
   String data;
   bool isCopied;
+  bool isReceiveDetail;
 }