Revert "Merge branch 'main' into CW-506-Add-a-switch-to-enable-disable-domain-lookups"

This reverts commit 92924a90e8, reversing
changes made to 5a2a203054.

android/app/src/main/res/drawable/ic_launcher_adaptive_back.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>

assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
-    <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+  <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
 </adaptive-icon>

assets/images/monerocom_android_icon/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
-    <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+  <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+  <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
 </adaptive-icon>

cw_bitcoin_cash/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux

@@ -1 +1 @@
-/Users/blazebrain/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
+C:/Users/borod/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.0/

cw_core/lib/wallet_addresses.dart

@@ -36,6 +36,4 @@ abstract class WalletAddresses {
       print(e.toString());
     }
   }
-
-  bool containsAddress(String address) => addressesMap.containsKey(address);
-}
+}

cw_haven/lib/haven_wallet_addresses.dart

@@ -63,14 +63,14 @@ abstract class HavenWalletAddressesBase extends WalletAddressesWithAccount<Accou
 
   bool validate() {
     accountList.update();
-    final accountListLength = accountList.accounts.length;
+    final accountListLength = accountList.accounts.length ?? 0;
 
     if (accountListLength <= 0) {
       return false;
     }
 
     subaddressList.update(accountIndex: accountList.accounts.first.id);
-    final subaddressListLength = subaddressList.subaddresses.length;
+    final subaddressListLength = subaddressList.subaddresses.length ?? 0;
 
     if (subaddressListLength <= 0) {
       return false;
@@ -84,8 +84,4 @@ abstract class HavenWalletAddressesBase extends WalletAddressesWithAccount<Accou
     subaddress = subaddressList.subaddresses.first;
     address = subaddress!.address;
   }
-
-  @override
-  bool containsAddress(String address) =>
-      addressInfos[account?.id ?? 0]?.any((it) => it.address == address) ?? false;
-}
+}

cw_monero/lib/monero_wallet.dart

@@ -57,7 +57,9 @@ abstract class MoneroWalletBase
     walletAddresses = MoneroWalletAddresses(walletInfo, transactionHistory);
 
     _onAccountChangeReaction = reaction((_) => walletAddresses.account, (Account? account) {
-      if (account == null) return;
+      if (account == null) {
+        return;
+      }
 
       balance = ObservableMap<CryptoCurrency, MoneroBalance>.of(<CryptoCurrency, MoneroBalance>{
         currency: MoneroBalance(
@@ -65,7 +67,6 @@ abstract class MoneroWalletBase
             unlockedBalance: monero_wallet.getUnlockedBalance(accountIndex: account.id))
       });
       _updateSubAddress(isEnabledAutoGenerateSubaddress, account: account);
-      _askForUpdateTransactionHistory();
     });
 
     reaction((_) => isEnabledAutoGenerateSubaddress, (bool enabled) {
@@ -361,7 +362,9 @@ abstract class MoneroWalletBase
   }
 
   @override
-  Future<void> changePassword(String password) async => monero_wallet.setPasswordSync(password);
+  Future<void> changePassword(String password) async {
+    monero_wallet.setPasswordSync(password);
+  }
 
   Future<int> getNodeHeight() async => monero_wallet.getNodeHeight();
 
@@ -496,8 +499,9 @@ abstract class MoneroWalletBase
     }
   }
 
-  String getSubaddressLabel(int accountIndex, int addressIndex) =>
-      monero_wallet.getSubaddressLabel(accountIndex, addressIndex);
+  String getSubaddressLabel(int accountIndex, int addressIndex) {
+    return monero_wallet.getSubaddressLabel(accountIndex, addressIndex);
+  }
 
   List<MoneroTransactionInfo> _getAllTransactionsOfAccount(int? accountIndex) => transaction_history
       .getAllTransactions()

cw_monero/lib/monero_wallet_addresses.dart

@@ -1,11 +1,11 @@
-import 'package:cw_core/account.dart';
 import 'package:cw_core/address_info.dart';
-import 'package:cw_core/subaddress.dart';
 import 'package:cw_core/wallet_addresses.dart';
 import 'package:cw_core/wallet_info.dart';
+import 'package:cw_core/account.dart';
 import 'package:cw_monero/api/wallet.dart';
 import 'package:cw_monero/monero_account_list.dart';
 import 'package:cw_monero/monero_subaddress_list.dart';
+import 'package:cw_core/subaddress.dart';
 import 'package:cw_monero/monero_transaction_history.dart';
 import 'package:mobx/mobx.dart';
 
@@ -112,8 +112,4 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
     subaddress = subaddressList.subaddresses.last;
     address = subaddress!.address;
   }
-
-  @override
-  bool containsAddress(String address) =>
-      addressInfos[account?.id ?? 0]?.any((it) => it.address == address) ?? false;
 }

ios/Podfile.lock

@@ -115,9 +115,6 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - fluttertoast (0.0.2):
-    - Flutter
-    - Toast
   - in_app_review (0.2.0):
     - Flutter
   - local_auth_ios (0.0.1):
@@ -146,7 +143,6 @@ PODS:
     - FlutterMacOS
   - SwiftProtobuf (1.22.0)
   - SwiftyGif (5.4.4)
-  - Toast (4.0.0)
   - uni_links (0.0.1):
     - Flutter
   - UnstoppableDomainsResolution (4.0.0):
@@ -175,7 +171,6 @@ DEPENDENCIES:
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
   - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
@@ -203,7 +198,6 @@ SPEC REPOS:
     - SDWebImage
     - SwiftProtobuf
     - SwiftyGif
-    - Toast
     - UnstoppableDomainsResolution
 
 EXTERNAL SOURCES:
@@ -235,8 +229,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  fluttertoast:
-    :path: ".symlinks/plugins/fluttertoast/ios"
   in_app_review:
     :path: ".symlinks/plugins/in_app_review/ios"
   local_auth_ios:
@@ -283,7 +275,6 @@ SPEC CHECKSUMS:
   flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
   local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
@@ -299,7 +290,6 @@ SPEC CHECKSUMS:
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4

lib/core/wallet_connect/evm_chain_service.dart

@@ -6,7 +6,7 @@ import 'package:cake_wallet/core/wallet_connect/eth_transaction_model.dart';
 import 'package:cake_wallet/core/wallet_connect/evm_chain_id.dart';
 import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/error_display_widget.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
 import 'package:cake_wallet/core/wallet_connect/models/connection_model.dart';

lib/core/wallet_connect/web3wallet_service.dart

@@ -10,7 +10,7 @@ import 'package:cake_wallet/core/wallet_connect/models/auth_request_model.dart';
 import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
 import 'package:cake_wallet/core/wallet_connect/models/session_request_model.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_request_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/error_display_widget.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:eth_sig_util/eth_sig_util.dart';
@@ -200,24 +200,6 @@ abstract class Web3WalletServiceBase with Store {
     );
   }
 
-  @action
-  Future<void> pairWithUri(Uri uri) async {
-    try {
-      log('Pairing with URI: $uri');
-      await _web3Wallet.pair(uri: uri);
-    } on WalletConnectError catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.message),
-      );
-    } catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.toString()),
-      );
-    }
-  }
-
   void _onPairingCreate(PairingEvent? args) {
     log('Pairing Create Event: $args');
   }

lib/di.dart

@@ -52,7 +52,6 @@ import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
 import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
 import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
@@ -281,7 +280,7 @@ Future<void> setup({
     powNodeSource: _powNodeSource,
     isBitcoinBuyEnabled: isBitcoinBuyEnabled,
     // Enforce darkTheme on platforms other than mobile till the design for other themes is completed
-    initialTheme: responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile
+    initialTheme: ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile
         ? null
         : ThemeList.darkTheme,
   );
@@ -1160,9 +1159,5 @@ Future<void> setup({
     return ManageNodesPage(isPow, nodeListViewModel: getIt.get<NodeListViewModel>());
   });
 
-  getIt.registerFactory(
-      () => WalletConnectConnectionsView(web3walletService: getIt.get<Web3WalletService>()));
-
-
   _isSetupFinished = true;
 }

lib/entities/cake_2fa_preset_options.dart

@@ -33,7 +33,6 @@ enum VerboseControlSettings {
   sendsToNonContacts,
   sendsToInternalWallets,
   exchangesToInternalWallets,
-  exchangesToExternalWallets,
   securityAndBackupSettings,
   creatingNewWallets,
 }

lib/entities/preferences_key.dart

@@ -77,8 +77,6 @@ class PreferencesKey {
       'should_require_totp_2fa_for_sends_to_internal_wallets';
   static const shouldRequireTOTP2FAForExchangesToInternalWallets =
       'should_require_totp_2fa_for_exchanges_to_internal_wallets';
-  static const shouldRequireTOTP2FAForExchangesToExternalWallets =
-      'should_require_totp_2fa_for_exchanges_to_external_wallets';
   static const shouldRequireTOTP2FAForAddingContacts =
       'should_require_totp_2fa_for_adding_contacts';
   static const shouldRequireTOTP2FAForCreatingNewWallets =

lib/exchange/trade.dart

@@ -27,7 +27,6 @@ class Trade extends HiveObject {
     this.password,
     this.providerId,
     this.providerName,
-    this.fromWalletAddress
   }) {
     if (provider != null) providerRaw = provider.raw;
 
@@ -102,9 +101,6 @@ class Trade extends HiveObject {
   @HiveField(16)
   String? providerName;
 
-  @HiveField(17)
-  String? fromWalletAddress;
-
   static Trade fromMap(Map<String, Object?> map) {
     return Trade(
         id: map['id'] as String,
@@ -114,9 +110,7 @@ class Trade extends HiveObject {
         createdAt:
             map['date'] != null ? DateTime.fromMillisecondsSinceEpoch(map['date'] as int) : null,
         amount: map['amount'] as String,
-        walletId: map['wallet_id'] as String,
-        fromWalletAddress: map['from_wallet_address'] as String?
-    );
+        walletId: map['wallet_id'] as String);
   }
 
   Map<String, dynamic> toMap() {
@@ -127,8 +121,7 @@ class Trade extends HiveObject {
       'output': to.serialize(),
       'date': createdAt != null ? createdAt!.millisecondsSinceEpoch : null,
       'amount': amount,
-      'wallet_id': walletId,
-      'from_wallet_address': fromWalletAddress
+      'wallet_id': walletId
     };
   }
 

lib/main.dart

@@ -5,7 +5,6 @@ import 'package:cake_wallet/entities/language_service.dart';
 import 'package:cake_wallet/buy/order.dart';
 import 'package:cake_wallet/locales/locale.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
-import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/address_info.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -323,20 +322,22 @@ class _Home extends StatefulWidget {
 class _HomeState extends State<_Home> {
   @override
   void didChangeDependencies() {
-    _setOrientation(context);
-
+    if (!ResponsiveLayoutUtil.instance.isMobile) {
+      _setOrientation(context);
+    }
     super.didChangeDependencies();
   }
 
   void _setOrientation(BuildContext context) {
-    if (!DeviceInfo.instance.isDesktop) {
-      if (responsiveLayoutUtil.shouldRenderMobileUI) {
-        SystemChrome.setPreferredOrientations(
-            [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
-      } else {
-        SystemChrome.setPreferredOrientations(
-            [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
-      }
+    final orientation = MediaQuery.of(context).orientation;
+    final width = MediaQuery.of(context).size.width;
+    final height = MediaQuery.of(context).size.height;
+    if (orientation == Orientation.portrait && width < height) {
+      SystemChrome.setPreferredOrientations(
+          [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+    } else if (orientation == Orientation.landscape && width > height) {
+      SystemChrome.setPreferredOrientations(
+          [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
     }
   }
 

lib/monero/cw_monero.dart

@@ -120,6 +120,8 @@ class CWMoneroWalletDetails extends MoneroWalletDetails {
   @computed
   @override
   MoneroBalance get balance {
+    final moneroWallet = _wallet as MoneroWallet;
+    final balance = moneroWallet.balance;
     throw Exception('Unimplemented');
     // return MoneroBalance();
     //return MoneroBalance(
@@ -130,10 +132,14 @@ class CWMoneroWalletDetails extends MoneroWalletDetails {
 
 class CWMonero extends Monero {
   @override
-  MoneroAccountList getAccountList(Object wallet) => CWMoneroAccountList(wallet);
+  MoneroAccountList getAccountList(Object wallet) {
+    return CWMoneroAccountList(wallet);
+  }
 
   @override
-  MoneroSubaddressList getSubaddressList(Object wallet) => CWMoneroSubaddressList(wallet);
+  MoneroSubaddressList getSubaddressList(Object wallet) {
+    return CWMoneroSubaddressList(wallet);
+  }
 
   @override
   TransactionHistoryBase getTransactionHistory(Object wallet) {
@@ -142,13 +148,19 @@ class CWMonero extends Monero {
   }
 
   @override
-  MoneroWalletDetails getMoneroWalletDetails(Object wallet) => CWMoneroWalletDetails(wallet);
+  MoneroWalletDetails getMoneroWalletDetails(Object wallet) {
+    return CWMoneroWalletDetails(wallet);
+  }
 
   @override
-  int getHeightByDate({required DateTime date}) => getMoneroHeigthByDate(date: date);
+  int getHeigthByDate({required DateTime date}) {
+    return getMoneroHeigthByDate(date: date);
+  }
 
   @override
-  TransactionPriority getDefaultTransactionPriority() => MoneroTransactionPriority.automatic;
+  TransactionPriority getDefaultTransactionPriority() {
+    return MoneroTransactionPriority.automatic;
+  }
 
   @override
   TransactionPriority getMoneroTransactionPrioritySlow() => MoneroTransactionPriority.slow;
@@ -158,11 +170,14 @@ class CWMonero extends Monero {
       MoneroTransactionPriority.automatic;
 
   @override
-  TransactionPriority deserializeMoneroTransactionPriority({required int raw}) =>
-      MoneroTransactionPriority.deserialize(raw: raw);
+  TransactionPriority deserializeMoneroTransactionPriority({required int raw}) {
+    return MoneroTransactionPriority.deserialize(raw: raw);
+  }
 
   @override
-  List<TransactionPriority> getTransactionPriorities() => MoneroTransactionPriority.all;
+  List<TransactionPriority> getTransactionPriorities() {
+    return MoneroTransactionPriority.all;
+  }
 
   @override
   List<String> getMoneroWordList(String language) {
@@ -194,37 +209,41 @@ class CWMonero extends Monero {
 
   @override
   WalletCredentials createMoneroRestoreWalletFromKeysCredentials(
-          {required String name,
-          required String spendKey,
-          required String viewKey,
-          required String address,
-          required String password,
-          required String language,
-          required int height}) =>
-      MoneroRestoreWalletFromKeysCredentials(
-          name: name,
-          spendKey: spendKey,
-          viewKey: viewKey,
-          address: address,
-          password: password,
-          language: language,
-          height: height);
+      {required String name,
+      required String spendKey,
+      required String viewKey,
+      required String address,
+      required String password,
+      required String language,
+      required int height}) {
+    return MoneroRestoreWalletFromKeysCredentials(
+        name: name,
+        spendKey: spendKey,
+        viewKey: viewKey,
+        address: address,
+        password: password,
+        language: language,
+        height: height);
+  }
 
   @override
   WalletCredentials createMoneroRestoreWalletFromSeedCredentials(
-          {required String name,
-          required String password,
-          required int height,
-          required String mnemonic}) =>
-      MoneroRestoreWalletFromSeedCredentials(
-          name: name, password: password, height: height, mnemonic: mnemonic);
+      {required String name,
+      required String password,
+      required int height,
+      required String mnemonic}) {
+    return MoneroRestoreWalletFromSeedCredentials(
+        name: name, password: password, height: height, mnemonic: mnemonic);
+  }
 
   @override
   WalletCredentials createMoneroNewWalletCredentials({
     required String name,
     required String language,
-    String? password}) =>
-      MoneroNewWalletCredentials(name: name, password: password, language: language);
+    String? password,
+  }) {
+    return MoneroNewWalletCredentials(name: name, password: password, language: language);
+  }
 
   @override
   Map<String, String> getKeys(Object wallet) {
@@ -240,37 +259,43 @@ class CWMonero extends Monero {
 
   @override
   Object createMoneroTransactionCreationCredentials(
-          {required List<Output> outputs, required TransactionPriority priority}) =>
-      MoneroTransactionCreationCredentials(
-          outputs: outputs
-              .map((out) => OutputInfo(
-                  fiatAmount: out.fiatAmount,
-                  cryptoAmount: out.cryptoAmount,
-                  address: out.address,
-                  note: out.note,
-                  sendAll: out.sendAll,
-                  extractedAddress: out.extractedAddress,
-                  isParsedAddress: out.isParsedAddress,
-                  formattedCryptoAmount: out.formattedCryptoAmount))
-              .toList(),
-          priority: priority as MoneroTransactionPriority);
+      {required List<Output> outputs, required TransactionPriority priority}) {
+    return MoneroTransactionCreationCredentials(
+        outputs: outputs
+            .map((out) => OutputInfo(
+                fiatAmount: out.fiatAmount,
+                cryptoAmount: out.cryptoAmount,
+                address: out.address,
+                note: out.note,
+                sendAll: out.sendAll,
+                extractedAddress: out.extractedAddress,
+                isParsedAddress: out.isParsedAddress,
+                formattedCryptoAmount: out.formattedCryptoAmount))
+            .toList(),
+        priority: priority as MoneroTransactionPriority);
+  }
 
   @override
   Object createMoneroTransactionCreationCredentialsRaw(
-          {required List<OutputInfo> outputs, required TransactionPriority priority}) =>
-      MoneroTransactionCreationCredentials(
-          outputs: outputs, priority: priority as MoneroTransactionPriority);
+      {required List<OutputInfo> outputs, required TransactionPriority priority}) {
+    return MoneroTransactionCreationCredentials(
+        outputs: outputs, priority: priority as MoneroTransactionPriority);
+  }
 
   @override
-  String formatterMoneroAmountToString({required int amount}) =>
-      moneroAmountToString(amount: amount);
+  String formatterMoneroAmountToString({required int amount}) {
+    return moneroAmountToString(amount: amount);
+  }
 
   @override
-  double formatterMoneroAmountToDouble({required int amount}) =>
-      moneroAmountToDouble(amount: amount);
+  double formatterMoneroAmountToDouble({required int amount}) {
+    return moneroAmountToDouble(amount: amount);
+  }
 
   @override
-  int formatterMoneroParseAmount({required String amount}) => moneroParseAmount(amount: amount);
+  int formatterMoneroParseAmount({required String amount}) {
+    return moneroParseAmount(amount: amount);
+  }
 
   @override
   Account getCurrentAccount(Object wallet) {
@@ -287,7 +312,9 @@ class CWMonero extends Monero {
   }
 
   @override
-  void onStartup() => monero_wallet_api.onStartup();
+  void onStartup() {
+    monero_wallet_api.onStartup();
+  }
 
   @override
   int getTransactionInfoAccountId(TransactionInfo tx) {
@@ -297,8 +324,9 @@ class CWMonero extends Monero {
 
   @override
   WalletService createMoneroWalletService(
-          Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) =>
-      MoneroWalletService(walletInfoSource, unspentCoinSource);
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) {
+    return MoneroWalletService(walletInfoSource, unspentCoinSource);
+  }
 
   @override
   String getTransactionAddress(Object wallet, int accountIndex, int addressIndex) {

lib/router.dart

@@ -1,7 +1,6 @@
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
-import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/buy/order.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';
@@ -51,7 +50,6 @@ import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
 import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
@@ -601,12 +599,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.managePowNodes:
       return MaterialPageRoute<void>(builder: (_) => getIt.get<ManageNodesPage>(param1: true));
 
-    case Routes.walletConnectConnectionsListing:
-      return MaterialPageRoute<void>(
-          builder: (_) => WalletConnectConnectionsView(
-                web3walletService: getIt.get<Web3WalletService>(),
-                launchUri: settings.arguments as Uri?,
-              ));
     default:
       return MaterialPageRoute<void>(
           builder: (_) => Scaffold(

lib/routes.dart

@@ -99,5 +99,5 @@ class Routes {
   static const editToken = '/edit_token';
   static const manageNodes = '/manage_nodes';
   static const managePowNodes = '/manage_pow_nodes';
-  static const walletConnectConnectionsListing = '/wallet-connect-connections-listing';
+
 }

lib/src/screens/dashboard/dashboard_page.dart

@@ -52,23 +52,26 @@ class DashboardPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Observer(
-        builder: (_) {
-          final dashboardPageView = _DashboardPageView(
-            balancePage: balancePage,
-            bottomSheetService: bottomSheetService,
-            dashboardViewModel: dashboardViewModel,
-            addressListViewModel: addressListViewModel,
-          );
-
+      body: LayoutBuilder(
+        builder: (context, constraints) {
           if (DeviceInfo.instance.isDesktop) {
-            if (responsiveLayoutUtil.screenWidth > ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) {
+            if (constraints.maxWidth > ResponsiveLayoutUtil.kDesktopMaxDashBoardWidthConstraint) {
               return getIt.get<DesktopSidebarWrapper>();
             } else {
-              return dashboardPageView;
+              return _DashboardPageView(
+                balancePage: balancePage,
+                bottomSheetService: bottomSheetService,
+                dashboardViewModel: dashboardViewModel,
+                addressListViewModel: addressListViewModel,
+              );
             }
-          } else if (responsiveLayoutUtil.shouldRenderMobileUI) {
-            return dashboardPageView;
+          } else if (ResponsiveLayoutUtil.instance.shouldRenderMobileUI()) {
+            return _DashboardPageView(
+              bottomSheetService: bottomSheetService,
+              balancePage: balancePage,
+              dashboardViewModel: dashboardViewModel,
+              addressListViewModel: addressListViewModel,
+            );
           } else {
             return getIt.get<DesktopSidebarWrapper>();
           }

lib/src/screens/dashboard/widgets/address_page.dart

@@ -64,15 +64,7 @@ class AddressPage extends BasePage {
 
   @override
   Widget? leading(BuildContext context) {
-    final _backButton = Icon(
-      Icons.arrow_back_ios,
-      color: titleColor(context),
-      size: 16,
-    );
-    final _closeButton =
-    currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
-
-    bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
+    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile;
 
     return MergeSemantics(
       child: SizedBox(
@@ -87,7 +79,7 @@ class AddressPage extends BasePage {
                 overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
-              child: !isMobileView ? _closeButton : _backButton,
+              child: !isMobileView ? closeButton(context) : backButton(context),
             ),
           ),
         ),

lib/src/screens/dashboard/widgets/balance_page.dart

@@ -1,18 +1,17 @@
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/src/screens/dashboard/widgets/home_screen_account_widget.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
-import 'package:cake_wallet/src/widgets/introducing_card.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
-import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cake_wallet/src/widgets/introducing_card.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 
 class BalancePage extends StatelessWidget {
   BalancePage({required this.dashboardViewModel, required this.settingsStore});
@@ -29,59 +28,47 @@ class BalancePage extends StatelessWidget {
           !dashboardViewModel.balanceViewModel.isReversing,
       child: SingleChildScrollView(
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Observer(
-                builder: (_) => dashboardViewModel.balanceViewModel.hasAccounts
-                    ? HomeScreenAccountWidget(
-                        walletName: dashboardViewModel.name,
-                        accountName: dashboardViewModel.subname)
-                    : Column(
-                        children: [
-                          SizedBox(height: 56),
-                          Container(
-                            margin: const EdgeInsets.only(left: 24, bottom: 16),
-                            child: Observer(
-                              builder: (_) {
-                                return Row(
-                                  children: [
-                                    Text(
-                                      dashboardViewModel.balanceViewModel.asset,
-                                      style: TextStyle(
-                                        fontSize: 24,
-                                        fontFamily: 'Lato',
-                                        fontWeight: FontWeight.w600,
-                                        color: Theme.of(context)
-                                            .extension<DashboardPageTheme>()!
-                                            .pageTitleTextColor,
-                                        height: 1,
-                                      ),
-                                      maxLines: 1,
-                                      textAlign: TextAlign.center,
-                                    ),
-                                    if (dashboardViewModel
-                                        .balanceViewModel.isHomeScreenSettingsEnabled)
-                                      InkWell(
-                                        onTap: () => Navigator.pushNamed(
-                                            context, Routes.homeSettings,
-                                            arguments: dashboardViewModel.balanceViewModel),
-                                        child: Padding(
-                                          padding: const EdgeInsets.all(8.0),
-                                          child: Image.asset(
-                                            'assets/images/home_screen_settings_icon.png',
-                                            color: Theme.of(context)
-                                                .extension<DashboardPageTheme>()!
-                                                .pageTitleTextColor,
-                                          ),
-                                        ),
-                                      ),
-                                  ],
-                                );
-                              },
+            SizedBox(height: 56),
+            Container(
+              margin: const EdgeInsets.only(left: 24, bottom: 16),
+              child: Observer(
+                builder: (_) {
+                  return Row(
+                    children: [
+                      Text(
+                        dashboardViewModel.balanceViewModel.asset,
+                        style: TextStyle(
+                          fontSize: 24,
+                          fontFamily: 'Lato',
+                          fontWeight: FontWeight.w600,
+                          color:
+                              Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                          height: 1,
+                        ),
+                        maxLines: 1,
+                        textAlign: TextAlign.center,
+                      ),
+                      if (dashboardViewModel.balanceViewModel.isHomeScreenSettingsEnabled)
+                        InkWell(
+                          onTap: () => Navigator.pushNamed(context, Routes.homeSettings,
+                              arguments: dashboardViewModel.balanceViewModel),
+                          child: Padding(
+                            padding: const EdgeInsets.all(8.0),
+                            child: Image.asset(
+                              'assets/images/home_screen_settings_icon.png',
+                              color: Theme.of(context)
+                                  .extension<DashboardPageTheme>()!
+                                  .pageTitleTextColor,
                             ),
                           ),
-                        ],
-                      )),
+                        ),
+                    ],
+                  );
+                },
+              ),
+            ),
             Observer(
               builder: (_) {
                 if (dashboardViewModel.balanceViewModel.isShowCard &&

lib/src/screens/dashboard/widgets/home_screen_account_widget.dart

@@ -1,69 +0,0 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page.dart';
-import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:flutter/material.dart';
-
-class HomeScreenAccountWidget extends StatelessWidget {
-  HomeScreenAccountWidget({this.walletName, this.accountName});
-
-  final String? walletName;
-  final String? accountName;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () async  {
-        await showPopUp<void>(
-    context: context,
-    builder: (_) => getIt.get<MoneroAccountListPage>());
-    },
-      child: Container(
-        height: 100.0,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Container(
-                  child: Text(
-                    walletName ?? '',
-                    style: TextStyle(
-                      fontSize: 22.0,
-                      fontWeight: FontWeight.bold,
-                      fontFamily: 'Lato',
-                      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                    ),
-                  ),
-                ),
-                SizedBox(
-                  height: 5.0,
-                ),
-                Container(
-                  child: Text(
-                    accountName ?? '',
-                    style: TextStyle(
-                      fontSize: 14.0,
-                      fontWeight: FontWeight.bold,
-                      fontFamily: 'Lato',
-                      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            Container(
-              child: Icon(
-                Icons.keyboard_arrow_down,
-                color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/src/screens/dashboard/widgets/transactions_page.dart

@@ -34,7 +34,7 @@ class TransactionsPage extends StatelessWidget {
       onLongPressUp: () => dashboardViewModel.balanceViewModel.isReversing =
           !dashboardViewModel.balanceViewModel.isReversing,
       child: Container(
-        color: responsiveLayoutUtil.shouldRenderMobileUI
+        color: ResponsiveLayoutUtil.instance.isMobile
             ? null
             : Theme.of(context).colorScheme.background,
         padding: EdgeInsets.only(top: 24, bottom: 24),

lib/src/screens/exchange/exchange_page.dart

@@ -127,7 +127,7 @@ class ExchangePage extends BasePage {
     final _closeButton =
         currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
-    bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
+    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile;
 
     return MergeSemantics(
       child: SizedBox(
@@ -705,7 +705,7 @@ class ExchangePage extends BasePage {
               },
             ));
 
-    if (responsiveLayoutUtil.shouldRenderMobileUI) {
+    if (ResponsiveLayoutUtil.instance.isMobile) {
       return MobileExchangeCardsSection(
         firstExchangeCard: firstExchangeCard,
         secondExchangeCard: secondExchangeCard,

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -96,7 +96,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
           content: Center(
             child: ConstrainedBox(
               constraints:
-                  BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+                  BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -70,7 +70,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
   Widget build(BuildContext context) {
     return Center(
         child: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
             child: Column(
               children: [
                 Padding(

lib/src/screens/nodes/node_create_or_edit_page.dart

@@ -69,7 +69,7 @@ class NodeCreateOrEditPage extends BasePage {
   @override
   Widget trailing(BuildContext context) => IconButton(
         onPressed: () async {
-          await nodeCreateOrEditViewModel.scanQRCodeForNewNode(context);
+          await nodeCreateOrEditViewModel.scanQRCodeForNewNode();
         },
         splashColor: Colors.transparent,
         highlightColor: Colors.transparent,

lib/src/screens/nodes/pow_node_create_or_edit_page.dart

@@ -69,7 +69,7 @@ class PowNodeCreateOrEditPage extends BasePage {
   @override
   Widget trailing(BuildContext context) => IconButton(
         onPressed: () async {
-          await nodeCreateOrEditViewModel.scanQRCodeForNewNode(context);
+          await nodeCreateOrEditViewModel.scanQRCodeForNewNode();
         },
         splashColor: Colors.transparent,
         highlightColor: Colors.transparent,

lib/src/screens/pin_code/pin_code_widget.dart

@@ -191,7 +191,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
               child: Center(
                 child: ConstrainedBox(
                   constraints: BoxConstraints(
-                    maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
+                    maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint,
                   ),
                   child: Container(
                     key: _gridViewKey,

lib/src/screens/receive/anonpay_invoice_page.dart

@@ -99,7 +99,7 @@ class AnonPayInvoicePage extends BasePage {
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.only(bottom: 24),
           content: Container(
-            decoration: responsiveLayoutUtil.shouldRenderMobileUI ? BoxDecoration(
+            decoration: ResponsiveLayoutUtil.instance.isMobile ? BoxDecoration(
               borderRadius: BorderRadius.only(
                   bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
               gradient: LinearGradient(

lib/src/screens/receive/widgets/currency_input_field.dart

@@ -32,7 +32,7 @@ class CurrencyInputField extends StatelessWidget {
     );
     // This magic number for wider screen sets the text input focus at center of the inputfield
     final _width =
-        responsiveLayoutUtil.shouldRenderMobileUI ? MediaQuery.of(context).size.width : 500;
+        ResponsiveLayoutUtil.instance.isMobile ? MediaQuery.of(context).size.width : 500;
 
     return Column(
       children: [

lib/src/screens/receive/widgets/qr_widget.dart

@@ -38,134 +38,129 @@ class QRWidget extends StatelessWidget {
     final copyImage = Image.asset('assets/images/copy_address.png',
         color: Theme.of(context).extension<QRCodeTheme>()!.qrWidgetCopyButtonColor);
 
-    return Center(
-      child: SingleChildScrollView(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: <Widget>[
-            Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.only(bottom: 12),
-                  child: Text(
-                    S.of(context).qr_fullscreen,
-                    style: TextStyle(
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
-                  ),
-                ),
-                Row(
-                  children: <Widget>[
-                    Spacer(flex: 3),
-                    Observer(
-                      builder: (_) => Flexible(
-                        flex: 5,
-                        child: GestureDetector(
-                          onTap: () {
-                            BrightnessUtil.changeBrightnessForFunction(
-                              () async {
-                                await Navigator.pushNamed(context, Routes.fullscreenQR,
-                                    arguments: QrViewData(
-                                      data: addressListViewModel.uri.toString(),
-                                      heroTag: heroTag,
-                                    ));
-                              },
-                            );
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        Column(
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: Text(
+                S.of(context).qr_fullscreen,
+                style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w500,
+                    color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
+              ),
+            ),
+            Row(
+              children: <Widget>[
+                Spacer(flex: 3),
+                Observer(
+                  builder: (_) => Flexible(
+                    flex: 5,
+                    child: GestureDetector(
+                      onTap: () {
+                        BrightnessUtil.changeBrightnessForFunction(
+                          () async {
+                            await Navigator.pushNamed(context, Routes.fullscreenQR,
+                                arguments: QrViewData(
+                                  data: addressListViewModel.uri.toString(),
+                                  heroTag: heroTag,
+                                ));
                           },
-                          child: Hero(
-                            tag: Key(heroTag ?? addressListViewModel.uri.toString()),
-                            child: Center(
-                              child: AspectRatio(
-                                aspectRatio: 1.0,
-                                child: Container(
-                                  padding: EdgeInsets.all(5),
+                        );
+                      },
+                      child: Hero(
+                        tag: Key(heroTag ?? addressListViewModel.uri.toString()),
+                        child: Center(
+                          child: AspectRatio(
+                            aspectRatio: 1.0,
+                            child: Container(
+                              padding: EdgeInsets.all(5),
+                              decoration: BoxDecoration(
+                                border: Border.all(
+                                  width: 3,
+                                  color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                                ),
+                              ),
+                              child: Container(
                                   decoration: BoxDecoration(
                                     border: Border.all(
                                       width: 3,
-                                      color:
-                                          Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                                      color:Colors.white,
                                     ),
                                   ),
-                                  child: Container(
-                                      decoration: BoxDecoration(
-                                        border: Border.all(
-                                          width: 3,
-                                          color: Colors.white,
-                                        ),
-                                      ),
-                                      child: QrImage(data: addressListViewModel.uri.toString())),
-                                ),
-                              ),
+                                  child: QrImage(data: addressListViewModel.uri.toString())),
                             ),
                           ),
                         ),
                       ),
                     ),
-                    Spacer(flex: 3)
-                  ],
+                  ),
                 ),
+                Spacer(flex: 3)
               ],
             ),
-            Observer(builder: (_) {
-              return Padding(
-                padding: EdgeInsets.only(top: 10),
-                child: Row(
-                  children: <Widget>[
-                    Expanded(
-                      child: Form(
-                        key: formKey,
-                        child: CurrencyInputField(
-                          focusNode: amountTextFieldFocusNode,
-                          controller: amountController,
-                          onTapPicker: () => _presentPicker(context),
-                          selectedCurrency: addressListViewModel.selectedCurrency,
-                          isLight: isLight,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              );
-            }),
-            Padding(
-              padding: EdgeInsets.only(top: 20, bottom: 8),
-              child: Builder(
-                builder: (context) => Observer(
-                  builder: (context) => GestureDetector(
-                    onTap: () {
-                      Clipboard.setData(ClipboardData(text: addressListViewModel.address.address));
-                      showBar<void>(context, S.of(context).copied_to_clipboard);
-                    },
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: <Widget>[
-                        Expanded(
-                          child: Text(
-                            addressListViewModel.address.address,
-                            textAlign: TextAlign.center,
-                            style: TextStyle(
-                                fontSize: 15,
-                                fontWeight: FontWeight.w500,
-                                color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
-                          ),
-                        ),
-                        Padding(
-                          padding: EdgeInsets.only(left: 12),
-                          child: copyImage,
-                        )
-                      ],
+          ],
+        ),
+        Observer(builder: (_) {
+          return Padding(
+            padding: EdgeInsets.only(top: 10),
+            child: Row(
+              children: <Widget>[
+                Expanded(
+                  child: Form(
+                    key: formKey,
+                    child: CurrencyInputField(
+                      focusNode: amountTextFieldFocusNode,
+                      controller: amountController,
+                      onTapPicker: () => _presentPicker(context),
+                      selectedCurrency: addressListViewModel.selectedCurrency,
+                      isLight: isLight,
                     ),
                   ),
                 ),
+              ],
+            ),
+          );
+        }),
+        Padding(
+          padding: EdgeInsets.only(top: 20, bottom: 8),
+          child: Builder(
+            builder: (context) => Observer(
+              builder: (context) => GestureDetector(
+                onTap: () {
+                  Clipboard.setData(ClipboardData(text: addressListViewModel.address.address));
+                  showBar<void>(context, S.of(context).copied_to_clipboard);
+                },
+                child: Row(
+                  mainAxisSize: MainAxisSize.max,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Expanded(
+                      child: Text(
+                        addressListViewModel.address.address,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                            fontSize: 15,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
+                      ),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(left: 12),
+                      child: copyImage,
+                    )
+                  ],
+                ),
               ),
-            )
-          ],
-        ),
-      ),
+            ),
+          ),
+        )
+      ],
     );
   }
 

lib/src/screens/restore/restore_from_backup_page.dart

@@ -42,7 +42,7 @@ class RestoreFromBackupPage extends BasePage {
 
     return Center(
       child: ConstrainedBox(
-        constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+        constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
         child: Padding(
             padding: EdgeInsets.only(bottom: 24, left: 24, right: 24),
             child: Column(children: [

lib/src/screens/restore/restore_options_page.dart

@@ -12,8 +12,6 @@ import 'package:cake_wallet/routes.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:cake_wallet/utils/permission_handler.dart';
 
 class RestoreOptionsPage extends BasePage {
   RestoreOptionsPage({required this.isNewInstall});
@@ -31,7 +29,7 @@ class RestoreOptionsPage extends BasePage {
   Widget body(BuildContext context) {
     return Center(
       child: Container(
-          width: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
+          width: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint,
           height: double.infinity,
           padding: EdgeInsets.symmetric(vertical: 24, horizontal: 24),
           child: SingleChildScrollView(
@@ -57,9 +55,6 @@ class RestoreOptionsPage extends BasePage {
                   padding: EdgeInsets.only(top: 24),
                   child: OptionTile(
                       onPressed: () async {
-                        bool isCameraPermissionGranted =
-                        await PermissionHandler.checkPermission(Permission.camera, context);
-                        if (!isCameraPermissionGranted) return;
                         bool isPinSet = false;
                         if (isNewInstall) {
                           await Navigator.pushNamed(context, Routes.setupPin,

lib/src/screens/restore/wallet_restore_page.dart

@@ -163,7 +163,7 @@ class WalletRestorePage extends BasePage {
         color: Theme.of(context).colorScheme.background,
         child: Center(
           child: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [

lib/src/screens/root/root.dart

@@ -1,17 +1,15 @@
 import 'dart:async';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
-import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:uni_links/uni_links.dart';
 
 import '../setup_2fa/setup_2fa_enter_code_page.dart';
@@ -141,9 +139,8 @@ class RootState extends State<Root> with WidgetsBindingObserver {
                       }
                       _reset();
                       totpAuth.close(
-                        route: _getRouteToGo(),
-                        arguments:
-                            isWalletConnectLink ? launchUri : PaymentRequest.fromUri(launchUri),
+                        route: _isValidPaymentUri() ? Routes.send : null,
+                        arguments: PaymentRequest.fromUri(launchUri),
                       );
                       launchUri = null;
                     },
@@ -154,8 +151,8 @@ class RootState extends State<Root> with WidgetsBindingObserver {
               } else {
                 _reset();
                 auth.close(
-                  route: _getRouteToGo(),
-                  arguments: isWalletConnectLink ? launchUri : PaymentRequest.fromUri(launchUri),
+                  route: _isValidPaymentUri() ? Routes.send : null,
+                  arguments: PaymentRequest.fromUri(launchUri),
                 );
                 launchUri = null;
               }
@@ -169,19 +166,8 @@ class RootState extends State<Root> with WidgetsBindingObserver {
         arguments: PaymentRequest.fromUri(launchUri),
       );
       launchUri = null;
-    } else if (isWalletConnectLink) {
-      if (widget.appStore.wallet!.type == WalletType.ethereum) {
-        widget.navigatorKey.currentState?.pushNamed(
-          Routes.walletConnectConnectionsListing,
-          arguments: launchUri,
-        );
-        launchUri = null;
-      } else {
-        _nonETHWalletErrorToast(S.current.switchToETHWallet);
-      }
     }
-    
-    launchUri = null;
+
     return WillPopScope(
       onWillPop: () async => false,
       child: widget.child,
@@ -201,31 +187,4 @@ class RootState extends State<Root> with WidgetsBindingObserver {
   }
 
   bool _isValidPaymentUri() => launchUri?.path.isNotEmpty ?? false;
-
-  bool get isWalletConnectLink => launchUri?.authority == 'wc';
-
-  String? _getRouteToGo() {
-    if (isWalletConnectLink) {
-      if (widget.appStore.wallet!.type != WalletType.ethereum) {
-        _nonETHWalletErrorToast(S.current.switchToETHWallet);
-        return null;
-      }
-      return Routes.walletConnectConnectionsListing;
-    } else if (_isValidPaymentUri()) {
-      return Routes.send;
-    } else {
-      return null;
-    }
-  }
-
-  Future<void> _nonETHWalletErrorToast(String message) async {
-    Fluttertoast.showToast(
-      msg: message,
-      toastLength: Toast.LENGTH_LONG,
-      gravity: ToastGravity.SNACKBAR,
-      backgroundColor: Colors.black,
-      textColor: Colors.white,
-      fontSize: 16.0,
-    );
-  }
 }

lib/src/screens/seed/pre_seed_page.dart

@@ -35,7 +35,7 @@ class PreSeedPage extends BasePage {
           alignment: Alignment.center,
           padding: EdgeInsets.all(24),
           child: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[

lib/src/screens/seed/wallet_seed_page.dart

@@ -93,7 +93,7 @@ class WalletSeedPage extends BasePage {
           padding: EdgeInsets.all(24),
           alignment: Alignment.center,
           child: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[

lib/src/screens/send/send_page.dart

@@ -69,7 +69,7 @@ class SendPage extends BasePage {
     final _closeButton =
         currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
-    bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
+    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile;
 
     return MergeSemantics(
       child: SizedBox(
@@ -98,7 +98,7 @@ class SendPage extends BasePage {
   double _sendCardHeight(BuildContext context) {
     final double initialHeight = sendViewModel.hasCoinControl ? 500 : 465;
 
-    if (!responsiveLayoutUtil.shouldRenderMobileUI) {
+    if (!ResponsiveLayoutUtil.instance.isMobile) {
       return initialHeight - 66;
     }
     return initialHeight;

lib/src/screens/send/widgets/send_card.dart

@@ -122,7 +122,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
           ),
         ),
         Container(
-          decoration: responsiveLayoutUtil.shouldRenderMobileUI
+          decoration: ResponsiveLayoutUtil.instance.isMobile
               ? BoxDecoration(
                   borderRadius: BorderRadius.only(
                       bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
@@ -139,9 +139,9 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
           child: Padding(
             padding: EdgeInsets.fromLTRB(
               24,
-              responsiveLayoutUtil.shouldRenderMobileUI ? 100 : 55,
+              ResponsiveLayoutUtil.instance.isMobile ? 100 : 55,
               24,
-              responsiveLayoutUtil.shouldRenderMobileUI ? 32 : 0,
+              ResponsiveLayoutUtil.instance.isMobile ? 32 : 0,
             ),
             child: SingleChildScrollView(
               child: Observer(

lib/src/screens/settings/connection_sync_page.dart

@@ -87,7 +87,15 @@ class ConnectionSyncPage extends BasePage {
           ),
           if (dashboardViewModel.wallet.type == WalletType.ethereum) ...[
             WalletConnectTile(
-              onTap: () => Navigator.of(context).pushNamed(Routes.walletConnectConnectionsListing),
+              onTap: () async {
+                Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) {
+                      return WalletConnectConnectionsView(web3walletService: web3walletService!);
+                    },
+                  ),
+                );
+              },
             ),
             const StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
           ]

lib/src/screens/settings/display_settings_page.dart

@@ -75,7 +75,7 @@ class DisplaySettingsPage extends BasePage {
                   return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
                 },
               ),
-              if (responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile)
+              if (ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile)
                 SettingsThemeChoicesCell(_displaySettingsViewModel),
             ],
           ),

lib/src/screens/setup_2fa/modify_2fa_page.dart

@@ -133,17 +133,6 @@ class _2FAControlsWidget extends StatelessWidget {
           },
         ),
         StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
-        Observer(
-          builder: (context) {
-            return SettingsSwitcherCell(
-              title: S.current.require_for_exchanges_to_external_wallets,
-              value: setup2FAViewModel.shouldRequireTOTP2FAForExchangesToExternalWallets,
-              onValueChange: (context, value) async =>
-                  setup2FAViewModel.switchShouldRequireTOTP2FAForExchangesToExternalWallets(value),
-            );
-          },
-        ),
-        StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
         Observer(
           builder: (context) {
             return SettingsSwitcherCell(

lib/src/screens/wallet_connect/wc_connections_listing_view.dart

@@ -8,12 +8,10 @@ import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/utils/permission_handler.dart';
 
 import 'widgets/pairing_item_widget.dart';
 import 'wc_pairing_detail_page.dart';
@@ -21,24 +19,7 @@ import 'wc_pairing_detail_page.dart';
 class WalletConnectConnectionsView extends StatelessWidget {
   final Web3WalletService web3walletService;
 
-  WalletConnectConnectionsView({required this.web3walletService, Uri? launchUri, Key? key})
-      : super(key: key) {
-    _triggerPairingFromDeeplink(launchUri);
-  }
-
-  void _triggerPairingFromDeeplink(Uri? launchUri) async {
-    if (launchUri == null) return;
-
-    final actualLinkList = launchUri.query.split("uri=");
-
-    final query = actualLinkList[1];
-
-    final uri = Uri.decodeComponent(query);
-
-    final uriData = Uri.parse(uri);
-
-    await web3walletService.pairWithUri(uriData);
-  }
+  WalletConnectConnectionsView({required this.web3walletService, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -60,9 +41,6 @@ class WCPairingsWidget extends BasePage {
     final String? uri;
 
     if (DeviceInfo.instance.isMobile) {
-      bool isCameraPermissionGranted =
-      await PermissionHandler.checkPermission(Permission.camera, context);
-      if (!isCameraPermissionGranted) return;
       uri = await presentQRScanner();
     } else {
       uri = await _showEnterWalletConnectURIPopUp(context);
@@ -70,9 +48,15 @@ class WCPairingsWidget extends BasePage {
 
     if (uri == null) return _invalidUriToast(context, S.current.nullURIError);
 
-    log('_onFoundUri: $uri');
-    final Uri uriData = Uri.parse(uri);
-    await web3walletService.pairWithUri(uriData);
+    try {
+      log('_onFoundUri: $uri');
+      final Uri uriData = Uri.parse(uri);
+      await web3Wallet.pair(uri: uriData);
+    } on WalletConnectError catch (e) {
+      await _invalidUriToast(context, e.message);
+    } catch (e) {
+      await _invalidUriToast(context, e.toString());
+    }
   }
 
   Future<String?> _showEnterWalletConnectURIPopUp(BuildContext context) async {

lib/src/screens/wallet_connect/widgets/error_display_widget.dart

@@ -22,19 +22,13 @@ class BottomSheetMessageDisplayWidget extends StatelessWidget {
           ),
         ),
         SizedBox(height: 8),
-        Row(
-          children: [
-            Expanded(
-              child: Text(
-                message,
-                style: TextStyle(
-                  fontSize: 14,
-                  fontWeight: FontWeight.normal,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-          ],
+        Text(
+          message,
+          style: TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.normal,
+            color: Colors.white,
+          ),
         ),
       ],
     );

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -275,7 +275,7 @@ class WalletListBodyState extends State<WalletListBody> {
           await hideProgressText();
           // only pop the wallets route in mobile as it will go back to dashboard page
           // in desktop platforms the navigation tree is different
-          if (responsiveLayoutUtil.shouldRenderMobileUI) {
+          if (ResponsiveLayoutUtil.instance.shouldRenderMobileUI()) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
               Navigator.of(context).pop();
             });

lib/src/screens/welcome/welcome_page.dart

@@ -70,7 +70,7 @@ class WelcomePage extends BasePage {
             padding: EdgeInsets.only(top: 64, bottom: 24, left: 24, right: 24),
             child: ConstrainedBox(
               constraints: BoxConstraints(
-                  maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+                  maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: <Widget>[

lib/src/widgets/add_template_button.dart

@@ -27,7 +27,7 @@ class AddTemplateButton extends StatelessWidget {
           child: Container(
             height: 34,
             padding: EdgeInsets.symmetric(
-                horizontal: responsiveLayoutUtil.shouldRenderMobileUI ? 10 : 30),
+                horizontal: ResponsiveLayoutUtil.instance.isMobile ? 10 : 30),
             alignment: Alignment.center,
             decoration: BoxDecoration(
               borderRadius: BorderRadius.all(Radius.circular(20)),

lib/src/widgets/address_text_field.dart

@@ -9,8 +9,6 @@ import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
-import 'package:cake_wallet/utils/permission_handler.dart';
-import 'package:permission_handler/permission_handler.dart';
 
 enum AddressTextFieldOption { paste, qrCode, addressBook }
 
@@ -100,7 +98,7 @@ class AddressTextField extends StatelessWidget {
             child: SizedBox(
               width: prefixIconWidth * options.length + (spaceBetweenPrefixIcons * options.length),
               child: Row(
-                mainAxisAlignment: responsiveLayoutUtil.shouldRenderMobileUI
+                mainAxisAlignment: ResponsiveLayoutUtil.instance.isMobile
                     ? MainAxisAlignment.spaceBetween
                     : MainAxisAlignment.end,
                 children: [
@@ -190,9 +188,6 @@ class AddressTextField extends StatelessWidget {
   }
 
   Future<void> _presentQRScanner(BuildContext context) async {
-    bool isCameraPermissionGranted =
-    await PermissionHandler.checkPermission(Permission.camera, context);
-    if (!isCameraPermissionGranted) return;
     final code = await presentQRScanner();
     if (code.isEmpty) {
       return;

lib/src/widgets/alert_background.dart

@@ -25,7 +25,7 @@ class AlertBackground extends StatelessWidget {
                     Theme.of(context).extension<AlertTheme>()!.backdropColor),
             child: Center(
               child: Container(
-                width: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
+                width: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint,
                 child: child,
               ),
             ),

lib/src/widgets/blockchain_height_widget.dart

@@ -36,13 +36,16 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
     restoreHeightController.addListener(() {
       if (restoreHeightController.text.isNotEmpty) {
         widget.onHeightOrDateEntered?.call(true);
-      } else {
+      }
+      else {
         widget.onHeightOrDateEntered?.call(false);
         dateController.text = '';
       }
       try {
-        _changeHeight(
-            restoreHeightController.text.isNotEmpty ? int.parse(restoreHeightController.text) : 0);
+        _changeHeight(restoreHeightController.text != null &&
+                restoreHeightController.text.isNotEmpty
+            ? int.parse(restoreHeightController.text)
+            : 0);
       } catch (_) {
         _changeHeight(0);
       }
@@ -114,7 +117,7 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
     );
   }
 
-  Future<void> _selectDate(BuildContext context) async {
+  Future _selectDate(BuildContext context) async {
     final now = DateTime.now();
     final date = await getDate(
         context: context,
@@ -123,7 +126,7 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
         lastDate: now);
 
     if (date != null) {
-      final height = monero!.getHeightByDate(date: date);
+      final height = monero!.getHeigthByDate(date: date);
       setState(() {
         dateController.text = DateFormat('yyyy-MM-dd').format(date);
         restoreHeightController.text = '$height';

lib/src/widgets/check_box_picker.dart

@@ -61,7 +61,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: MediaQuery.of(context).size.height * 0.65,
-                  maxWidth: ResponsiveLayoutUtilBase.kPopupWidth,
+                  maxWidth: ResponsiveLayoutUtil.kPopupWidth,
                 ),
                 child: Column(
                   mainAxisSize: MainAxisSize.min,

lib/src/widgets/picker.dart

@@ -151,7 +151,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: containerHeight,
-                  maxWidth: ResponsiveLayoutUtilBase.kPopupWidth,
+                  maxWidth: ResponsiveLayoutUtil.kPopupWidth,
                 ),
                 child: Column(
                   mainAxisSize: MainAxisSize.min,

lib/src/widgets/picker_inner_wrapper_widget.dart

@@ -52,7 +52,7 @@ class PickerInnerWrapperWidget extends StatelessWidget {
                         itemsHeight != null && itemsHeight! <= containerHeight
                             ? itemsHeight!
                             : containerHeight,
-                    maxWidth: ResponsiveLayoutUtilBase.kPopupWidth,
+                    maxWidth: ResponsiveLayoutUtil.kPopupWidth,
                   ),
                   child: Column(
                     children: children,
@@ -77,7 +77,7 @@ class PickerInnerWrapperWidget extends StatelessWidget {
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: containerHeight,
-                  maxWidth: ResponsiveLayoutUtilBase.kPopupWidth,
+                  maxWidth: ResponsiveLayoutUtil.kPopupWidth,
                 ),
                 child: Column(
                   children: children,

lib/src/widgets/picker_wrapper_widget.dart

@@ -44,7 +44,7 @@ class PickerWrapperWidget extends StatelessWidget {
                   mainAxisSize: MainAxisSize.min,
                   children: children,
                 ),
-                SizedBox(height: ResponsiveLayoutUtilBase.kPopupSpaceHeight),
+                SizedBox(height: ResponsiveLayoutUtil.kPopupSpaceHeight),
                 AlertCloseButton(bottom: closeButtonBottom),
               ],
             ),

lib/src/widgets/primary_button.dart

@@ -26,7 +26,7 @@ class PrimaryButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final content = ConstrainedBox(
-      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
       child: SizedBox(
           width: double.infinity,
           height: 52.0,
@@ -82,7 +82,7 @@ class LoadingPrimaryButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ConstrainedBox(
-      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
       child: SizedBox(
           width: double.infinity,
           height: 52.0,
@@ -138,7 +138,7 @@ class PrimaryIconButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ConstrainedBox(
-      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
       child: SizedBox(
           width: double.infinity,
           height: 52.0,
@@ -201,7 +201,7 @@ class PrimaryImageButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ConstrainedBox(
-      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+      constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
       child: SizedBox(
           width: double.infinity,
           height: 52.0,

lib/store/dashboard/trade_filter_store.dart

@@ -1,7 +1,7 @@
-import 'package:cake_wallet/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 
 part'trade_filter_store.g.dart';
 
@@ -87,31 +87,29 @@ abstract class TradeFilterStoreBase with Store {
   }
 
   List<TradeListItem> filtered({required List<TradeListItem> trades, required WalletBase wallet}) {
-    final _trades = trades
-        .where((item) => item.trade.walletId == wallet.id && isTradeInAccount(item, wallet))
-        .toList();
+    final _trades =
+    trades.where((item) => item.trade.walletId == wallet.id).toList();
     final needToFilter = !displayAllTrades;
 
     return needToFilter
         ? _trades
-            .where((item) =>
-                (displayXMRTO && item.trade.provider == ExchangeProviderDescription.xmrto) ||
-                (displaySideShift &&
-                    item.trade.provider == ExchangeProviderDescription.sideShift) ||
-                (displayChangeNow &&
-                    item.trade.provider == ExchangeProviderDescription.changeNow) ||
-                (displayMorphToken &&
-                    item.trade.provider == ExchangeProviderDescription.morphToken) ||
-                (displaySimpleSwap &&
-                    item.trade.provider == ExchangeProviderDescription.simpleSwap) ||
-                (displayTrocador && item.trade.provider == ExchangeProviderDescription.trocador) ||
-                (displayExolix && item.trade.provider == ExchangeProviderDescription.exolix))
-            .toList()
+        .where((item) =>
+    (displayXMRTO &&
+        item.trade.provider == ExchangeProviderDescription.xmrto) ||
+        (displaySideShift &&
+            item.trade.provider == ExchangeProviderDescription.sideShift) ||
+        (displayChangeNow &&
+            item.trade.provider ==
+                ExchangeProviderDescription.changeNow) ||
+        (displayMorphToken &&
+            item.trade.provider ==
+                ExchangeProviderDescription.morphToken)
+        ||(displaySimpleSwap &&
+            item.trade.provider ==
+                ExchangeProviderDescription.simpleSwap)
+        ||(displayTrocador && item.trade.provider == ExchangeProviderDescription.trocador)
+        ||(displayExolix && item.trade.provider == ExchangeProviderDescription.exolix))
+        .toList()
         : _trades;
   }
-
-  bool isTradeInAccount(TradeListItem item, WalletBase wallet) =>
-      item.trade.fromWalletAddress == null
-          ? true
-          : wallet.walletAddresses.containsAddress(item.trade.fromWalletAddress!);
-}
+}

lib/store/settings_store.dart

@@ -76,7 +76,6 @@ abstract class SettingsStoreBase with Store {
       required bool initialShouldRequireTOTP2FAForSendsToNonContact,
       required bool initialShouldRequireTOTP2FAForSendsToInternalWallets,
       required bool initialShouldRequireTOTP2FAForExchangesToInternalWallets,
-      required bool initialShouldRequireTOTP2FAForExchangesToExternalWallets,
       required bool initialShouldRequireTOTP2FAForAddingContacts,
       required bool initialShouldRequireTOTP2FAForCreatingNewWallets,
       required bool initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings,
@@ -125,8 +124,6 @@ abstract class SettingsStoreBase with Store {
             initialShouldRequireTOTP2FAForSendsToInternalWallets,
         shouldRequireTOTP2FAForExchangesToInternalWallets =
             initialShouldRequireTOTP2FAForExchangesToInternalWallets,
-        shouldRequireTOTP2FAForExchangesToExternalWallets =
-            initialShouldRequireTOTP2FAForExchangesToExternalWallets,
         shouldRequireTOTP2FAForAddingContacts = initialShouldRequireTOTP2FAForAddingContacts,
         shouldRequireTOTP2FAForCreatingNewWallets =
             initialShouldRequireTOTP2FAForCreatingNewWallets,
@@ -280,12 +277,6 @@ abstract class SettingsStoreBase with Store {
             PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets,
             requireTOTP2FAForExchangesToInternalWallets));
 
-    reaction(
-        (_) => shouldRequireTOTP2FAForExchangesToExternalWallets,
-        (bool requireTOTP2FAForExchangesToExternalWallets) => sharedPreferences.setBool(
-            PreferencesKey.shouldRequireTOTP2FAForExchangesToExternalWallets,
-            requireTOTP2FAForExchangesToExternalWallets));
-
     reaction(
         (_) => shouldRequireTOTP2FAForAddingContacts,
         (bool requireTOTP2FAForAddingContacts) => sharedPreferences.setBool(
@@ -470,9 +461,6 @@ abstract class SettingsStoreBase with Store {
   @observable
   bool shouldRequireTOTP2FAForExchangesToInternalWallets;
 
-  @observable
-  bool shouldRequireTOTP2FAForExchangesToExternalWallets;
-
   @observable
   Cake2FAPresetsOptions selectedCake2FAPreset;
 
@@ -663,9 +651,6 @@ abstract class SettingsStoreBase with Store {
     final shouldRequireTOTP2FAForExchangesToInternalWallets = sharedPreferences
         .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
         false;
-    final shouldRequireTOTP2FAForExchangesToExternalWallets = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToExternalWallets) ??
-        false;
     final shouldRequireTOTP2FAForAddingContacts =
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts) ?? false;
     final shouldRequireTOTP2FAForCreatingNewWallets =
@@ -832,8 +817,6 @@ abstract class SettingsStoreBase with Store {
           shouldRequireTOTP2FAForSendsToInternalWallets,
           initialShouldRequireTOTP2FAForExchangesToInternalWallets:
           shouldRequireTOTP2FAForExchangesToInternalWallets,
-        initialShouldRequireTOTP2FAForExchangesToExternalWallets:
-            shouldRequireTOTP2FAForExchangesToExternalWallets,
           initialShouldRequireTOTP2FAForAddingContacts: shouldRequireTOTP2FAForAddingContacts,
           initialShouldRequireTOTP2FAForCreatingNewWallets: shouldRequireTOTP2FAForCreatingNewWallets,
           initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings:
@@ -918,9 +901,6 @@ abstract class SettingsStoreBase with Store {
     shouldRequireTOTP2FAForExchangesToInternalWallets = sharedPreferences
         .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
         false;
-    shouldRequireTOTP2FAForExchangesToExternalWallets = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToExternalWallets) ??
-        false;
     shouldRequireTOTP2FAForAddingContacts =
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts) ?? false;
     shouldRequireTOTP2FAForCreatingNewWallets =

lib/utils/permission_handler.dart

@@ -1,32 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/utils/show_bar.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:permission_handler/permission_handler.dart';
-
-class PermissionHandler {
-  static Future<bool> checkPermission(Permission permission, BuildContext context) async {
-    final Map<Permission, String> _permissionMessages = {
-      Permission.camera: S.of(context).camera_permission_is_required,
-    };
-
-    var status = await permission.status;
-
-    if (status.isDenied) {
-      status = await permission.request();
-    }
-
-    if (status.isPermanentlyDenied || status.isDenied) {
-      String? message = _permissionMessages[permission];
-      if (message != null) {
-        showBar<void>(context, message);
-      }
-      return false;
-    }
-
-    if (status.isGranted) {
-      return true;
-    }
-
-    return false;
-  }
-}

lib/utils/responsive_layout_util.dart

@@ -1,53 +1,46 @@
 import 'package:flutter/material.dart';
-import 'package:mobx/mobx.dart';
 
-part 'responsive_layout_util.g.dart';
-
-class _ResponsiveLayoutUtil = ResponsiveLayoutUtilBase with _$_ResponsiveLayoutUtil;
-
-abstract class ResponsiveLayoutUtilBase with Store, WidgetsBindingObserver {
+class ResponsiveLayoutUtil {
   static const double _kMobileThreshold = 550;
   static const double kDesktopMaxWidthConstraint = 400;
   static const double kDesktopMaxDashBoardWidthConstraint = 900;
   static const double kPopupWidth = 400;
   static const double kPopupSpaceHeight = 100;
 
-  ResponsiveLayoutUtilBase() {
-    WidgetsBinding.instance.addObserver(this);
-    final initialMediaQuery = MediaQueryData.fromView(WidgetsBinding.instance!.window);
-    updateDeviceInfo(initialMediaQuery);
+  const ResponsiveLayoutUtil._();
+
+  static final instance = ResponsiveLayoutUtil._();
+
+  bool get isMobile =>
+      MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.shortestSide <=
+      _kMobileThreshold;
+
+  bool shouldRenderMobileUI() {
+    final mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+    final orientation = mediaQuery.orientation;
+    final width = mediaQuery.size.width;
+    final height = mediaQuery.size.height;
+    if (isMobile ||
+        (orientation == Orientation.portrait && width < height) ||
+        (orientation == Orientation.landscape && width < height)) {
+      return true;
+    } else {
+      return false;
+    }
   }
 
-  @override
-  void didChangeMetrics() {
-    final mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance!.window);
-    updateDeviceInfo(mediaQuery);
-  }
+  /// Returns dynamic size.
+  ///
+  /// If screen size is mobile, it returns 66% ([scale]) of the [originalValue].
+  double getDynamicSize(
+    double originalValue, {
+    double? mobileSize,
+    double? scale,
+  }) {
+    scale ??= 2 / 3;
+    mobileSize ??= originalValue * scale;
+    final value = isMobile ? mobileSize : originalValue;
 
-  @observable
-  double screenWidth = 0.0;
-
-  @observable
-  double screenHeight = 0.0;
-
-  @observable
-  Orientation orientation = Orientation.portrait;
-
-  @action
-  void updateDeviceInfo(MediaQueryData mediaQuery) {
-    orientation = mediaQuery.orientation;
-    screenWidth = mediaQuery.size.width;
-    screenHeight = mediaQuery.size.height;
-  }
-
-  @computed
-  bool get shouldRenderMobileUI {
-    return (screenWidth <= _kMobileThreshold) ||
-        (orientation == Orientation.portrait && screenWidth < screenHeight) ||
-        (orientation == Orientation.landscape && screenWidth < screenHeight);
+    return value.roundToDouble();
   }
 }
-
-_ResponsiveLayoutUtil _singletonResponsiveLayoutUtil = _ResponsiveLayoutUtil();
-
-_ResponsiveLayoutUtil get responsiveLayoutUtil => _singletonResponsiveLayoutUtil;

lib/view_model/dashboard/balance_view_model.dart

@@ -83,9 +83,6 @@ abstract class BalanceViewModelBase with Store {
   @computed
   bool get isHomeScreenSettingsEnabled => wallet.type == WalletType.ethereum;
 
-  @computed
-  bool get hasAccounts => wallet.type == WalletType.monero;
-
   @computed
   SortBalanceBy get sortBalanceBy => settingsStore.sortBalanceBy;
 

lib/view_model/dashboard/dashboard_view_model.dart

@@ -1,36 +1,36 @@
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
-import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/buy_provider_types.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
-import 'package:cake_wallet/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/store/dashboard/orders_store.dart';
-import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
-import 'package:cake_wallet/store/dashboard/trades_store.dart';
-import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
+import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
+import 'package:cake_wallet/view_model/settings/sync_mode.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_core/balance.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cw_core/transaction_info.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/store/dashboard/orders_store.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
 import 'package:cake_wallet/utils/mobx.dart';
-import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
-import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
-import 'package:cake_wallet/view_model/dashboard/formatted_item_list.dart';
 import 'package:cake_wallet/view_model/dashboard/order_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
-import 'package:cake_wallet/view_model/settings/sync_mode.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:cw_core/balance.dart';
-import 'package:cw_core/sync_status.dart';
-import 'package:cw_core/transaction_history.dart';
-import 'package:cw_core/transaction_info.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
 import 'package:mobx/mobx.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/sync_status.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/store/dashboard/trades_store.dart';
+import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
+import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
+import 'package:cake_wallet/view_model/dashboard/formatted_item_list.dart';
+import 'package:cake_wallet/monero/monero.dart';
 
 part 'dashboard_view_model.g.dart';
 
@@ -47,69 +47,69 @@ abstract class DashboardViewModelBase with Store {
       required this.yatStore,
       required this.ordersStore,
       required this.anonpayTransactionsStore})
-      : hasSellAction = false,
-        hasBuyAction = false,
-        hasExchangeAction = false,
-        isShowFirstYatIntroduction = false,
-        isShowSecondYatIntroduction = false,
-        isShowThirdYatIntroduction = false,
-        filterItems = {
-          S.current.transactions: [
-            FilterItem(
-                value: () => transactionFilterStore.displayAll,
-                caption: S.current.all_transactions,
-                onChanged: transactionFilterStore.toggleAll),
-            FilterItem(
-                value: () => transactionFilterStore.displayIncoming,
-                caption: S.current.incoming,
-                onChanged: transactionFilterStore.toggleIncoming),
-            FilterItem(
-                value: () => transactionFilterStore.displayOutgoing,
-                caption: S.current.outgoing,
-                onChanged: transactionFilterStore.toggleOutgoing),
-            // FilterItem(
-            //     value: () => false,
-            //     caption: S.current.transactions_by_date,
-            //     onChanged: null),
-          ],
-          S.current.trades: [
-            FilterItem(
-                value: () => tradeFilterStore.displayAllTrades,
-                caption: S.current.all_trades,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.all)),
-            FilterItem(
-                value: () => tradeFilterStore.displayChangeNow,
-                caption: ExchangeProviderDescription.changeNow.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.changeNow)),
-            FilterItem(
-                value: () => tradeFilterStore.displaySideShift,
-                caption: ExchangeProviderDescription.sideShift.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.sideShift)),
-            FilterItem(
-                value: () => tradeFilterStore.displaySimpleSwap,
-                caption: ExchangeProviderDescription.simpleSwap.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.simpleSwap)),
-            FilterItem(
-                value: () => tradeFilterStore.displayTrocador,
-                caption: ExchangeProviderDescription.trocador.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.trocador)),
-            FilterItem(
-                value: () => tradeFilterStore.displayExolix,
-                caption: ExchangeProviderDescription.exolix.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.exolix)),
-          ]
-        },
-        subname = '',
-        name = appStore.wallet!.name,
-        type = appStore.wallet!.type,
-        transactions = ObservableList<TransactionListItem>(),
-        wallet = appStore.wallet! {
+  : hasSellAction = false,
+    hasBuyAction = false,
+    hasExchangeAction = false,
+    isShowFirstYatIntroduction = false,
+    isShowSecondYatIntroduction = false,
+    isShowThirdYatIntroduction = false,
+    filterItems = {
+      S.current.transactions: [
+        FilterItem(
+            value: () => transactionFilterStore.displayAll,
+            caption: S.current.all_transactions,
+            onChanged:  transactionFilterStore.toggleAll),
+        FilterItem(
+            value: () => transactionFilterStore.displayIncoming,
+            caption: S.current.incoming,
+            onChanged:transactionFilterStore.toggleIncoming),
+        FilterItem(
+            value: () => transactionFilterStore.displayOutgoing,
+            caption: S.current.outgoing,
+            onChanged: transactionFilterStore.toggleOutgoing),
+        // FilterItem(
+        //     value: () => false,
+        //     caption: S.current.transactions_by_date,
+        //     onChanged: null),
+      ],
+      S.current.trades: [
+        FilterItem(
+            value: () => tradeFilterStore.displayAllTrades,
+            caption: S.current.all_trades,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.all)),
+        FilterItem(
+            value: () => tradeFilterStore.displayChangeNow,
+            caption: ExchangeProviderDescription.changeNow.title,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.changeNow)),
+        FilterItem(
+            value: () => tradeFilterStore.displaySideShift,
+            caption: ExchangeProviderDescription.sideShift.title,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.sideShift)),
+        FilterItem(
+            value: () => tradeFilterStore.displaySimpleSwap,
+            caption: ExchangeProviderDescription.simpleSwap.title,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.simpleSwap)),
+        FilterItem(
+            value: () => tradeFilterStore.displayTrocador,
+            caption: ExchangeProviderDescription.trocador.title,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.trocador)),
+        FilterItem(
+            value: () => tradeFilterStore.displayExolix,
+            caption: ExchangeProviderDescription.exolix.title,
+            onChanged: () => tradeFilterStore
+                .toggleDisplayExchange(ExchangeProviderDescription.exolix)),
+      ]
+    },
+    subname = '',
+    name = appStore.wallet!.name,
+    type = appStore.wallet!.type,
+    transactions = ObservableList<TransactionListItem>(),
+    wallet = appStore.wallet! {
     name = wallet.name;
     type = wallet.type;
     isShowFirstYatIntroduction = false;
@@ -222,8 +222,9 @@ abstract class DashboardViewModelBase with Store {
   BalanceDisplayMode get balanceDisplayMode => appStore.settingsStore.balanceDisplayMode;
 
   @computed
-  bool get shouldShowMarketPlaceInDashboard =>
-      appStore.settingsStore.shouldShowMarketPlaceInDashboard;
+  bool get shouldShowMarketPlaceInDashboard {
+    return appStore.settingsStore.shouldShowMarketPlaceInDashboard;
+  }
 
   @computed
   List<TradeListItem> get trades =>

lib/view_model/dashboard/trade_list_item.dart

@@ -1,18 +1,25 @@
-import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
 
 class TradeListItem extends ActionListItem {
-  TradeListItem({required this.trade, required this.settingsStore});
+  TradeListItem({
+    required this.trade,
+    required this.settingsStore});
 
   final Trade trade;
   final SettingsStore settingsStore;
 
   BalanceDisplayMode get displayMode => settingsStore.balanceDisplayMode;
 
-  String get tradeFormattedAmount =>
-      displayMode == BalanceDisplayMode.hiddenBalance ? '---' : trade.amountFormatted();
+  String get tradeFormattedAmount {
+    return trade.amount != null
+        ? displayMode == BalanceDisplayMode.hiddenBalance
+          ? '---'
+          : trade.amountFormatted()
+        : trade.amount;
+  }
 
   @override
   DateTime get date => trade.createdAt!;

lib/view_model/exchange/exchange_view_model.dart

@@ -237,21 +237,15 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
   bool get shouldDisplayTOTP2FAForExchangesToInternalWallet =>
       _settingsStore.shouldRequireTOTP2FAForExchangesToInternalWallets;
 
-  @computed
-  bool get shouldDisplayTOTP2FAForExchangesToExternalWallet =>
-      _settingsStore.shouldRequireTOTP2FAForExchangesToExternalWallets;
-
   //* Still open to further optimize these checks
   //* It works but can be made better
   @action
   bool shouldDisplayTOTP() {
     final isInternalWallet = checkIfWalletIsAnInternalWallet(receiveAddress);
-
     if (isInternalWallet) {
       return shouldDisplayTOTP2FAForExchangesToInternalWallet;
-    } else {
-      return shouldDisplayTOTP2FAForExchangesToExternalWallet;
     }
+    return false;
   }
 
   @computed
@@ -269,7 +263,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
       (wallet.type == WalletType.bitcoin ||
           wallet.type == WalletType.litecoin ||
           wallet.type == WalletType.bitcoinCash) &&
-      depositCurrency == wallet.currency;
+          depositCurrency == wallet.currency;
 
   bool get isMoneroWallet => wallet.type == WalletType.monero;
 
@@ -281,11 +275,14 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
       case WalletType.bitcoin:
         return transactionPriority == bitcoin!.getBitcoinTransactionPrioritySlow();
       case WalletType.litecoin:
-        return transactionPriority == bitcoin!.getLitecoinTransactionPrioritySlow();
+        return transactionPriority ==
+            bitcoin!.getLitecoinTransactionPrioritySlow();
       case WalletType.ethereum:
-        return transactionPriority == ethereum!.getEthereumTransactionPrioritySlow();
+        return transactionPriority ==
+            ethereum!.getEthereumTransactionPrioritySlow();
       case WalletType.bitcoinCash:
-        return transactionPriority == bitcoinCash!.getBitcoinCashTransactionPrioritySlow();
+        return transactionPriority ==
+            bitcoinCash!.getBitcoinCashTransactionPrioritySlow();
       default:
         return false;
     }
@@ -494,7 +491,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
               final trade =
                   await provider.createTrade(request: request, isFixedRateMode: isFixedRateMode);
               trade.walletId = wallet.id;
-              trade.fromWalletAddress = wallet.walletAddresses.address;
               tradesStore.setTrade(trade);
               await trades.add(trade);
               tradeState = TradeIsCreatedSuccessfully(trade: trade);
@@ -538,9 +534,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
 
   @action
   void calculateDepositAllAmount() {
-    if (wallet.type == WalletType.bitcoin ||
-        wallet.type == WalletType.litecoin ||
-        wallet.type == WalletType.bitcoinCash) {
+    if (wallet.type == WalletType.bitcoin || wallet.type == WalletType.litecoin || wallet.type == WalletType.bitcoinCash) {
       final availableBalance = wallet.balance[wallet.currency]!.available;
       final priority = _settingsStore.priority[wallet.type]!;
       final fee = wallet.calculateEstimatedFee(priority, null);

lib/view_model/node_list/node_create_or_edit_view_model.dart

@@ -1,14 +1,11 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:collection/collection.dart';
-import 'package:cake_wallet/utils/permission_handler.dart';
-import 'package:permission_handler/permission_handler.dart';
 
 part 'node_create_or_edit_view_model.g.dart';
 
@@ -178,11 +175,8 @@ abstract class NodeCreateOrEditViewModelBase with Store {
   void setAsCurrent(Node node) => _settingsStore.nodes[_walletType] = node;
 
   @action
-  Future<void> scanQRCodeForNewNode(BuildContext context) async {
+  Future<void> scanQRCodeForNewNode() async {
     try {
-      bool isCameraPermissionGranted =
-      await PermissionHandler.checkPermission(Permission.camera, context);
-      if (!isCameraPermissionGranted) return;
       String code = await presentQRScanner();
 
       if (code.isEmpty) {