Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

 Conflicts:

	cw_bitcoin/pubspec.yaml

	cw_core/lib/wallet_base.dart

	cw_monero/ios/Classes/monero_api.cpp

	lib/core/backup_service.dart

	lib/core/wallet_loading_service.dart

	lib/di.dart

	lib/main.dart

	lib/router.dart

	lib/src/screens/exchange/exchange_page.dart

	lib/src/screens/send/send_page.dart

	lib/src/screens/settings/security_backup_page.dart

	lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart

	lib/src/screens/wallet_list/wallet_list_page.dart

	lib/src/widgets/address_text_field.dart

	lib/store/settings_store.dart

	lib/view_model/exchange/exchange_view_model.dart

	lib/view_model/wallet_creation_vm.dart

	lib/view_model/wallet_new_vm.dart

	res/values/strings_yo.arb

	tool/configure.dart

.github/workflows/pr_test_build.yml

@@ -13,6 +13,13 @@ jobs:
       KEY_PASS: test@cake_wallet
 
     steps:
+      - name: Free Up GitHub Actions Ubuntu Runner Disk Space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
@@ -85,6 +92,7 @@ jobs:
           cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           flutter packages pub run build_runner build --delete-conflicting-outputs
 
       - name: Add secrets
@@ -118,6 +126,7 @@ jobs:
           echo "const anonPayReferralCode = '${{ secrets.ANON_PAY_REFERRAL_CODE }}';" >> lib/.secrets.g.dart
           echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const payfuraApiKey = '${{ secrets.PAYFURA_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart
 
       - name: Rename app
         run: echo -e "id=com.cakewallet.test\nname=$GITHUB_HEAD_REF" > /opt/android/cake_wallet/android/app.properties

.gitignore

@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+.fvm/
 
 # IntelliJ related
 *.iml
@@ -89,7 +90,9 @@ android/key.properties
 **/tool/.secrets-prod.json
 **/tool/.secrets-test.json
 **/tool/.secrets-config.json
+**/tool/.ethereum-secrets-config.json
 **/lib/.secrets.g.dart
+**/cw_ethereum/lib/.secrets.g.dart
 
 vendor/
 
@@ -120,6 +123,7 @@ cw_haven/android/.cxx/
 lib/bitcoin/bitcoin.dart
 lib/monero/monero.dart
 lib/haven/haven.dart
+lib/ethereum/ethereum.dart
 
 ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
 ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png

android/app/build.gradle

@@ -45,8 +45,8 @@ android {
 
     defaultConfig {
         applicationId appProperties['id']
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/AndroidManifestBase.xml

@@ -14,6 +14,8 @@
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
         android:fullBackupContent="false"
+        android:versionCode="__versionCode__"
+        android:versionName="__versionName__"
         android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"

android/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true

assets/ethereum_server_list.yml

@@ -0,0 +1,10 @@
+-
+  uri: ethereum.publicnode.com
+-
+  uri: eth.llamarpc.com
+-
+  uri: rpc.flashbots.net
+-
+  uri: eth-mainnet.public.blastapi.io
+-
+  uri: ethereum.publicnode.com

assets/text/Monerocom_Release_Notes.txt

@@ -1,6 +1,8 @@
-Improved edit/delete for nodes and wallets
-Wallets can now be renamed
-Accessibility improvements
-Improve Monero wallet rescan
-Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
-Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
+Monero background syncing! See https://guides.cakewallet.com/docs/monero/#background-syncing
+Cake 2FA access control settings! See https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa-presets-and-access-control-settings
+Support Monero node proxy
+UI improvements when sending to Address Book entry
+Allow renaming Monero account names
+Send templates now support multiple recipients (try using to make Monero change)
+Onramper improvements
+Scan node QR codes (for Umbrel)

assets/text/Release_Notes.txt

@@ -1,7 +1,9 @@
-Improved edit/delete for nodes and wallets
-Wallets can now be renamed
-Accessibility improvements
-Bitcoin transaction bug fixes
-Improve Monero wallet rescan
-Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
-Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
+Ethereum! Store ETH and ERC-20 tokens
+Monero background syncing! See https://guides.cakewallet.com/docs/monero/#background-syncing
+Cake 2FA access control settings! See https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa-presets-and-access-control-settings
+Support Monero node proxy
+UI improvements when sending to Address Book entry
+Allow renaming Monero/Haven account names
+Send templates now support multiple recipients (try using to make Monero change)
+Onramper improvements
+Scan node QR codes (for Umbrel)

configure_cake_wallet_android.sh

@@ -0,0 +1,10 @@
+cd scripts/android
+source ./app_env.sh cakewallet
+./app_config.sh
+cd ../.. && flutter pub get
+cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+flutter packages pub run build_runner build --delete-conflicting-outputs

cw_bitcoin/lib/electrum_transaction_history.dart

@@ -67,7 +67,7 @@ abstract class ElectrumTransactionHistoryBase
   Future<void> _load() async {
     try {
       final content = await _read();
-      final txs = content['transactions'] as Map<String, dynamic> ?? {};
+      final txs = content['transactions'] as Map<String, dynamic>? ?? {};
 
       txs.entries.forEach((entry) {
         final val = entry.value;

cw_bitcoin/lib/electrum_transaction_info.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:bitcoin_flutter/src/payments/index.dart' show PaymentData;
 import 'package:cw_bitcoin/address_from_output.dart';
@@ -217,9 +216,9 @@ class ElectrumTransactionInfo extends TransactionInfo {
         height: info.height,
         amount: info.amount,
         fee: info.fee,
-        direction: direction ?? info.direction,
-        date: date ?? info.date,
-        isPending: isPending ?? info.isPending,
+        direction: direction,
+        date: date,
+        isPending: isPending,
         confirmations: info.confirmations);
   }
 

cw_bitcoin/lib/electrum_wallet.dart

@@ -439,6 +439,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     await transactionHistory.save();
   }
 
+  @override
   Future<void> renameWalletFiles(String newWalletName) async {
     final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type);
     final currentWalletFile = File(currentWalletPath);

cw_bitcoin/pubspec.yaml

@@ -32,7 +32,7 @@ dependencies:
       url: https://github.com/cake-tech/cake_backup.git
       ref: main
       version: 1.0.0
-  
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

cw_core/lib/currency_for_wallet_type.dart

@@ -11,6 +11,8 @@ CryptoCurrency currencyForWalletType(WalletType type) {
       return CryptoCurrency.ltc;
     case WalletType.haven:
       return CryptoCurrency.xhv;
+    case WalletType.ethereum:
+      return CryptoCurrency.eth;
     default:
       throw Exception('Unexpected wallet type: ${type.toString()} for CryptoCurrency currencyForWalletType');
   }

cw_core/lib/erc20_token.dart

@@ -0,0 +1,64 @@
+import 'package:cw_core/crypto_currency.dart';
+import 'package:hive/hive.dart';
+
+part 'erc20_token.g.dart';
+
+@HiveType(typeId: Erc20Token.typeId)
+class Erc20Token extends CryptoCurrency with HiveObjectMixin {
+  @HiveField(0)
+  final String name;
+  @HiveField(1)
+  final String symbol;
+  @HiveField(2)
+  final String contractAddress;
+  @HiveField(3)
+  final int decimal;
+  @HiveField(4, defaultValue: true)
+  bool _enabled;
+  @HiveField(5)
+  final String? iconPath;
+
+  bool get enabled => _enabled;
+
+  set enabled(bool value) => _enabled = value;
+
+  Erc20Token({
+    required this.name,
+    required this.symbol,
+    required this.contractAddress,
+    required this.decimal,
+    bool enabled = true,
+    this.iconPath,
+  })  : _enabled = enabled,
+        super(
+          name: symbol.toLowerCase(),
+          title: symbol.toUpperCase(),
+          fullName: name,
+          tag: "ETH",
+          iconPath: iconPath,
+        );
+
+  Erc20Token.copyWith(Erc20Token other, String? icon)
+      : this.name = other.name,
+        this.symbol = other.symbol,
+        this.contractAddress = other.contractAddress,
+        this.decimal = other.decimal,
+        this._enabled = other.enabled,
+        this.iconPath = icon,
+        super(
+          name: other.name,
+          title: other.symbol.toUpperCase(),
+          fullName: other.name,
+          tag: "ETH",
+          iconPath: icon,
+        );
+
+  static const typeId = 12;
+  static const boxName = 'Erc20Tokens';
+
+  @override
+  bool operator ==(other) => other is Erc20Token && other.contractAddress == contractAddress;
+
+  @override
+  int get hashCode => contractAddress.hashCode;
+}

cw_core/lib/node.dart

@@ -18,6 +18,7 @@ class Node extends HiveObject with Keyable {
       this.password,
       this.useSSL,
       this.trusted = false,
+      this.socksProxyAddress,
       String? uri,
       WalletType? type,}) {
     if (uri != null) {
@@ -33,7 +34,8 @@ class Node extends HiveObject with Keyable {
         login = map['login'] as String?,
         password = map['password'] as String?,
         useSSL = map['useSSL'] as bool?,
-        trusted = map['trusted'] as bool? ?? false;
+        trusted = map['trusted'] as bool? ?? false,
+        socksProxyAddress = map['socksProxyPort'] as String?;
 
   static const typeId = 1;
   static const boxName = 'Nodes';
@@ -56,8 +58,13 @@ class Node extends HiveObject with Keyable {
   @HiveField(5, defaultValue: false)
   bool trusted;
 
+  @HiveField(6)
+  String? socksProxyAddress;
+
   bool get isSSL => useSSL ?? false;
 
+  bool get useSocksProxy => socksProxyAddress == null ? false : socksProxyAddress!.isNotEmpty;
+
   Uri get uri {
     switch (type) {
       case WalletType.monero:
@@ -68,6 +75,8 @@ class Node extends HiveObject with Keyable {
         return createUriFromElectrumAddress(uriRaw);
       case WalletType.haven:
         return Uri.http(uriRaw, '');
+      case WalletType.ethereum:
+        return Uri.https(uriRaw, '');
       default:
         throw Exception('Unexpected type ${type.toString()} for Node uri');
     }
@@ -81,7 +90,8 @@ class Node extends HiveObject with Keyable {
               other.password == password &&
               other.typeRaw == typeRaw &&
               other.useSSL == useSSL &&
-              other.trusted == trusted);
+              other.trusted == trusted &&
+              other.socksProxyAddress == socksProxyAddress);
 
   @override
   int get hashCode =>
@@ -90,7 +100,8 @@ class Node extends HiveObject with Keyable {
       password.hashCode ^
       typeRaw.hashCode ^
       useSSL.hashCode ^
-      trusted.hashCode;
+      trusted.hashCode ^
+      socksProxyAddress.hashCode;
 
   @override
   dynamic get keyIndex {
@@ -108,13 +119,15 @@ class Node extends HiveObject with Keyable {
     try {
       switch (type) {
         case WalletType.monero:
-          return requestMoneroNode();
+          return useSocksProxy ? requestNodeWithProxy(socksProxyAddress ?? '') : requestMoneroNode();
         case WalletType.bitcoin:
           return requestElectrumServer();
         case WalletType.litecoin:
           return requestElectrumServer();
         case WalletType.haven:
           return requestMoneroNode();
+        case WalletType.ethereum:
+          return requestElectrumServer();
         default:
           return false;
       }
@@ -157,7 +170,23 @@ class Node extends HiveObject with Keyable {
     } catch (_) {
       return false;
     }
-}
+  }
+
+  Future<bool> requestNodeWithProxy(String proxy) async {
+
+    if (proxy.isEmpty || !proxy.contains(':')) {
+      return false;
+    }
+    final proxyAddress = proxy.split(':')[0];
+    final proxyPort = int.parse(proxy.split(':')[1]);
+    try {
+      final socket = await Socket.connect(proxyAddress, proxyPort, timeout: Duration(seconds: 5));
+      socket.destroy();
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
 
   Future<bool> requestElectrumServer() async {
     try {
@@ -168,4 +197,17 @@ class Node extends HiveObject with Keyable {
       return false;
     }
   }
+
+  Future<bool> requestEthereumServer() async {
+    try {
+      final response = await http.get(
+        uri,
+        headers: {'Content-Type': 'application/json'},
+      );
+
+      return response.statusCode >= 200 && response.statusCode < 300;
+    } catch (_) {
+      return false;
+    }
+  }
 }

cw_core/lib/set_app_secure_native.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/services.dart';
 
-const utils = const MethodChannel('com.cake_wallet/native_utils');
-
 void setIsAppSecureNative(bool isAppSecure) {
-    utils.invokeMethod<Uint8List>('setIsAppSecure',  {'isAppSecure': isAppSecure});
-}
+  try {
+    final utils = const MethodChannel('com.cake_wallet/native_utils');
+
+    utils.invokeMethod<Uint8List>('setIsAppSecure', {'isAppSecure': isAppSecure});
+  } catch (_) {}
+}

cw_core/lib/wallet_base.dart

@@ -75,4 +75,8 @@ abstract class WalletBase<
   String get password;
 
   Future<void>? updateBalance();
+
+  void setExceptionHandler(void Function(FlutterErrorDetails) onError) => null;
+
+  Future<void> renameWalletFiles(String newWalletName);
 }

cw_core/lib/wallet_service.dart

@@ -18,5 +18,5 @@ abstract class WalletService<N extends WalletCredentials,
 
   Future<void> remove(String wallet);
 
-  Future<void> rename(String name, String password, String newName);
+  Future<void> rename(String currentName, String password, String newName);
 }

cw_core/lib/wallet_type.dart

@@ -7,7 +7,8 @@ const walletTypes = [
   WalletType.monero,
   WalletType.bitcoin,
   WalletType.litecoin,
-  WalletType.haven
+  WalletType.haven,
+  WalletType.ethereum,
 ];
 const walletTypeTypeId = 5;
 
@@ -27,6 +28,9 @@ enum WalletType {
 
   @HiveField(4)
   haven,
+
+  @HiveField(5)
+  ethereum,
 }
 
 int serializeToInt(WalletType type) {
@@ -39,6 +43,8 @@ int serializeToInt(WalletType type) {
       return 2;
     case WalletType.haven:
       return 3;
+    case WalletType.ethereum:
+      return 4;
     default:
       return -1;
   }
@@ -54,6 +60,8 @@ WalletType deserializeFromInt(int raw) {
       return WalletType.litecoin;
     case 3:
       return WalletType.haven;
+    case 4:
+      return WalletType.ethereum;
     default:
       throw Exception('Unexpected token: $raw for WalletType deserializeFromInt');
   }
@@ -69,6 +77,8 @@ String walletTypeToString(WalletType type) {
       return 'Litecoin';
     case WalletType.haven:
       return 'Haven';
+    case WalletType.ethereum:
+      return 'Ethereum';
     default:
       return '';
   }
@@ -84,6 +94,8 @@ String walletTypeToDisplayName(WalletType type) {
       return 'Litecoin (LTC)';
     case WalletType.haven:
       return 'Haven (XHV)';
+    case WalletType.ethereum:
+      return 'Ethereum (ETH)';
     default:
       return '';
   }
@@ -99,6 +111,8 @@ CryptoCurrency walletTypeToCryptoCurrency(WalletType type) {
       return CryptoCurrency.ltc;
     case WalletType.haven:
       return CryptoCurrency.xhv;
+    case WalletType.ethereum:
+      return CryptoCurrency.eth;
     default:
       throw Exception('Unexpected wallet type: ${type.toString()} for CryptoCurrency walletTypeToCryptoCurrency');
   }

cw_ethereum/.gitignore

@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/

cw_ethereum/.metadata

@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: eb6d86ee27deecba4a83536aa20f366a6044895c
+  channel: stable
+
+project_type: package

cw_ethereum/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.0.1
+
+* TODO: Describe initial release.

cw_ethereum/LICENSE

@@ -0,0 +1 @@
+TODO: Add your license here.

cw_ethereum/README.md

@@ -0,0 +1,39 @@
+<!--
+This README describes the package. If you publish this package to pub.dev,
+this README's contents appear on the landing page for your package.
+
+For information about how to write a good package README, see the guide for
+[writing package pages](https://dart.dev/guides/libraries/writing-package-pages).
+
+For general information about developing packages, see the Dart guide for
+[creating packages](https://dart.dev/guides/libraries/create-library-packages)
+and the Flutter guide for
+[developing packages and plugins](https://flutter.dev/developing-packages).
+-->
+
+TODO: Put a short description of the package here that helps potential users
+know whether this package might be useful for them.
+
+## Features
+
+TODO: List what your package can do. Maybe include images, gifs, or videos.
+
+## Getting started
+
+TODO: List prerequisites and provide or point to information on how to
+start using the package.
+
+## Usage
+
+TODO: Include short and useful examples for package users. Add longer examples
+to `/example` folder.
+
+```dart
+const like = 'sample';
+```
+
+## Additional information
+
+TODO: Tell users more about the package: where to find more information, how to
+contribute to the package, how to file issues, what response they can expect
+from the package authors, and more.

cw_ethereum/analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

cw_ethereum/lib/cw_ethereum.dart

@@ -0,0 +1,7 @@
+library cw_ethereum;
+
+/// A Calculator.
+class Calculator {
+  /// Returns [value] plus 1.
+  int addOne(int value) => value + 1;
+}

cw_ethereum/lib/default_erc20_tokens.dart

@@ -0,0 +1,302 @@
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/erc20_token.dart';
+
+class DefaultErc20Tokens {
+  final List<Erc20Token> _defaultTokens = [
+    Erc20Token(
+      name: "USD Coin",
+      symbol: "USDC",
+      contractAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+      decimal: 6,
+      enabled: true,
+    ),
+    Erc20Token(
+      name: "USDT Tether",
+      symbol: "USDT",
+      contractAddress: "0xdac17f958d2ee523a2206206994597c13d831ec7",
+      decimal: 6,
+      enabled: true,
+    ),
+    Erc20Token(
+      name: "Dai",
+      symbol: "DAI",
+      contractAddress: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+      decimal: 18,
+      enabled: true,
+    ),
+    Erc20Token(
+      name: "Wrapped Ether",
+      symbol: "WETH",
+      contractAddress: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Pepe",
+      symbol: "PEPE",
+      contractAddress: "0x6982508145454ce325ddbe47a25d4ec3d2311933",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "SHIBA INU",
+      symbol: "SHIB",
+      contractAddress: "0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "ApeCoin",
+      symbol: "APE",
+      contractAddress: "0x4d224452801aced8b2f0aebe155379bb5d594381",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Matic Token",
+      symbol: "MATIC",
+      contractAddress: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Wrapped BTC",
+      symbol: "WBTC",
+      contractAddress: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
+      decimal: 8,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Gitcoin",
+      symbol: "GTC",
+      contractAddress: "0xde30da39c46104798bb5aa3fe8b9e0e1f348163f",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Compound",
+      symbol: "COMP",
+      contractAddress: "0xc00e94cb662c3520282e6f5717214004a7f26888",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Aave Token",
+      symbol: "AAVE",
+      contractAddress: "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Uniswap",
+      symbol: "UNI",
+      contractAddress: "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Decentraland",
+      symbol: "MANA",
+      contractAddress: "0x0F5D2fB29fb7d3CFeE444a200298f468908cC942",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Storj",
+      symbol: "STORJ",
+      contractAddress: "0xb64ef51c888972c908cfacf59b47c1afbc0ab8ac",
+      decimal: 8,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Maker",
+      symbol: "MKR",
+      contractAddress: "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Orchid",
+      symbol: "OXT",
+      contractAddress: "0x4575f41308EC1483f3d399aa9a2826d74Da13Deb",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Paxos Gold",
+      symbol: "PAXG",
+      contractAddress: "0x45804880De22913dAFE09f4980848ECE6EcbAf78",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Binance Coin",
+      symbol: "BNB",
+      contractAddress: "0xB8c77482e45F1F44dE1745F52C74426C631bDD52",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "stETH",
+      symbol: "stETH",
+      contractAddress: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Lido DAO",
+      symbol: "LDO",
+      contractAddress: "0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Arbitrum",
+      symbol: "ARB",
+      contractAddress: "0xB50721BCf8d664c30412Cfbc6cf7a15145234ad1",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Graph Token",
+      symbol: "GRT",
+      contractAddress: "0xc944E90C64B2c07662A292be6244BDf05Cda44a7",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Frax",
+      symbol: "FRAX",
+      contractAddress: "0x853d955aCEf822Db058eb8505911ED77F175b99e",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Gemini dollar",
+      symbol: "GUSD",
+      contractAddress: "0x056Fd409E1d7A124BD7017459dFEa2F387b6d5Cd",
+      decimal: 2,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Compound Ether",
+      symbol: "cETH",
+      contractAddress: "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5",
+      decimal: 8,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Binance USD",
+      symbol: "BUSD",
+      contractAddress: "0x4Fabb145d64652a948d72533023f6E7A623C7C53",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "TrueUSD",
+      symbol: "TUSD",
+      contractAddress: "0x0000000000085d4780B73119b644AE5ecd22b376",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Cronos Coin",
+      symbol: "CRO",
+      contractAddress: "0xA0b73E1Ff0B80914AB6fe0444E65848C4C34450b",
+      decimal: 8,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Pax Dollar",
+      symbol: "USDP",
+      contractAddress: "0x8E870D67F660D95d5be530380D0eC0bd388289E1",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Fantom Token",
+      symbol: "FTM",
+      contractAddress: "0x4E15361FD6b4BB609Fa63C81A2be19d873717870",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "BitTorrent",
+      symbol: "BTT",
+      contractAddress: "0xC669928185DbCE49d2230CC9B0979BE6DC797957",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Nexo",
+      symbol: "NEXO",
+      contractAddress: "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "dYdX",
+      symbol: "DYDX",
+      contractAddress: "0x92D6C1e31e14520e676a687F0a93788B716BEff5",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "PancakeSwap Token",
+      symbol: "Cake",
+      contractAddress: "0x152649eA73beAb28c5b49B26eb48f7EAD6d4c898",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "BAT",
+      symbol: "BAT",
+      contractAddress: "0x0D8775F648430679A709E98d2b0Cb6250d2887EF",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "1INCH Token",
+      symbol: "1INCH",
+      contractAddress: "0x111111111117dC0aa78b770fA6A738034120C302",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Ethereum Name Service",
+      symbol: "ENS",
+      contractAddress: "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "ZRX",
+      symbol: "ZRX",
+      contractAddress: "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
+      decimal: 18,
+      enabled: false,
+    ),
+    Erc20Token(
+      name: "Verse",
+      symbol: "VERSE",
+      contractAddress: "0x249cA82617eC3DfB2589c4c17ab7EC9765350a18",
+      decimal: 18,
+      enabled: false,
+    ),
+  ];
+
+  List<Erc20Token> get initialErc20Tokens => _defaultTokens.map((token) {
+      String? iconPath;
+      try {
+        iconPath = CryptoCurrency.all
+            .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
+            .iconPath;
+      } catch (_) {}
+
+      if (iconPath != null) {
+        return Erc20Token.copyWith(token, iconPath);
+      }
+
+      return token;
+    }).toList();
+}

cw_ethereum/lib/erc20_balance.dart

@@ -0,0 +1,47 @@
+import 'dart:convert';
+import 'dart:math';
+
+import 'package:cw_core/balance.dart';
+
+class ERC20Balance extends Balance {
+  ERC20Balance(this.balance, {this.exponent = 18})
+      : super(balance.toInt(),
+            balance.toInt());
+
+  final BigInt balance;
+  final int exponent;
+
+  @override
+  String get formattedAdditionalBalance {
+    final String formattedBalance = (balance / BigInt.from(10).pow(exponent)).toString();
+    return formattedBalance.substring(0, min(12, formattedBalance.length));
+  }
+
+  @override
+  String get formattedAvailableBalance {
+    final String formattedBalance = (balance / BigInt.from(10).pow(exponent)).toString();
+    return formattedBalance.substring(0, min(12, formattedBalance.length));
+  }
+
+  String toJSON() => json.encode({
+        'balanceInWei': balance.toString(),
+        'exponent': exponent,
+      });
+
+  static ERC20Balance? fromJSON(String? jsonSource) {
+    if (jsonSource == null) {
+      return null;
+    }
+
+    final decoded = json.decode(jsonSource) as Map;
+
+    try {
+      return ERC20Balance(
+        BigInt.parse(decoded['balanceInWei']),
+        exponent: decoded['exponent'],
+      );
+    } catch (e) {
+      return ERC20Balance(BigInt.zero);
+    }
+  }
+}

cw_ethereum/lib/ethereum_client.dart

@@ -0,0 +1,230 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_ethereum/erc20_balance.dart';
+import 'package:cw_core/erc20_token.dart';
+import 'package:cw_ethereum/ethereum_transaction_model.dart';
+import 'package:cw_ethereum/pending_ethereum_transaction.dart';
+import 'package:flutter/services.dart';
+import 'package:http/http.dart';
+import 'package:web3dart/web3dart.dart';
+import 'package:web3dart/contracts/erc20.dart';
+import 'package:cw_core/node.dart';
+import 'package:cw_ethereum/ethereum_transaction_priority.dart';
+import 'package:cw_ethereum/.secrets.g.dart' as secrets;
+
+class EthereumClient {
+  final _httpClient = Client();
+  Web3Client? _client;
+
+  bool connect(Node node) {
+    try {
+      _client = Web3Client(node.uri.toString(), _httpClient);
+
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  void setListeners(EthereumAddress userAddress, Function() onNewTransaction) async {
+    // _client?.pendingTransactions().listen((transactionHash) async {
+    //   final transaction = await _client!.getTransactionByHash(transactionHash);
+    //
+    //   if (transaction.from.hex == userAddress || transaction.to?.hex == userAddress) {
+    //     onNewTransaction();
+    //   }
+    // });
+  }
+
+  Future<EtherAmount> getBalance(EthereumAddress address) async =>
+      await _client!.getBalance(address);
+
+  Future<int> getGasUnitPrice() async {
+    final gasPrice = await _client!.getGasPrice();
+    return gasPrice.getInWei.toInt();
+  }
+
+  Future<int> getEstimatedGas() async {
+    final estimatedGas = await _client!.estimateGas();
+    return estimatedGas.toInt();
+  }
+
+  Future<PendingEthereumTransaction> signTransaction({
+    required EthPrivateKey privateKey,
+    required String toAddress,
+    required String amount,
+    required int gas,
+    required EthereumTransactionPriority priority,
+    required CryptoCurrency currency,
+    required int exponent,
+    String? contractAddress,
+  }) async {
+    assert(currency == CryptoCurrency.eth || contractAddress != null);
+
+    bool _isEthereum = currency == CryptoCurrency.eth;
+
+    final price = await _client!.getGasPrice();
+
+    final Transaction transaction = Transaction(
+      from: privateKey.address,
+      to: EthereumAddress.fromHex(toAddress),
+      maxGas: gas,
+      gasPrice: price,
+      maxPriorityFeePerGas: EtherAmount.fromUnitAndValue(EtherUnit.gwei, priority.tip),
+      value: _isEthereum ? EtherAmount.inWei(BigInt.parse(amount)) : EtherAmount.zero(),
+    );
+
+    final signedTransaction = await _client!.signTransaction(privateKey, transaction);
+
+    final Function _sendTransaction;
+
+    if (_isEthereum) {
+      _sendTransaction = () async => await sendTransaction(signedTransaction);
+    } else {
+      final erc20 = Erc20(
+        client: _client!,
+        address: EthereumAddress.fromHex(contractAddress!),
+      );
+
+      _sendTransaction = () async {
+        await erc20.transfer(
+          EthereumAddress.fromHex(toAddress),
+          BigInt.parse(amount),
+          credentials: privateKey,
+        );
+      };
+    }
+
+    return PendingEthereumTransaction(
+      signedTransaction: signedTransaction,
+      amount: amount,
+      fee: BigInt.from(gas) * price.getInWei,
+      sendTransaction: _sendTransaction,
+      exponent: exponent,
+    );
+  }
+
+  Future<String> sendTransaction(Uint8List signedTransaction) async =>
+      await _client!.sendRawTransaction(signedTransaction);
+
+  Future getTransactionDetails(String transactionHash) async {
+    // Wait for the transaction receipt to become available
+    TransactionReceipt? receipt;
+    while (receipt == null) {
+      receipt = await _client!.getTransactionReceipt(transactionHash);
+      await Future.delayed(Duration(seconds: 1));
+    }
+
+    // Print the receipt information
+    print('Transaction Hash: ${receipt.transactionHash}');
+    print('Block Hash: ${receipt.blockHash}');
+    print('Block Number: ${receipt.blockNumber}');
+    print('Gas Used: ${receipt.gasUsed}');
+
+    /*
+      Transaction Hash: [112, 244, 4, 238, 89, 199, 171, 191, 210, 236, 110, 42, 185, 202, 220, 21, 27, 132, 123, 221, 137, 90, 77, 13, 23, 43, 12, 230, 93, 63, 221, 116]
+I/flutter ( 4474): Block Hash: [149, 44, 250, 119, 111, 104, 82, 98, 17, 89, 30, 190, 25, 44, 218, 118, 127, 189, 241, 35, 213, 106, 25, 95, 195, 37, 55, 131, 185, 180, 246, 200]
+I/flutter ( 4474): Block Number: 17120242
+I/flutter ( 4474): Gas Used: 21000
+       */
+
+    // Wait for the transaction receipt to become available
+    TransactionInformation? transactionInformation;
+    while (transactionInformation == null) {
+      print("********************************");
+      transactionInformation = await _client!.getTransactionByHash(transactionHash);
+      await Future.delayed(Duration(seconds: 1));
+    }
+    // Print the receipt information
+    print('Transaction Hash: ${transactionInformation.hash}');
+    print('Block Hash: ${transactionInformation.blockHash}');
+    print('Block Number: ${transactionInformation.blockNumber}');
+    print('Gas Used: ${transactionInformation.gas}');
+
+    /*
+      Transaction Hash: 0x70f404ee59c7abbfd2ec6e2ab9cadc151b847bdd895a4d0d172b0ce65d3fdd74
+I/flutter ( 4474): Block Hash: 0x952cfa776f68526211591ebe192cda767fbdf123d56a195fc3253783b9b4f6c8
+I/flutter ( 4474): Block Number: 17120242
+I/flutter ( 4474): Gas Used: 53000
+       */
+  }
+
+  Future<ERC20Balance> fetchERC20Balances(
+      EthereumAddress userAddress, String contractAddress) async {
+    final erc20 = Erc20(address: EthereumAddress.fromHex(contractAddress), client: _client!);
+    final balance = await erc20.balanceOf(userAddress);
+
+    int exponent = (await erc20.decimals()).toInt();
+
+    return ERC20Balance(balance, exponent: exponent);
+  }
+
+  Future<Erc20Token?> getErc20Token(String contractAddress) async {
+    try {
+      final erc20 = Erc20(address: EthereumAddress.fromHex(contractAddress), client: _client!);
+      final name = await erc20.name();
+      final symbol = await erc20.symbol();
+      final decimal = await erc20.decimals();
+
+      return Erc20Token(
+        name: name,
+        symbol: symbol,
+        contractAddress: contractAddress,
+        decimal: decimal.toInt(),
+      );
+    } catch (e) {
+      return null;
+    }
+  }
+
+  void stop() {
+    _client?.dispose();
+  }
+
+  Future<List<EthereumTransactionModel>> fetchTransactions(String address,
+      {String? contractAddress}) async {
+    try {
+      final response = await _httpClient.get(Uri.https("api.etherscan.io", "/api", {
+        "module": "account",
+        "action": contractAddress != null ? "tokentx" : "txlist",
+        if (contractAddress != null) "contractaddress": contractAddress,
+        "address": address,
+        "apikey": secrets.etherScanApiKey,
+      }));
+
+      final _jsonResponse = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode >= 200 && response.statusCode < 300 && _jsonResponse['status'] != 0) {
+        return (_jsonResponse['result'] as List)
+            .map((e) => EthereumTransactionModel.fromJson(e as Map<String, dynamic>))
+            .toList();
+      }
+
+      return [];
+    } catch (e) {
+      print(e);
+      return [];
+    }
+  }
+
+// Future<int> _getDecimalPlacesForContract(DeployedContract contract) async {
+//     final String abi = await rootBundle.loadString("assets/abi_json/erc20_abi.json");
+//     final contractAbi = ContractAbi.fromJson(abi, "ERC20");
+//
+//     final contract = DeployedContract(
+//       contractAbi,
+//       EthereumAddress.fromHex(_erc20Currencies[erc20Currency]!),
+//     );
+//     final decimalsFunction = contract.function('decimals');
+//     final decimals = await _client!.call(
+//       contract: contract,
+//       function: decimalsFunction,
+//       params: [],
+//     );
+//
+//     int exponent = int.parse(decimals.first.toString());
+//     return exponent;
+//   }
+}

cw_ethereum/lib/ethereum_exceptions.dart

@@ -0,0 +1,11 @@
+import 'package:cw_core/crypto_currency.dart';
+
+class EthereumTransactionCreationException implements Exception {
+  final String exceptionMessage;
+
+  EthereumTransactionCreationException(CryptoCurrency currency) :
+    this.exceptionMessage = 'Wrong balance. Not enough ${currency.title} on your balance.';
+
+  @override
+  String toString() => exceptionMessage;
+}

cw_ethereum/lib/ethereum_formatter.dart

@@ -0,0 +1,25 @@
+import 'package:intl/intl.dart';
+
+const ethereumAmountLength = 12;
+const ethereumAmountDivider = 1000000000000;
+final ethereumAmountFormat = NumberFormat()
+  ..maximumFractionDigits = ethereumAmountLength
+  ..minimumFractionDigits = 1;
+
+class EthereumFormatter {
+  static int parseEthereumAmount(String amount) {
+    try {
+      return (double.parse(amount) * ethereumAmountDivider).round();
+    } catch (_) {
+      return 0;
+    }
+  }
+
+  static double parseEthereumAmountToDouble(int amount) {
+    try {
+      return amount / ethereumAmountDivider;
+    } catch (_) {
+      return 0;
+    }
+  }
+}

cw_ethereum/lib/ethereum_transaction_credentials.dart

@@ -0,0 +1,17 @@
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/output_info.dart';
+import 'package:cw_ethereum/ethereum_transaction_priority.dart';
+
+class EthereumTransactionCredentials {
+  EthereumTransactionCredentials(
+    this.outputs, {
+    required this.priority,
+    required this.currency,
+    this.feeRate,
+  });
+
+  final List<OutputInfo> outputs;
+  final EthereumTransactionPriority? priority;
+  final int? feeRate;
+  final CryptoCurrency currency;
+}

cw_ethereum/lib/ethereum_transaction_history.dart

@@ -0,0 +1,77 @@
+import 'dart:convert';
+import 'dart:core';
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:cw_ethereum/file.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_ethereum/ethereum_transaction_info.dart';
+
+part 'ethereum_transaction_history.g.dart';
+
+const transactionsHistoryFileName = 'transactions.json';
+
+class EthereumTransactionHistory = EthereumTransactionHistoryBase with _$EthereumTransactionHistory;
+
+abstract class EthereumTransactionHistoryBase
+    extends TransactionHistoryBase<EthereumTransactionInfo> with Store {
+  EthereumTransactionHistoryBase({required this.walletInfo, required String password})
+      : _password = password {
+    transactions = ObservableMap<String, EthereumTransactionInfo>();
+  }
+
+  final WalletInfo walletInfo;
+  String _password;
+
+  Future<void> init() async => await _load();
+
+  @override
+  Future<void> save() async {
+    try {
+      final dirPath = await pathForWalletDir(name: walletInfo.name, type: walletInfo.type);
+      final path = '$dirPath/$transactionsHistoryFileName';
+      final data = json.encode({'transactions': transactions});
+      await writeData(path: path, password: _password, data: data);
+    } catch (e, s) {
+      print('Error while save ethereum transaction history: ${e.toString()}');
+      print(s);
+    }
+  }
+
+  @override
+  void addOne(EthereumTransactionInfo transaction) => transactions[transaction.id] = transaction;
+
+  @override
+  void addMany(Map<String, EthereumTransactionInfo> transactions) =>
+      this.transactions.addAll(transactions);
+
+  Future<Map<String, dynamic>> _read() async {
+    final dirPath = await pathForWalletDir(name: walletInfo.name, type: walletInfo.type);
+    final path = '$dirPath/$transactionsHistoryFileName';
+    final content = await read(path: path, password: _password);
+    if (content.isEmpty) {
+      return {};
+    }
+    return json.decode(content) as Map<String, dynamic>;
+  }
+
+  Future<void> _load() async {
+    try {
+      final content = await _read();
+      final txs = content['transactions'] as Map<String, dynamic>? ?? {};
+
+      txs.entries.forEach((entry) {
+        final val = entry.value;
+
+        if (val is Map<String, dynamic>) {
+          final tx = EthereumTransactionInfo.fromJson(val);
+          _update(tx);
+        }
+      });
+    } catch (e) {
+      print(e);
+    }
+  }
+
+  void _update(EthereumTransactionInfo transaction) => transactions[transaction.id] = transaction;
+}

cw_ethereum/lib/ethereum_transaction_info.dart

@@ -0,0 +1,74 @@
+import 'package:cw_core/format_amount.dart';
+import 'package:cw_core/transaction_direction.dart';
+import 'package:cw_core/transaction_info.dart';
+
+class EthereumTransactionInfo extends TransactionInfo {
+  EthereumTransactionInfo({
+    required this.id,
+    required this.height,
+    required this.ethAmount,
+    required this.ethFee,
+    this.tokenSymbol = "ETH",
+    this.exponent = 18,
+    required this.direction,
+    required this.isPending,
+    required this.date,
+    required this.confirmations,
+  })  : this.amount = ethAmount.toInt(),
+        this.fee = ethFee.toInt();
+
+  final String id;
+  final int height;
+  final int amount;
+  final BigInt ethAmount;
+  final int exponent;
+  final TransactionDirection direction;
+  final DateTime date;
+  final bool isPending;
+  final int fee;
+  final BigInt ethFee;
+  final int confirmations;
+  final String tokenSymbol;
+  String? _fiatAmount;
+
+  @override
+  String amountFormatted() =>
+      '${formatAmount((ethAmount / BigInt.from(10).pow(exponent)).toString())} $tokenSymbol';
+
+  @override
+  String fiatAmount() => _fiatAmount ?? '';
+
+  @override
+  void changeFiatAmount(String amount) => _fiatAmount = formatAmount(amount);
+
+  @override
+  String feeFormatted() => '${(ethFee / BigInt.from(10).pow(18)).toString()} ETH';
+
+  factory EthereumTransactionInfo.fromJson(Map<String, dynamic> data) {
+    return EthereumTransactionInfo(
+      id: data['id'] as String,
+      height: data['height'] as int,
+      ethAmount: BigInt.parse(data['amount']),
+      exponent: data['exponent'] as int,
+      ethFee: BigInt.parse(data['fee']),
+      direction: parseTransactionDirectionFromInt(data['direction'] as int),
+      date: DateTime.fromMillisecondsSinceEpoch(data['date'] as int),
+      isPending: data['isPending'] as bool,
+      confirmations: data['confirmations'] as int,
+      tokenSymbol: data['tokenSymbol'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'height': height,
+        'amount': ethAmount.toString(),
+        'exponent': exponent,
+        'fee': ethFee.toString(),
+        'direction': direction.index,
+        'date': date.millisecondsSinceEpoch,
+        'isPending': isPending,
+        'confirmations': confirmations,
+        'tokenSymbol': tokenSymbol,
+      };
+}

cw_ethereum/lib/ethereum_transaction_model.dart

@@ -0,0 +1,47 @@
+class EthereumTransactionModel {
+  final DateTime date;
+  final String hash;
+  final String from;
+  final String to;
+  final BigInt amount;
+  final int gasUsed;
+  final BigInt gasPrice;
+  final String contractAddress;
+  final int confirmations;
+  final int blockNumber;
+  final String? tokenSymbol;
+  final int? tokenDecimal;
+  final bool isError;
+
+  EthereumTransactionModel({
+    required this.date,
+    required this.hash,
+    required this.from,
+    required this.to,
+    required this.amount,
+    required this.gasUsed,
+    required this.gasPrice,
+    required this.contractAddress,
+    required this.confirmations,
+    required this.blockNumber,
+    required this.tokenSymbol,
+    required this.tokenDecimal,
+    required this.isError,
+  });
+
+  factory EthereumTransactionModel.fromJson(Map<String, dynamic> json) => EthereumTransactionModel(
+        date: DateTime.fromMillisecondsSinceEpoch(int.parse(json["timeStamp"]) * 1000),
+        hash: json["hash"],
+        from: json["from"],
+        to: json["to"],
+        amount: BigInt.parse(json["value"]),
+        gasUsed: int.parse(json["gasUsed"]),
+        gasPrice: BigInt.parse(json["gasPrice"]),
+        contractAddress: json["contractAddress"],
+        confirmations: int.parse(json["confirmations"]),
+        blockNumber: int.parse(json["blockNumber"]),
+        tokenSymbol: json["tokenSymbol"] ?? "ETH",
+        tokenDecimal: int.tryParse(json["tokenDecimal"] ?? ""),
+        isError: json["isError"] == "1",
+      );
+}

cw_ethereum/lib/ethereum_transaction_priority.dart

@@ -0,0 +1,52 @@
+import 'package:cw_core/transaction_priority.dart';
+
+class EthereumTransactionPriority extends TransactionPriority {
+  final int tip;
+
+  const EthereumTransactionPriority({required String title, required int raw, required this.tip})
+      : super(title: title, raw: raw);
+
+  static const List<EthereumTransactionPriority> all = [fast, medium, slow];
+  static const EthereumTransactionPriority slow =
+      EthereumTransactionPriority(title: 'slow', raw: 0, tip: 1);
+  static const EthereumTransactionPriority medium =
+      EthereumTransactionPriority(title: 'Medium', raw: 1, tip: 2);
+  static const EthereumTransactionPriority fast =
+      EthereumTransactionPriority(title: 'Fast', raw: 2, tip: 4);
+
+  static EthereumTransactionPriority deserialize({required int raw}) {
+    switch (raw) {
+      case 0:
+        return slow;
+      case 1:
+        return medium;
+      case 2:
+        return fast;
+      default:
+        throw Exception('Unexpected token: $raw for EthereumTransactionPriority deserialize');
+    }
+  }
+
+  String get units => 'gas';
+
+  @override
+  String toString() {
+    var label = '';
+
+    switch (this) {
+      case EthereumTransactionPriority.slow:
+        label = 'Slow';
+        break;
+      case EthereumTransactionPriority.medium:
+        label = 'Medium';
+        break;
+      case EthereumTransactionPriority.fast:
+        label = 'Fast';
+        break;
+      default:
+        break;
+    }
+
+    return label;
+  }
+}

cw_ethereum/lib/ethereum_wallet.dart

@@ -0,0 +1,473 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:math';
+
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/node.dart';
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/pending_transaction.dart';
+import 'package:cw_core/sync_status.dart';
+import 'package:cw_core/transaction_direction.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/wallet_addresses.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:cw_ethereum/default_erc20_tokens.dart';
+import 'package:cw_ethereum/erc20_balance.dart';
+import 'package:cw_ethereum/ethereum_client.dart';
+import 'package:cw_ethereum/ethereum_exceptions.dart';
+import 'package:cw_ethereum/ethereum_formatter.dart';
+import 'package:cw_ethereum/ethereum_transaction_credentials.dart';
+import 'package:cw_ethereum/ethereum_transaction_history.dart';
+import 'package:cw_ethereum/ethereum_transaction_info.dart';
+import 'package:cw_ethereum/ethereum_transaction_model.dart';
+import 'package:cw_ethereum/ethereum_transaction_priority.dart';
+import 'package:cw_ethereum/ethereum_wallet_addresses.dart';
+import 'package:cw_ethereum/file.dart';
+import 'package:cw_core/erc20_token.dart';
+import 'package:hive/hive.dart';
+import 'package:hex/hex.dart';
+import 'package:mobx/mobx.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:web3dart/web3dart.dart';
+import 'package:bip39/bip39.dart' as bip39;
+import 'package:bip32/bip32.dart' as bip32;
+
+part 'ethereum_wallet.g.dart';
+
+class EthereumWallet = EthereumWalletBase with _$EthereumWallet;
+
+abstract class EthereumWalletBase
+    extends WalletBase<ERC20Balance, EthereumTransactionHistory, EthereumTransactionInfo>
+    with Store {
+  EthereumWalletBase({
+    required WalletInfo walletInfo,
+    required String mnemonic,
+    required String password,
+    ERC20Balance? initialBalance,
+  })  : syncStatus = NotConnectedSyncStatus(),
+        _password = password,
+        _mnemonic = mnemonic,
+        _isTransactionUpdating = false,
+        _client = EthereumClient(),
+        walletAddresses = EthereumWalletAddresses(walletInfo),
+        balance = ObservableMap<CryptoCurrency, ERC20Balance>.of(
+            {CryptoCurrency.eth: initialBalance ?? ERC20Balance(BigInt.zero)}),
+        super(walletInfo) {
+    this.walletInfo = walletInfo;
+    transactionHistory = EthereumTransactionHistory(walletInfo: walletInfo, password: password);
+
+    if (!Hive.isAdapterRegistered(Erc20Token.typeId)) {
+      Hive.registerAdapter(Erc20TokenAdapter());
+    }
+
+    _sharedPrefs.complete(SharedPreferences.getInstance());
+  }
+
+  final String _mnemonic;
+  final String _password;
+
+  late final Box<Erc20Token> erc20TokensBox;
+
+  late final EthPrivateKey _privateKey;
+
+  late EthereumClient _client;
+
+  int? _gasPrice;
+  int? _estimatedGas;
+  bool _isTransactionUpdating;
+
+  // TODO: remove after integrating our own node and having eth_newPendingTransactionFilter
+  Timer? _transactionsUpdateTimer;
+
+  @override
+  WalletAddresses walletAddresses;
+
+  @override
+  @observable
+  SyncStatus syncStatus;
+
+  @override
+  @observable
+  late ObservableMap<CryptoCurrency, ERC20Balance> balance;
+
+  Completer<SharedPreferences> _sharedPrefs = Completer();
+
+  Future<void> init() async {
+    erc20TokensBox = await Hive.openBox<Erc20Token>(Erc20Token.boxName);
+    await walletAddresses.init();
+    await transactionHistory.init();
+    _privateKey = await getPrivateKey(_mnemonic, _password);
+    walletAddresses.address = _privateKey.address.toString();
+    await save();
+  }
+
+  @override
+  int calculateEstimatedFee(TransactionPriority priority, int? amount) {
+    try {
+      if (priority is EthereumTransactionPriority) {
+        final priorityFee =
+            EtherAmount.fromUnitAndValue(EtherUnit.gwei, priority.tip).getInWei.toInt();
+        return (_gasPrice! + priorityFee) * (_estimatedGas ?? 0);
+      }
+
+      return 0;
+    } catch (e) {
+      return 0;
+    }
+  }
+
+  @override
+  Future<void> changePassword(String password) {
+    throw UnimplementedError("changePassword");
+  }
+
+  @override
+  void close() {
+    _client.stop();
+    _transactionsUpdateTimer?.cancel();
+  }
+
+  @action
+  @override
+  Future<void> connectToNode({required Node node}) async {
+    try {
+      syncStatus = ConnectingSyncStatus();
+
+      final isConnected = _client.connect(node);
+
+      if (!isConnected) {
+        throw Exception("Ethereum Node connection failed");
+      }
+
+      _client.setListeners(_privateKey.address, _onNewTransaction);
+
+      _setTransactionUpdateTimer();
+
+      syncStatus = ConnectedSyncStatus();
+    } catch (e) {
+      syncStatus = FailedSyncStatus();
+    }
+  }
+
+  @override
+  Future<PendingTransaction> createTransaction(Object credentials) async {
+    final _credentials = credentials as EthereumTransactionCredentials;
+    final outputs = _credentials.outputs;
+    final hasMultiDestination = outputs.length > 1;
+    final _erc20Balance = balance[_credentials.currency]!;
+    BigInt totalAmount = BigInt.zero;
+    int exponent =
+        _credentials.currency is Erc20Token ? (_credentials.currency as Erc20Token).decimal : 18;
+    num amountToEthereumMultiplier = pow(10, exponent);
+
+    if (hasMultiDestination) {
+      if (outputs.any((item) => item.sendAll || (item.formattedCryptoAmount ?? 0) <= 0)) {
+        throw EthereumTransactionCreationException(_credentials.currency);
+      }
+
+      final totalOriginalAmount = EthereumFormatter.parseEthereumAmountToDouble(
+          outputs.fold(0, (acc, value) => acc + (value.formattedCryptoAmount ?? 0)));
+      totalAmount = BigInt.from(totalOriginalAmount * amountToEthereumMultiplier);
+
+      if (_erc20Balance.balance < totalAmount) {
+        throw EthereumTransactionCreationException(_credentials.currency);
+      }
+    } else {
+      final output = outputs.first;
+      final BigInt allAmount =
+          _erc20Balance.balance - BigInt.from(calculateEstimatedFee(_credentials.priority!, null));
+      final totalOriginalAmount =
+          EthereumFormatter.parseEthereumAmountToDouble(output.formattedCryptoAmount ?? 0);
+      totalAmount = output.sendAll
+          ? allAmount
+          : BigInt.from(totalOriginalAmount * amountToEthereumMultiplier);
+
+      if (_erc20Balance.balance < totalAmount) {
+        throw EthereumTransactionCreationException(_credentials.currency);
+      }
+    }
+
+    final pendingEthereumTransaction = await _client.signTransaction(
+      privateKey: _privateKey,
+      toAddress: _credentials.outputs.first.address,
+      amount: totalAmount.toString(),
+      gas: _estimatedGas!,
+      priority: _credentials.priority!,
+      currency: _credentials.currency,
+      exponent: exponent,
+      contractAddress: _credentials.currency is Erc20Token
+          ? (_credentials.currency as Erc20Token).contractAddress
+          : null,
+    );
+
+    return pendingEthereumTransaction;
+  }
+
+  Future<void> _updateTransactions() async {
+    try {
+      if (_isTransactionUpdating) {
+        return;
+      }
+      bool isEtherscanEnabled = (await _sharedPrefs.future).getBool("use_etherscan") ?? true;
+      if (!isEtherscanEnabled) {
+        return;
+      }
+
+      _isTransactionUpdating = true;
+      final transactions = await fetchTransactions();
+      transactionHistory.addMany(transactions);
+      await transactionHistory.save();
+      _isTransactionUpdating = false;
+    } catch (_) {
+      _isTransactionUpdating = false;
+    }
+  }
+
+  @override
+  Future<Map<String, EthereumTransactionInfo>> fetchTransactions() async {
+    final address = _privateKey.address.hex;
+    final transactions = await _client.fetchTransactions(address);
+
+    final List<Future<List<EthereumTransactionModel>>> erc20TokensTransactions = [];
+
+    for (var token in balance.keys) {
+      if (token is Erc20Token) {
+        erc20TokensTransactions.add(_client.fetchTransactions(
+          address,
+          contractAddress: token.contractAddress,
+        ));
+      }
+    }
+
+    final tokensTransaction = await Future.wait(erc20TokensTransactions);
+    transactions.addAll(tokensTransaction.expand((element) => element));
+
+    final Map<String, EthereumTransactionInfo> result = {};
+
+    for (var transactionModel in transactions) {
+      if (transactionModel.isError) {
+        continue;
+      }
+
+      result[transactionModel.hash] = EthereumTransactionInfo(
+        id: transactionModel.hash,
+        height: transactionModel.blockNumber,
+        ethAmount: transactionModel.amount,
+        direction: transactionModel.from == address
+            ? TransactionDirection.outgoing
+            : TransactionDirection.incoming,
+        isPending: false,
+        date: transactionModel.date,
+        confirmations: transactionModel.confirmations,
+        ethFee: BigInt.from(transactionModel.gasUsed) * transactionModel.gasPrice,
+        exponent: transactionModel.tokenDecimal ?? 18,
+        tokenSymbol: transactionModel.tokenSymbol ?? "ETH",
+      );
+    }
+
+    return result;
+  }
+
+  @override
+  Object get keys => throw UnimplementedError("keys");
+
+  @override
+  Future<void> rescan({required int height}) {
+    throw UnimplementedError("rescan");
+  }
+
+  @override
+  Future<void> save() async {
+    await walletAddresses.updateAddressesInBox();
+    final path = await makePath();
+    await write(path: path, password: _password, data: toJSON());
+    await transactionHistory.save();
+  }
+
+  @override
+  String get seed => _mnemonic;
+
+  @action
+  @override
+  Future<void> startSync() async {
+    try {
+      syncStatus = AttemptingSyncStatus();
+      await _updateBalance();
+      await _updateTransactions();
+      _gasPrice = await _client.getGasUnitPrice();
+      _estimatedGas = await _client.getEstimatedGas();
+
+      Timer.periodic(
+          const Duration(minutes: 1), (timer) async => _gasPrice = await _client.getGasUnitPrice());
+      Timer.periodic(const Duration(seconds: 10),
+          (timer) async => _estimatedGas = await _client.getEstimatedGas());
+
+      syncStatus = SyncedSyncStatus();
+    } catch (e) {
+      syncStatus = FailedSyncStatus();
+    }
+  }
+
+  Future<String> makePath() async => pathForWallet(name: walletInfo.name, type: walletInfo.type);
+
+  String toJSON() => json.encode({
+        'mnemonic': _mnemonic,
+        'balance': balance[currency]!.toJSON(),
+      });
+
+  static Future<EthereumWallet> open({
+    required String name,
+    required String password,
+    required WalletInfo walletInfo,
+  }) async {
+    final path = await pathForWallet(name: name, type: walletInfo.type);
+    final jsonSource = await read(path: path, password: password);
+    final data = json.decode(jsonSource) as Map;
+    final mnemonic = data['mnemonic'] as String;
+    final balance = ERC20Balance.fromJSON(data['balance'] as String) ?? ERC20Balance(BigInt.zero);
+
+    return EthereumWallet(
+      walletInfo: walletInfo,
+      password: password,
+      mnemonic: mnemonic,
+      initialBalance: balance,
+    );
+  }
+
+  Future<void> _updateBalance() async {
+    balance[currency] = await _fetchEthBalance();
+
+    await _fetchErc20Balances();
+    await save();
+  }
+
+  Future<ERC20Balance> _fetchEthBalance() async {
+    final balance = await _client.getBalance(_privateKey.address);
+    return ERC20Balance(balance.getInWei);
+  }
+
+  Future<void> _fetchErc20Balances() async {
+    for (var token in erc20TokensBox.values) {
+      try {
+        if (token.enabled) {
+          balance[token] = await _client.fetchERC20Balances(
+            _privateKey.address,
+            token.contractAddress,
+          );
+        } else {
+          balance.remove(token);
+        }
+      } catch (_) {}
+    }
+  }
+
+  Future<EthPrivateKey> getPrivateKey(String mnemonic, String password) async {
+    final seed = bip39.mnemonicToSeed(mnemonic);
+
+    final root = bip32.BIP32.fromSeed(seed);
+
+    const _hdPathEthereum = "m/44'/60'/0'/0";
+    const index = 0;
+    final addressAtIndex = root.derivePath("$_hdPathEthereum/$index");
+
+    return EthPrivateKey.fromHex(HEX.encode(addressAtIndex.privateKey as List<int>));
+  }
+
+  Future<void>? updateBalance() async => await _updateBalance();
+
+  List<Erc20Token> get erc20Currencies => erc20TokensBox.values.toList();
+
+  Future<void> addErc20Token(Erc20Token token) async {
+    String? iconPath;
+    try {
+      iconPath = CryptoCurrency.all
+          .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
+          .iconPath;
+    } catch (_) {}
+
+    final _token = Erc20Token(
+      name: token.name,
+      symbol: token.symbol,
+      contractAddress: token.contractAddress,
+      decimal: token.decimal,
+      enabled: token.enabled,
+      iconPath: iconPath,
+    );
+
+    await erc20TokensBox.put(_token.contractAddress, _token);
+
+    if (_token.enabled) {
+      balance[_token] = await _client.fetchERC20Balances(
+        _privateKey.address,
+        _token.contractAddress,
+      );
+    } else {
+      balance.remove(_token);
+    }
+  }
+
+  Future<void> deleteErc20Token(Erc20Token token) async {
+    await token.delete();
+
+    balance.remove(token);
+    _updateBalance();
+  }
+
+  Future<Erc20Token?> getErc20Token(String contractAddress) async =>
+      await _client.getErc20Token(contractAddress);
+
+  void _onNewTransaction() {
+    _updateBalance();
+    _updateTransactions();
+  }
+
+  void addInitialTokens() {
+    final initialErc20Tokens = DefaultErc20Tokens().initialErc20Tokens;
+
+    initialErc20Tokens.forEach((token) => erc20TokensBox.put(token.contractAddress, token));
+  }
+
+  @override
+  Future<void> renameWalletFiles(String newWalletName) async {
+    final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type);
+    final currentWalletFile = File(currentWalletPath);
+
+    final currentDirPath = await pathForWalletDir(name: walletInfo.name, type: type);
+    final currentTransactionsFile = File('$currentDirPath/$transactionsHistoryFileName');
+
+    // Copies current wallet files into new wallet name's dir and files
+    if (currentWalletFile.existsSync()) {
+      final newWalletPath = await pathForWallet(name: newWalletName, type: type);
+      await currentWalletFile.copy(newWalletPath);
+    }
+    if (currentTransactionsFile.existsSync()) {
+      final newDirPath = await pathForWalletDir(name: newWalletName, type: type);
+      await currentTransactionsFile.copy('$newDirPath/$transactionsHistoryFileName');
+    }
+
+    // Delete old name's dir and files
+    await Directory(currentDirPath).delete(recursive: true);
+  }
+
+  void _setTransactionUpdateTimer() {
+    if (_transactionsUpdateTimer?.isActive ?? false) {
+      _transactionsUpdateTimer!.cancel();
+    }
+
+    _transactionsUpdateTimer = Timer.periodic(Duration(seconds: 10), (_) {
+      _updateTransactions();
+      _updateBalance();
+    });
+  }
+
+  void updateEtherscanUsageState(bool isEnabled) {
+    if (isEnabled) {
+      _updateTransactions();
+      _setTransactionUpdateTimer();
+    } else {
+      _transactionsUpdateTimer?.cancel();
+    }
+  }
+}

cw_ethereum/lib/ethereum_wallet_addresses.dart

@@ -0,0 +1,33 @@
+import 'package:cw_core/wallet_addresses.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:mobx/mobx.dart';
+
+part 'ethereum_wallet_addresses.g.dart';
+
+class EthereumWalletAddresses = EthereumWalletAddressesBase with _$EthereumWalletAddresses;
+
+abstract class EthereumWalletAddressesBase extends WalletAddresses with Store {
+  EthereumWalletAddressesBase(WalletInfo walletInfo)
+      : address = '',
+        super(walletInfo);
+
+  @override
+  String address;
+
+  @override
+  Future<void> init() async {
+    address = walletInfo.address;
+    await updateAddressesInBox();
+  }
+
+  @override
+  Future<void> updateAddressesInBox() async {
+    try {
+      addressesMap.clear();
+      addressesMap[address] = '';
+      await saveAddressesInBox();
+    } catch (e) {
+      print(e.toString());
+    }
+  }
+}

cw_ethereum/lib/ethereum_wallet_creation_credentials.dart

@@ -0,0 +1,23 @@
+import 'package:cw_core/wallet_credentials.dart';
+import 'package:cw_core/wallet_info.dart';
+
+class EthereumNewWalletCredentials extends WalletCredentials {
+  EthereumNewWalletCredentials({required String name, WalletInfo? walletInfo})
+      : super(name: name, walletInfo: walletInfo);
+}
+
+class EthereumRestoreWalletFromSeedCredentials extends WalletCredentials {
+  EthereumRestoreWalletFromSeedCredentials(
+      {required String name, required String password, required this.mnemonic, WalletInfo? walletInfo})
+      : super(name: name, password: password, walletInfo: walletInfo);
+
+  final String mnemonic;
+}
+
+class EthereumRestoreWalletFromWIFCredentials extends WalletCredentials {
+  EthereumRestoreWalletFromWIFCredentials(
+      {required String name, required String password, required this.wif, WalletInfo? walletInfo})
+      : super(name: name, password: password, walletInfo: walletInfo);
+
+  final String wif;
+}

cw_ethereum/lib/ethereum_wallet_service.dart

@@ -0,0 +1,108 @@
+import 'dart:io';
+
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:cw_core/wallet_service.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:cw_ethereum/ethereum_mnemonics.dart';
+import 'package:cw_ethereum/ethereum_wallet.dart';
+import 'package:cw_ethereum/ethereum_wallet_creation_credentials.dart';
+import 'package:hive/hive.dart';
+import 'package:bip39/bip39.dart' as bip39;
+import 'package:collection/collection.dart';
+
+class EthereumWalletService extends WalletService<EthereumNewWalletCredentials,
+    EthereumRestoreWalletFromSeedCredentials, EthereumRestoreWalletFromWIFCredentials> {
+  EthereumWalletService(this.walletInfoSource);
+
+  final Box<WalletInfo> walletInfoSource;
+
+  @override
+  Future<EthereumWallet> create(EthereumNewWalletCredentials credentials) async {
+    final mnemonic = bip39.generateMnemonic();
+    final wallet = EthereumWallet(
+      walletInfo: credentials.walletInfo!,
+      mnemonic: mnemonic,
+      password: credentials.password!,
+    );
+
+    await wallet.init();
+    wallet.addInitialTokens();
+    await wallet.save();
+
+    return wallet;
+  }
+
+  @override
+  WalletType getType() => WalletType.ethereum;
+
+  @override
+  Future<bool> isWalletExit(String name) async =>
+      File(await pathForWallet(name: name, type: getType())).existsSync();
+
+  @override
+  Future<EthereumWallet> openWallet(String name, String password) async {
+    final walletInfo =
+        walletInfoSource.values.firstWhere((info) => info.id == WalletBase.idFor(name, getType()));
+    final wallet = await EthereumWalletBase.open(
+      name: name,
+      password: password,
+      walletInfo: walletInfo,
+    );
+
+    await wallet.init();
+    await wallet.save();
+
+    return wallet;
+  }
+
+  @override
+  Future<void> remove(String wallet) async {
+    File(await pathForWalletDir(name: wallet, type: getType())).delete(recursive: true);
+    final walletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(wallet, getType()))!;
+    await walletInfoSource.delete(walletInfo.key);
+  }
+
+  @override
+  Future<EthereumWallet> restoreFromKeys(credentials) {
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<EthereumWallet> restoreFromSeed(
+      EthereumRestoreWalletFromSeedCredentials credentials) async {
+    if (!bip39.validateMnemonic(credentials.mnemonic)) {
+      throw EthereumMnemonicIsIncorrectException();
+    }
+
+    final wallet = EthereumWallet(
+      password: credentials.password!,
+      mnemonic: credentials.mnemonic,
+      walletInfo: credentials.walletInfo!,
+    );
+
+    await wallet.init();
+    wallet.addInitialTokens();
+    await wallet.save();
+
+    return wallet;
+  }
+
+  @override
+  Future<void> rename(String currentName, String password, String newName) async {
+    final currentWalletInfo = walletInfoSource.values
+        .firstWhere((info) => info.id == WalletBase.idFor(currentName, getType()));
+    final currentWallet = await EthereumWalletBase.open(
+        password: password, name: currentName, walletInfo: currentWalletInfo);
+
+    await currentWallet.renameWalletFiles(newName);
+
+    final newWalletInfo = currentWalletInfo;
+    newWalletInfo.id = WalletBase.idFor(newName, getType());
+    newWalletInfo.name = newName;
+
+    await walletInfoSource.put(currentWalletInfo.key, newWalletInfo);
+  }
+}

cw_ethereum/lib/file.dart

@@ -0,0 +1,39 @@
+import 'dart:io';
+import 'package:cw_core/key.dart';
+import 'package:encrypt/encrypt.dart' as encrypt;
+
+Future<void> write(
+    {required String path,
+    required String password,
+    required String data}) async {
+  final keys = extractKeys(password);
+  final key = encrypt.Key.fromBase64(keys.first);
+  final iv = encrypt.IV.fromBase64(keys.last);
+  final encrypted = await encode(key: key, iv: iv, data: data);
+  final f = File(path);
+  f.writeAsStringSync(encrypted);
+}
+
+Future<void> writeData(
+    {required String path,
+    required String password,
+    required String data}) async {
+  final keys = extractKeys(password);
+  final key = encrypt.Key.fromBase64(keys.first);
+  final iv = encrypt.IV.fromBase64(keys.last);
+  final encrypted = await encode(key: key, iv: iv, data: data);
+  final f = File(path);
+  f.writeAsStringSync(encrypted);
+}
+
+Future<String> read({required String path, required String password}) async {
+  final file = File(path);
+
+  if (!file.existsSync()) {
+    file.createSync();
+  }
+
+  final encrypted = file.readAsStringSync();
+
+  return decode(password: password, data: encrypted);
+}

cw_ethereum/lib/pending_ethereum_transaction.dart

@@ -0,0 +1,36 @@
+import 'dart:math';
+import 'dart:typed_data';
+
+import 'package:cw_core/pending_transaction.dart';
+import 'package:web3dart/crypto.dart';
+
+class PendingEthereumTransaction with PendingTransaction {
+  final Function sendTransaction;
+  final Uint8List signedTransaction;
+  final BigInt fee;
+  final String amount;
+  final int exponent;
+
+  PendingEthereumTransaction({
+    required this.sendTransaction,
+    required this.signedTransaction,
+    required this.fee,
+    required this.amount,
+    required this.exponent,
+  });
+
+  @override
+  String get amountFormatted => (BigInt.parse(amount) / BigInt.from(pow(10, exponent))).toString();
+
+  @override
+  Future<void> commit() async => await sendTransaction();
+
+  @override
+  String get feeFormatted => (fee / BigInt.from(pow(10, 18))).toString();
+
+  @override
+  String get hex => bytesToHex(signedTransaction, include0x: true);
+
+  @override
+  String get id => '';
+}

cw_ethereum/pubspec.yaml

@@ -0,0 +1,68 @@
+name: cw_ethereum
+description: A new Flutter package project.
+version: 0.0.1
+publish_to: none
+author: Cake Wallet
+homepage: https://cakewallet.com
+
+environment:
+  sdk: '>=2.18.2 <3.0.0'
+  flutter: ">=1.17.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  web3dart: 2.3.5
+  mobx: ^2.0.7+4
+  bip39: ^1.0.6
+  bip32: ^2.0.0
+  ed25519_hd_key: ^2.2.0
+  hex: ^0.2.0
+  http: ^0.13.4
+  shared_preferences: ^2.0.15
+  cw_core:
+    path: ../cw_core
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  build_runner: ^2.1.11
+  mobx_codegen: ^2.0.7
+  hive_generator: ^1.1.3
+
+# For information on the generic Dart part of this file, see the
+# following page: https://dart.dev/tools/pub/pubspec
+
+# The following section is specific to Flutter packages.
+flutter:
+
+  # To add assets to your package, add an assets section, like this:
+  # assets:
+  #   - images/a_dot_burr.jpeg
+  #   - images/a_dot_ham.jpeg
+  #
+  # For details regarding assets in packages, see
+  # https://flutter.dev/assets-and-images/#from-packages
+  #
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.dev/assets-and-images/#resolution-aware
+
+  # To add custom fonts to your package, add a fonts section here,
+  # in this "flutter" section. Each entry in this list should have a
+  # "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts in packages, see
+  # https://flutter.dev/custom-fonts/#from-packages

cw_ethereum/test/cw_ethereum_test.dart

@@ -0,0 +1,12 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:cw_ethereum/cw_ethereum.dart';
+
+void main() {
+  test('adds one to input values', () {
+    final calculator = Calculator();
+    expect(calculator.addOne(2), 3);
+    expect(calculator.addOne(-7), -6);
+    expect(calculator.addOne(0), 1);
+  });
+}

cw_haven/lib/api/signatures.dart

@@ -39,7 +39,7 @@ typedef get_node_height = Int64 Function();
 typedef is_connected = Int8 Function();
 
 typedef setup_node = Int8 Function(
-    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, Int8, Int8, Pointer<Utf8>);
+    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, Int8, Int8, Pointer<Utf8>?, Pointer<Utf8>);
 
 typedef start_refresh = Void Function();
 

cw_haven/lib/api/types.dart

@@ -39,7 +39,7 @@ typedef GetNodeHeight = int Function();
 typedef IsConnected = int Function();
 
 typedef SetupNode = int Function(
-    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, int, int, Pointer<Utf8>);
+    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, int, int, Pointer<Utf8>?, Pointer<Utf8>);
 
 typedef StartRefresh = void Function();
 

cw_haven/lib/api/wallet.dart

@@ -154,9 +154,11 @@ bool setupNodeSync(
     String? login,
     String? password,
     bool useSSL = false,
-    bool isLightWallet = false}) {
+    bool isLightWallet = false,
+    String? socksProxyAddress}) {
   final addressPointer = address.toNativeUtf8();
   Pointer<Utf8>? loginPointer;
+  Pointer<Utf8>? socksProxyAddressPointer;
   Pointer<Utf8>? passwordPointer;
 
   if (login != null) {
@@ -167,6 +169,10 @@ bool setupNodeSync(
     passwordPointer = password.toNativeUtf8();
   }
 
+  if (socksProxyAddress != null) {
+    socksProxyAddressPointer = socksProxyAddress.toNativeUtf8();
+  }
+
   final errorMessagePointer = ''.toNativeUtf8();
   final isSetupNode = setupNodeNative(
           addressPointer,
@@ -174,6 +180,7 @@ bool setupNodeSync(
           passwordPointer,
           _boolToInt(useSSL),
           _boolToInt(isLightWallet),
+      socksProxyAddressPointer,
           errorMessagePointer) !=
       0;
 
@@ -323,13 +330,15 @@ bool _setupNodeSync(Map args) {
   final password = (args['password'] ?? '') as String;
   final useSSL = args['useSSL'] as bool;
   final isLightWallet = args['isLightWallet'] as bool;
+  final socksProxyAddress = (args['socksProxyAddress'] ?? '') as String;
 
   return setupNodeSync(
       address: address,
       login: login,
       password: password,
       useSSL: useSSL,
-      isLightWallet: isLightWallet);
+      isLightWallet: isLightWallet,
+      socksProxyAddress: socksProxyAddress);
 }
 
 bool _isConnected(Object _) => isConnectedSync();
@@ -343,13 +352,15 @@ Future<void> setupNode(
         String? login,
         String? password,
         bool useSSL = false,
+        String? socksProxyAddress,
         bool isLightWallet = false}) =>
     compute<Map<String, Object?>, void>(_setupNodeSync, {
       'address': address,
       'login': login,
       'password': password,
       'useSSL': useSSL,
-      'isLightWallet': isLightWallet
+      'isLightWallet': isLightWallet,
+      'socksProxyAddress': socksProxyAddress
     });
 
 Future<void> store() => compute<int, void>(_storeSync, 0);

cw_haven/lib/haven_wallet.dart

@@ -125,7 +125,8 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
           login: node.login,
           password: node.password,
           useSSL: node.useSSL ?? false,
-          isLightWallet: false); // FIXME: hardcoded value
+          isLightWallet: false, // FIXME: hardcoded value
+          socksProxyAddress: node.socksProxyAddress);
 
       haven_wallet.setTrustedDaemon(node.trusted);
       syncStatus = ConnectedSyncStatus();
@@ -253,6 +254,7 @@ abstract class HavenWalletBase extends WalletBase<MoneroBalance,
     await haven_wallet.store();
   }
 
+  @override
   Future<void> renameWalletFiles(String newWalletName) async {
     final currentWalletPath = await pathForWallet(name: name, type: type);
     final currentCacheFile = File(currentWalletPath);

cw_monero/ios/Classes/monero_api.cpp

@@ -3,6 +3,7 @@
 #include <chrono>
 #include <functional>
 #include <iostream>
+#include <fstream>
 #include <unistd.h>
 #include <mutex>
 #include "thread"
@@ -431,13 +432,14 @@ extern "C"
     }
 
     FUNCTION_VISABILITY_ATTRIBUTE
-    bool setup_node(char *address, char *login, char *password, bool use_ssl, bool is_light_wallet, char *error)
+    bool setup_node(char *address, char *login, char *password, bool use_ssl, bool is_light_wallet, char *socksProxyAddress, char *error)
     {
         nice(19);
         Monero::Wallet *wallet = get_current_wallet();
         
         std::string _login = "";
         std::string _password = "";
+        std::string _socksProxyAddress = "";
 
         if (login != nullptr)
         {
@@ -449,7 +451,12 @@ extern "C"
             _password = std::string(password);
         }
 
-        bool inited = wallet->init(std::string(address), 0, _login, _password, use_ssl, is_light_wallet);
+        if (socksProxyAddress != nullptr)
+        {
+            _socksProxyAddress = std::string(socksProxyAddress);
+        }
+
+        bool inited = wallet->init(std::string(address), 0, _login, _password, use_ssl, is_light_wallet, _socksProxyAddress);
 
         if (!inited)
         {

cw_monero/lib/api/signatures.dart

@@ -35,7 +35,7 @@ typedef get_node_height = Int64 Function();
 typedef is_connected = Int8 Function();
 
 typedef setup_node = Int8 Function(
-    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, Int8, Int8, Pointer<Utf8>);
+    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, Int8, Int8, Pointer<Utf8>?, Pointer<Utf8>);
 
 typedef start_refresh = Void Function();
 

cw_monero/lib/api/types.dart

@@ -35,7 +35,7 @@ typedef GetNodeHeight = int Function();
 typedef IsConnected = int Function();
 
 typedef SetupNode = int Function(
-    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, int, int, Pointer<Utf8>);
+    Pointer<Utf8>, Pointer<Utf8>?, Pointer<Utf8>?, int, int, Pointer<Utf8>?, Pointer<Utf8>);
 
 typedef StartRefresh = void Function();
 

cw_monero/lib/api/wallet.dart

@@ -158,9 +158,11 @@ bool setupNodeSync(
     String? login,
     String? password,
     bool useSSL = false,
-    bool isLightWallet = false}) {
+    bool isLightWallet = false,
+    String? socksProxyAddress}) {
   final addressPointer = address.toNativeUtf8();
   Pointer<Utf8>? loginPointer;
+  Pointer<Utf8>? socksProxyAddressPointer;
   Pointer<Utf8>? passwordPointer;
 
   if (login != null) {
@@ -171,6 +173,10 @@ bool setupNodeSync(
     passwordPointer = password.toNativeUtf8();
   }
 
+  if (socksProxyAddress != null) {
+    socksProxyAddressPointer = socksProxyAddress.toNativeUtf8();
+  }
+
   final errorMessagePointer = ''.toNativeUtf8();
   final isSetupNode = setupNodeNative(
           addressPointer,
@@ -178,6 +184,7 @@ bool setupNodeSync(
           passwordPointer,
           _boolToInt(useSSL),
           _boolToInt(isLightWallet),
+      socksProxyAddressPointer,
           errorMessagePointer) !=
       0;
 
@@ -328,13 +335,15 @@ bool _setupNodeSync(Map<String, Object?> args) {
   final password = (args['password'] ?? '') as String;
   final useSSL = args['useSSL'] as bool;
   final isLightWallet = args['isLightWallet'] as bool;
+  final socksProxyAddress = (args['socksProxyAddress'] ?? '') as String;
 
   return setupNodeSync(
       address: address,
       login: login,
       password: password,
       useSSL: useSSL,
-      isLightWallet: isLightWallet);
+      isLightWallet: isLightWallet,
+      socksProxyAddress: socksProxyAddress);
 }
 
 bool _isConnected(Object _) => isConnectedSync();
@@ -348,13 +357,15 @@ Future<void> setupNode(
         String? login,
         String? password,
         bool useSSL = false,
+        String? socksProxyAddress,
         bool isLightWallet = false}) =>
     compute<Map<String, Object?>, void>(_setupNodeSync, {
       'address': address,
       'login': login ,
       'password': password,
       'useSSL': useSSL,
-      'isLightWallet': isLightWallet
+      'isLightWallet': isLightWallet,
+      'socksProxyAddress': socksProxyAddress
     });
 
 Future<void> store() => compute<int, void>(_storeSync, 0);

cw_monero/lib/monero_transaction_info.dart

@@ -14,18 +14,18 @@ class MoneroTransactionInfo extends TransactionInfo {
   MoneroTransactionInfo.fromMap(Map<String, Object?> map)
       : id = (map['hash'] ?? '') as String,
         height = (map['height'] ?? 0) as int,
-        direction =
-            parseTransactionDirectionFromNumber(map['direction'] as String) ??
-                TransactionDirection.incoming,
+        direction = map['direction'] != null
+            ? parseTransactionDirectionFromNumber(map['direction'] as String)
+            : TransactionDirection.incoming,
         date = DateTime.fromMillisecondsSinceEpoch(
-            (int.parse(map['timestamp'] as String) ?? 0) * 1000),
+            (int.tryParse(map['timestamp'] as String? ?? '') ?? 0) * 1000),
         isPending = parseBoolFromString(map['isPending'] as String),
         amount = map['amount'] as int,
         accountIndex = int.parse(map['accountIndex'] as String),
         addressIndex = map['addressIndex'] as int,
         confirmations = map['confirmations'] as int,
         key = getTxKey((map['hash'] ?? '') as String),
-        fee = map['fee'] as int ?? 0 {
+        fee = map['fee'] as int? ?? 0 {
           additionalInfo = <String, dynamic>{
             'key': key,
             'accountIndex': accountIndex,
@@ -36,8 +36,7 @@ class MoneroTransactionInfo extends TransactionInfo {
   MoneroTransactionInfo.fromRow(TransactionInfoRow row)
       : id = row.getHash(),
         height = row.blockHeight,
-        direction = parseTransactionDirectionFromInt(row.direction) ??
-            TransactionDirection.incoming,
+        direction = parseTransactionDirectionFromInt(row.direction),
         date = DateTime.fromMillisecondsSinceEpoch(row.getDatetime() * 1000),
         isPending = row.isPending != 0,
         amount = row.getAmount(),

cw_monero/lib/monero_wallet.dart

@@ -145,7 +145,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
           login: node.login,
           password: node.password,
           useSSL: node.isSSL,
-          isLightWallet: false); // FIXME: hardcoded value
+          isLightWallet: false, // FIXME: hardcoded value
+          socksProxyAddress: node.socksProxyAddress);
 
       monero_wallet.setTrustedDaemon(node.trusted);
       syncStatus = ConnectedSyncStatus();
@@ -275,6 +276,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     await monero_wallet.store();
   }
 
+  @override
   Future<void> renameWalletFiles(String newWalletName) async {
     final currentWalletDirPath = await pathForWalletDir(name: name, type: type);
 

howto-build-android.md

@@ -6,9 +6,9 @@ The following are the system requirements to build CakeWallet for your Android d
 
 ```
 Ubuntu >= 16.04 
-Android SDK 28
+Android SDK 29 or higher (better to have the latest one 33)
 Android NDK 17c
-Flutter 2 or above
+Flutter 3.7.x
 ```
 
 ## Building CakeWallet on Android
@@ -55,7 +55,7 @@ You may download and install the latest version of Android Studio [here](https:/
 
 ### 3. Installing Flutter
 
-Need to install flutter with version `3.x.x`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).
+Need to install flutter with version `3.7.x`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).
 
 ### 4. Verify Installations
 
@@ -66,9 +66,9 @@ Verify that the Android toolchain, Flutter, and Android Studio have been correct
 The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
 ```
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.x.x, on Linux, locale en_US.UTF-8)
-[✓] Android toolchain - develop for Android devices (Android SDK version 28)
-[✓] Android Studio (version 4.0)
+[✓] Flutter (Channel stable, 3.7.x, on Linux, locale en_US.UTF-8)
+[✓] Android toolchain - develop for Android devices (Android SDK version 29 or higher)
+[✓] Android Studio (version 4.0 or higher)
 ```
 
 ### 5. Generate a secure keystore for Android

ios/Podfile.lock

@@ -134,6 +134,8 @@ PODS:
   - SDWebImage (5.16.0):
     - SDWebImage/Core (= 5.16.0)
   - SDWebImage/Core (5.16.0)
+  - sensitive_clipboard (0.0.1):
+    - Flutter
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -150,6 +152,8 @@ PODS:
     - Flutter
   - wakelock (0.0.1):
     - Flutter
+  - workmanager (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
@@ -173,12 +177,14 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - platform_device_id (from `.symlinks/plugins/platform_device_id/ios`)
+  - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - UnstoppableDomainsResolution (~> 4.0.0)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
+  - workmanager (from `.symlinks/plugins/workmanager/ios`)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -235,6 +241,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   platform_device_id:
     :path: ".symlinks/plugins/platform_device_id/ios"
+  sensitive_clipboard:
+    :path: ".symlinks/plugins/sensitive_clipboard/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -245,6 +253,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   wakelock:
     :path: ".symlinks/plugins/wakelock/ios"
+  workmanager:
+    :path: ".symlinks/plugins/workmanager/ios"
 
 SPEC CHECKSUMS:
   barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
@@ -270,11 +280,12 @@ SPEC CHECKSUMS:
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
+  sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
@@ -283,6 +294,7 @@ SPEC CHECKSUMS:
   UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
+  workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
 
 PODFILE CHECKSUM: 09df1114e7c360f55770d35a79356bf5446e0100
 

ios/Runner.xcodeproj/project.pbxproj

@@ -606,4 +606,9 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+	SystemCapabilities = {
+    	com.apple.BackgroundModes = {
+    		enabled = 1;
+    	};
+    };
 }

ios/Runner/AppDelegate.swift

@@ -1,6 +1,7 @@
 import UIKit
 import Flutter
 import UnstoppableDomainsResolution
+import workmanager
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -16,6 +17,15 @@ import UnstoppableDomainsResolution
           UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
         }
 
+        WorkmanagerPlugin.setPluginRegistrantCallback { registry in
+            // Registry in this case is the FlutterEngine that is created in Workmanager's
+            // performFetchWithCompletionHandler or BGAppRefreshTask.
+            // This will make other plugins available during a background operation.
+            GeneratedPluginRegistrant.register(with: registry)
+        }
+
+        WorkmanagerPlugin.registerTask(withIdentifier: "com.fotolockr.cakewallet.monero_sync_task")
+
         makeSecure()
         
         let controller : FlutterViewController = window?.rootViewController as! FlutterViewController

ios/Runner/InfoBase.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>com.fotolockr.cakewallet.monero_sync_task</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -113,6 +117,7 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
+		<string>processing</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

lib/bitcoin/cw_bitcoin.dart

@@ -81,7 +81,7 @@ class CWBitcoin extends Bitcoin {
 					isParsedAddress: out.isParsedAddress,
 					formattedCryptoAmount: out.formattedCryptoAmount))
 			.toList(),
-			priority: priority != null ? priority as BitcoinTransactionPriority : null,
+			priority: priority as BitcoinTransactionPriority,
 			feeRate: feeRate);
 
 	@override

lib/buy/onramper/onramper_buy_provider.dart

@@ -20,6 +20,8 @@ class OnRamperBuyProvider {
     switch (_wallet.currency) {
       case CryptoCurrency.ltc:
         return "LTC_LITECOIN";
+      case CryptoCurrency.xmr:
+        return "XMR_MONERO";
       default:
         return _wallet.currency.title;
     }
@@ -60,11 +62,12 @@ class OnRamperBuyProvider {
         break;
     }
 
+    final networkName = _wallet.currency.fullName?.toUpperCase().replaceAll(" ", "");
 
     return Uri.https(_baseUrl, '', <String, dynamic>{
       'apiKey': _apiKey,
       'defaultCrypto': _normalizeCryptoCurrency,
-      'wallets': '${_wallet.currency.title}:${_wallet.walletAddresses.address}',
+      'networkWallets': '${networkName}:${_wallet.walletAddresses.address}',
       'supportSell': "false",
       'supportSwap': "false",
       'primaryColor': primaryColor,

lib/core/address_validator.dart

@@ -2,6 +2,7 @@ import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/erc20_token.dart';
 
 class AddressValidator extends TextValidator {
   AddressValidator({required CryptoCurrency type})
@@ -14,6 +15,9 @@ class AddressValidator extends TextValidator {
             length: getLength(type));
 
   static String getPattern(CryptoCurrency type) {
+    if (type is Erc20Token) {
+      return '0x[0-9a-zA-Z]';
+    }
     switch (type) {
       case CryptoCurrency.xmr:
         return '^4[0-9a-zA-Z]{94}\$|^8[0-9a-zA-Z]{94}\$|^[0-9a-zA-Z]{106}\$';
@@ -56,6 +60,7 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.zrx:
       case CryptoCurrency.dydx:
       case CryptoCurrency.steth:
+      case CryptoCurrency.shib:
         return '0x[0-9a-zA-Z]';
       case CryptoCurrency.xrp:
         return '^[0-9a-zA-Z]{34}\$|^X[0-9a-zA-Z]{46}\$';
@@ -116,17 +121,14 @@ class AddressValidator extends TextValidator {
   }
 
   static List<int>? getLength(CryptoCurrency type) {
+    if (type is Erc20Token) {
+      return [42];
+    }
     switch (type) {
       case CryptoCurrency.xmr:
         return null;
       case CryptoCurrency.ada:
         return null;
-      case CryptoCurrency.avaxc:
-        return [42];
-      case CryptoCurrency.bch:
-        return [42];
-      case CryptoCurrency.bnb:
-        return [42];
       case CryptoCurrency.btc:
         return null;
       case CryptoCurrency.dash:
@@ -166,6 +168,10 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.zrx:
       case CryptoCurrency.dydx:
       case CryptoCurrency.steth:
+      case CryptoCurrency.shib:
+      case CryptoCurrency.avaxc:
+      case CryptoCurrency.bch:
+      case CryptoCurrency.bnb:
         return [42];
       case CryptoCurrency.ltc:
         return [34, 43, 63];
@@ -203,11 +209,8 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xusd:
         return [98, 99, 106];
       case CryptoCurrency.btt:
-        return [34];
       case CryptoCurrency.bttc:
-        return [34];
       case CryptoCurrency.doge:
-        return [34];
       case CryptoCurrency.firo:
         return [34];
       case CryptoCurrency.hbar:
@@ -258,6 +261,8 @@ class AddressValidator extends TextValidator {
         return '([^0-9a-zA-Z]|^)^L[a-zA-Z0-9]{26,33}([^0-9a-zA-Z]|\$)'
             '|([^0-9a-zA-Z]|^)[LM][a-km-zA-HJ-NP-Z1-9]{26,33}([^0-9a-zA-Z]|\$)'
             '|([^0-9a-zA-Z]|^)ltc[a-zA-Z0-9]{26,45}([^0-9a-zA-Z]|\$)';
+      case CryptoCurrency.eth:
+        return '0x[0-9a-zA-Z]{42}';
       default:
         return null;
     }

lib/core/auth_service.dart

@@ -25,6 +25,10 @@ class AuthService with Store {
     Routes.setupPin,
     Routes.setup_2faPage,
     Routes.modify2FAPage,
+    Routes.newWallet,
+    Routes.newWalletType,
+    Routes.addressBookAddContact,
+    Routes.restoreOptions,
   ];
 
   final SecureStorage secureStorage;
@@ -81,21 +85,26 @@ class AuthService with Store {
   }
 
   Future<void> authenticateAction(BuildContext context,
-      {Function(bool)? onAuthSuccess, String? route, Object? arguments}) async {
+      {Function(bool)? onAuthSuccess,
+      String? route,
+      Object? arguments,
+      required bool conditionToDetermineIfToUse2FA}) async {
     assert(route != null || onAuthSuccess != null,
         'Either route or onAuthSuccess param must be passed.');
 
-    if (!requireAuth() && !_alwaysAuthenticateRoutes.contains(route)) {
-      if (onAuthSuccess != null) {
-        onAuthSuccess(true);
-      } else {
-        Navigator.of(context).pushNamed(
-          route ?? '',
-          arguments: arguments,
-        );
+    if (!conditionToDetermineIfToUse2FA) {
+      if (!requireAuth() && !_alwaysAuthenticateRoutes.contains(route)) {
+        if (onAuthSuccess != null) {
+          onAuthSuccess(true);
+        } else {
+          Navigator.of(context).pushNamed(
+            route ?? '',
+            arguments: arguments,
+          );
+        }
+        return;
       }
-      return;
-    }
+}
 
 
     Navigator.of(context).pushNamed(Routes.auth,
@@ -104,7 +113,7 @@ class AuthService with Store {
         onAuthSuccess?.call(false);
         return;
       } else {
-        if (settingsStore.useTOTP2FA) {
+        if (settingsStore.useTOTP2FA && conditionToDetermineIfToUse2FA) {
           auth.close(
             route: Routes.totpAuthCodePage,
             arguments: TotpAuthArgumentsModel(

lib/core/backup_service.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 import 'package:cw_core/root_dir.dart';
+import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
@@ -20,8 +21,8 @@ import 'package:cake_wallet/wallet_types.g.dart';
 import 'package:cake_backup/backup.dart' as cake_backup;
 
 class BackupService {
-  BackupService(this._flutterSecureStorage, this._walletInfoSource,
-      this._keyService, this._sharedPreferences)
+  BackupService(
+      this._flutterSecureStorage, this._walletInfoSource, this._keyService, this._sharedPreferences)
       : _cipher = Cryptography.instance.chacha20Poly1305Aead(),
         _correctWallets = <WalletInfo>[];
 
@@ -68,9 +69,8 @@ class BackupService {
   }
 
   @Deprecated('Use v2 instead')
-  Future<Uint8List> _exportBackupV1(String password,
-      {String nonce = secrets.backupSalt}) async
-    => throw Exception('Deprecated. Export for backups v1 is deprecated. Please use export v2.');
+  Future<Uint8List> _exportBackupV1(String password, {String nonce = secrets.backupSalt}) async =>
+      throw Exception('Deprecated. Export for backups v1 is deprecated. Please use export v2.');
 
   Future<Uint8List> _exportBackupV2(String password) async {
     final zipEncoder = ZipFileEncoder();
@@ -113,8 +113,7 @@ class BackupService {
     return await _encryptV2(content, password);
   }
 
-  Future<void> _importBackupV1(Uint8List data, String password,
-      {required String nonce}) async {
+  Future<void> _importBackupV1(Uint8List data, String password, {required String nonce}) async {
     final appDir = await getAppDir();
     final decryptedData = await _decryptV1(data, password, nonce);
     final zip = ZipDecoder().decodeBytes(decryptedData);
@@ -162,10 +161,8 @@ class BackupService {
 
   Future<void> _verifyWallets() async {
     final walletInfoSource = await _reloadHiveWalletInfoBox();
-    _correctWallets = walletInfoSource
-      .values
-      .where((info) => availableWalletTypes.contains(info.type))
-      .toList();
+    _correctWallets =
+        walletInfoSource.values.where((info) => availableWalletTypes.contains(info.type)).toList();
 
     if (_correctWallets.isEmpty) {
       throw Exception('Correct wallets not detected');
@@ -192,14 +189,12 @@ class BackupService {
       return;
     }
 
-    final data =
-        json.decode(preferencesFile.readAsStringSync()) as Map<String, dynamic>;
+    final data = json.decode(preferencesFile.readAsStringSync()) as Map<String, dynamic>;
     String currentWalletName = data[PreferencesKey.currentWalletName] as String;
     int currentWalletType = data[PreferencesKey.currentWalletType] as int;
 
     final isCorrentCurrentWallet = _correctWallets
-      .any((info) => info.name == currentWalletName &&
-          info.type.index == currentWalletType);
+        .any((info) => info.name == currentWalletName && info.type.index == currentWalletType);
 
     if (!isCorrentCurrentWallet) {
       currentWalletName = _correctWallets.first.name;
@@ -213,138 +208,193 @@ class BackupService {
     final isAppSecure = data[PreferencesKey.isAppSecureKey] as bool?;
     final disableBuy = data[PreferencesKey.disableBuyKey] as bool?;
     final disableSell = data[PreferencesKey.disableSellKey] as bool?;
-    final currentTransactionPriorityKeyLegacy = data[PreferencesKey.currentTransactionPriorityKeyLegacy] as int?;
-    final allowBiometricalAuthentication = data[PreferencesKey.allowBiometricalAuthenticationKey] as bool?;
-    final currentBitcoinElectrumSererId = data[PreferencesKey.currentBitcoinElectrumSererIdKey] as int?;
+    final currentTransactionPriorityKeyLegacy =
+        data[PreferencesKey.currentTransactionPriorityKeyLegacy] as int?;
+    final allowBiometricalAuthentication =
+        data[PreferencesKey.allowBiometricalAuthenticationKey] as bool?;
+    final currentBitcoinElectrumSererId =
+        data[PreferencesKey.currentBitcoinElectrumSererIdKey] as int?;
     final currentLanguageCode = data[PreferencesKey.currentLanguageCode] as String?;
     final displayActionListMode = data[PreferencesKey.displayActionListModeKey] as int?;
     final fiatApiMode = data[PreferencesKey.currentFiatApiModeKey] as int?;
     final currentPinLength = data[PreferencesKey.currentPinLength] as int?;
     final currentTheme = data[PreferencesKey.currentTheme] as int?;
     final exchangeStatus = data[PreferencesKey.exchangeStatusKey] as int?;
-    final currentDefaultSettingsMigrationVersion = data[PreferencesKey.currentDefaultSettingsMigrationVersion] as int?;
+    final currentDefaultSettingsMigrationVersion =
+        data[PreferencesKey.currentDefaultSettingsMigrationVersion] as int?;
     final moneroTransactionPriority = data[PreferencesKey.moneroTransactionPriority] as int?;
     final bitcoinTransactionPriority = data[PreferencesKey.bitcoinTransactionPriority] as int?;
+    final selectedCake2FAPreset = data[PreferencesKey.selectedCake2FAPreset] as int?;
+    final shouldRequireTOTP2FAForAccessingWallet =
+        data[PreferencesKey.shouldRequireTOTP2FAForAccessingWallet] as bool?;
+    final shouldRequireTOTP2FAForSendsToContact =
+        data[PreferencesKey.shouldRequireTOTP2FAForSendsToContact] as bool?;
+    final shouldRequireTOTP2FAForSendsToNonContact =
+        data[PreferencesKey.shouldRequireTOTP2FAForSendsToNonContact] as bool?;
+    final shouldRequireTOTP2FAForSendsToInternalWallets =
+        data[PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets] as bool?;
+    final shouldRequireTOTP2FAForExchangesToInternalWallets =
+        data[PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets] as bool?;
+    final shouldRequireTOTP2FAForAddingContacts =
+        data[PreferencesKey.shouldRequireTOTP2FAForAddingContacts] as bool?;
+    final shouldRequireTOTP2FAForCreatingNewWallets =
+        data[PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets] as bool?;
+    final shouldRequireTOTP2FAForAllSecurityAndBackupSettings =
+        data[PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings] as bool?;
+    final sortBalanceTokensBy = data[PreferencesKey.sortBalanceBy] as int?;
+    final pinNativeTokenAtTop = data[PreferencesKey.pinNativeTokenAtTop] as bool?;
+    final useEtherscan = data[PreferencesKey.useEtherscan] as bool?;
+    final syncAll = data[PreferencesKey.syncAllKey] as bool?;
+    final syncMode = data[PreferencesKey.syncModeKey] as int?;
 
-    await _sharedPreferences.setString(PreferencesKey.currentWalletName,
-        currentWalletName);
+    await _sharedPreferences.setString(PreferencesKey.currentWalletName, currentWalletName);
 
     if (currentNodeId != null)
-      await _sharedPreferences.setInt(PreferencesKey.currentNodeIdKey,
-        currentNodeId);
+      await _sharedPreferences.setInt(PreferencesKey.currentNodeIdKey, currentNodeId);
 
     if (currentBalanceDisplayMode != null)
-      await _sharedPreferences.setInt(PreferencesKey.currentBalanceDisplayModeKey,
-        currentBalanceDisplayMode);
+      await _sharedPreferences.setInt(
+          PreferencesKey.currentBalanceDisplayModeKey, currentBalanceDisplayMode);
 
-    await _sharedPreferences.setInt(PreferencesKey.currentWalletType,
-        currentWalletType);
+    await _sharedPreferences.setInt(PreferencesKey.currentWalletType, currentWalletType);
 
     if (currentFiatCurrency != null)
-      await _sharedPreferences.setString(PreferencesKey.currentFiatCurrencyKey,
-        currentFiatCurrency);
+      await _sharedPreferences.setString(
+          PreferencesKey.currentFiatCurrencyKey, currentFiatCurrency);
 
     if (shouldSaveRecipientAddress != null)
       await _sharedPreferences.setBool(
-        PreferencesKey.shouldSaveRecipientAddressKey,
-        shouldSaveRecipientAddress);
+          PreferencesKey.shouldSaveRecipientAddressKey, shouldSaveRecipientAddress);
 
     if (isAppSecure != null)
-      await _sharedPreferences.setBool(
-          PreferencesKey.isAppSecureKey,
-          isAppSecure);
+      await _sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure);
 
     if (disableBuy != null)
-      await _sharedPreferences.setBool(
-          PreferencesKey.disableBuyKey,
-          disableBuy);
+      await _sharedPreferences.setBool(PreferencesKey.disableBuyKey, disableBuy);
 
     if (disableSell != null)
-      await _sharedPreferences.setBool(
-          PreferencesKey.disableSellKey,
-          disableSell);
+      await _sharedPreferences.setBool(PreferencesKey.disableSellKey, disableSell);
 
     if (currentTransactionPriorityKeyLegacy != null)
       await _sharedPreferences.setInt(
-        PreferencesKey.currentTransactionPriorityKeyLegacy,
-        currentTransactionPriorityKeyLegacy);
+          PreferencesKey.currentTransactionPriorityKeyLegacy, currentTransactionPriorityKeyLegacy);
 
     if (allowBiometricalAuthentication != null)
       await _sharedPreferences.setBool(
-        PreferencesKey.allowBiometricalAuthenticationKey,
-        allowBiometricalAuthentication);
+          PreferencesKey.allowBiometricalAuthenticationKey, allowBiometricalAuthentication);
 
     if (currentBitcoinElectrumSererId != null)
       await _sharedPreferences.setInt(
-        PreferencesKey.currentBitcoinElectrumSererIdKey,
-        currentBitcoinElectrumSererId);
+          PreferencesKey.currentBitcoinElectrumSererIdKey, currentBitcoinElectrumSererId);
 
     if (currentLanguageCode != null)
-      await _sharedPreferences.setString(PreferencesKey.currentLanguageCode,
-        currentLanguageCode);
+      await _sharedPreferences.setString(PreferencesKey.currentLanguageCode, currentLanguageCode);
 
     if (displayActionListMode != null)
-      await _sharedPreferences.setInt(PreferencesKey.displayActionListModeKey,
-        displayActionListMode);
+      await _sharedPreferences.setInt(
+          PreferencesKey.displayActionListModeKey, displayActionListMode);
 
     if (fiatApiMode != null)
-      await _sharedPreferences.setInt(PreferencesKey.currentFiatApiModeKey,
-          fiatApiMode);
+      await _sharedPreferences.setInt(PreferencesKey.currentFiatApiModeKey, fiatApiMode);
 
     if (currentPinLength != null)
-      await _sharedPreferences.setInt(PreferencesKey.currentPinLength,
-        currentPinLength);
+      await _sharedPreferences.setInt(PreferencesKey.currentPinLength, currentPinLength);
 
     if (currentTheme != null)
-      await _sharedPreferences.setInt(
-        PreferencesKey.currentTheme, currentTheme);
+      await _sharedPreferences.setInt(PreferencesKey.currentTheme, currentTheme);
 
     if (exchangeStatus != null)
-      await _sharedPreferences.setInt(
-        PreferencesKey.exchangeStatusKey, exchangeStatus);
+      await _sharedPreferences.setInt(PreferencesKey.exchangeStatusKey, exchangeStatus);
 
     if (currentDefaultSettingsMigrationVersion != null)
-      await _sharedPreferences.setInt(
-        PreferencesKey.currentDefaultSettingsMigrationVersion,
-        currentDefaultSettingsMigrationVersion);
+      await _sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion,
+          currentDefaultSettingsMigrationVersion);
 
     if (moneroTransactionPriority != null)
-      await _sharedPreferences.setInt(PreferencesKey.moneroTransactionPriority,
-        moneroTransactionPriority);
+      await _sharedPreferences.setInt(
+          PreferencesKey.moneroTransactionPriority, moneroTransactionPriority);
 
     if (bitcoinTransactionPriority != null)
-      await _sharedPreferences.setInt(PreferencesKey.bitcoinTransactionPriority,
-        bitcoinTransactionPriority);
+      await _sharedPreferences.setInt(
+          PreferencesKey.bitcoinTransactionPriority, bitcoinTransactionPriority);
+
+    if (selectedCake2FAPreset != null)
+      await _sharedPreferences.setInt(PreferencesKey.selectedCake2FAPreset, selectedCake2FAPreset);
+
+    if (shouldRequireTOTP2FAForAccessingWallet != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForAccessingWallet,
+          shouldRequireTOTP2FAForAccessingWallet);
+
+    if (shouldRequireTOTP2FAForSendsToContact != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForSendsToContact,
+          shouldRequireTOTP2FAForSendsToContact);
+
+    if (shouldRequireTOTP2FAForSendsToNonContact != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForSendsToNonContact,
+          shouldRequireTOTP2FAForSendsToNonContact);
+
+    if (shouldRequireTOTP2FAForSendsToInternalWallets != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets,
+          shouldRequireTOTP2FAForSendsToInternalWallets);
+
+    if (shouldRequireTOTP2FAForExchangesToInternalWallets != null)
+      await _sharedPreferences.setBool(
+          PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets,
+          shouldRequireTOTP2FAForExchangesToInternalWallets);
+
+    if (shouldRequireTOTP2FAForAddingContacts != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts,
+          shouldRequireTOTP2FAForAddingContacts);
+
+    if (shouldRequireTOTP2FAForCreatingNewWallets != null)
+      await _sharedPreferences.setBool(PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets,
+          shouldRequireTOTP2FAForCreatingNewWallets);
+
+    if (shouldRequireTOTP2FAForAllSecurityAndBackupSettings != null)
+      await _sharedPreferences.setBool(
+          PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
+          shouldRequireTOTP2FAForAllSecurityAndBackupSettings);
+
+    if (sortBalanceTokensBy != null)
+      await _sharedPreferences.setInt(PreferencesKey.sortBalanceBy, sortBalanceTokensBy);
+
+    if (pinNativeTokenAtTop != null)
+      await _sharedPreferences.setBool(PreferencesKey.pinNativeTokenAtTop, pinNativeTokenAtTop);
+
+    if (useEtherscan != null)
+      await _sharedPreferences.setBool(PreferencesKey.useEtherscan, useEtherscan);
+
+    if (syncAll != null)
+      await _sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
+
+    if (syncMode != null)
+      await _sharedPreferences.setInt(PreferencesKey.syncModeKey, syncMode);
 
     await preferencesFile.delete();
   }
 
   Future<void> _importKeychainDumpV1(String password,
-      {required String nonce,
-      String keychainSalt = secrets.backupKeychainSalt}) async {
+      {required String nonce, String keychainSalt = secrets.backupKeychainSalt}) async {
     final appDir = await getAppDir();
     final keychainDumpFile = File('${appDir.path}/~_keychain_dump');
-    final decryptedKeychainDumpFileData = await _decryptV1(
-        keychainDumpFile.readAsBytesSync(), '$keychainSalt$password', nonce);
-    final keychainJSON = json.decode(utf8.decode(decryptedKeychainDumpFileData))
-        as Map<String, dynamic>;
+    final decryptedKeychainDumpFileData =
+        await _decryptV1(keychainDumpFile.readAsBytesSync(), '$keychainSalt$password', nonce);
+    final keychainJSON =
+        json.decode(utf8.decode(decryptedKeychainDumpFileData)) as Map<String, dynamic>;
     final keychainWalletsInfo = keychainJSON['wallets'] as List;
     final decodedPin = keychainJSON['pin'] as String;
     final pinCodeKey = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final backupPasswordKey =
-        generateStoreKeyFor(key: SecretStoreKey.backupPassword);
+    final backupPasswordKey = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
     final backupPassword = keychainJSON[backupPasswordKey] as String;
 
-    await _flutterSecureStorage.write(
-        key: backupPasswordKey, value: backupPassword);
+    await _flutterSecureStorage.write(key: backupPasswordKey, value: backupPassword);
 
     keychainWalletsInfo.forEach((dynamic rawInfo) async {
       final info = rawInfo as Map<String, dynamic>;
       await importWalletKeychainInfo(info);
     });
 
-    await _flutterSecureStorage.write(
-        key: pinCodeKey, value: encodedPinCode(pin: decodedPin));
+    await _flutterSecureStorage.write(key: pinCodeKey, value: encodedPinCode(pin: decodedPin));
 
     keychainDumpFile.deleteSync();
   }
@@ -353,27 +403,24 @@ class BackupService {
       {String keychainSalt = secrets.backupKeychainSalt}) async {
     final appDir = await getAppDir();
     final keychainDumpFile = File('${appDir.path}/~_keychain_dump');
-    final decryptedKeychainDumpFileData = await _decryptV2(
-        keychainDumpFile.readAsBytesSync(), '$keychainSalt$password');
-    final keychainJSON = json.decode(utf8.decode(decryptedKeychainDumpFileData))
-        as Map<String, dynamic>;
+    final decryptedKeychainDumpFileData =
+        await _decryptV2(keychainDumpFile.readAsBytesSync(), '$keychainSalt$password');
+    final keychainJSON =
+        json.decode(utf8.decode(decryptedKeychainDumpFileData)) as Map<String, dynamic>;
     final keychainWalletsInfo = keychainJSON['wallets'] as List;
     final decodedPin = keychainJSON['pin'] as String;
     final pinCodeKey = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final backupPasswordKey =
-        generateStoreKeyFor(key: SecretStoreKey.backupPassword);
+    final backupPasswordKey = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
     final backupPassword = keychainJSON[backupPasswordKey] as String;
 
-    await _flutterSecureStorage.write(
-        key: backupPasswordKey, value: backupPassword);
+    await _flutterSecureStorage.write(key: backupPasswordKey, value: backupPassword);
 
     keychainWalletsInfo.forEach((dynamic rawInfo) async {
       final info = rawInfo as Map<String, dynamic>;
       await importWalletKeychainInfo(info);
     });
 
-    await _flutterSecureStorage.write(
-        key: pinCodeKey, value: encodedPinCode(pin: decodedPin));
+    await _flutterSecureStorage.write(key: pinCodeKey, value: encodedPinCode(pin: decodedPin));
 
     keychainDumpFile.deleteSync();
   }
@@ -387,35 +434,26 @@ class BackupService {
 
   @Deprecated('Use v2 instead')
   Future<Uint8List> _exportKeychainDumpV1(String password,
-      {required String nonce,
-      String keychainSalt = secrets.backupKeychainSalt}) async
-    => throw Exception('Deprecated');
+          {required String nonce, String keychainSalt = secrets.backupKeychainSalt}) async =>
+      throw Exception('Deprecated');
 
   Future<Uint8List> _exportKeychainDumpV2(String password,
       {String keychainSalt = secrets.backupKeychainSalt}) async {
     final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
     final encodedPin = await _flutterSecureStorage.read(key: key);
     final decodedPin = decodedPinCode(pin: encodedPin!);
-    final wallets =
-        await Future.wait(_walletInfoSource.values.map((walletInfo) async {
+    final wallets = await Future.wait(_walletInfoSource.values.map((walletInfo) async {
       return {
         'name': walletInfo.name,
         'type': walletInfo.type.toString(),
-        'password':
-            await _keyService.getWalletPassword(walletName: walletInfo.name)
+        'password': await _keyService.getWalletPassword(walletName: walletInfo.name)
       };
     }));
-    final backupPasswordKey =
-        generateStoreKeyFor(key: SecretStoreKey.backupPassword);
-    final backupPassword =
-        await _flutterSecureStorage.read(key: backupPasswordKey);
-    final data = utf8.encode(json.encode({
-      'pin': decodedPin,
-      'wallets': wallets,
-      backupPasswordKey: backupPassword
-    }));
-    final encrypted = await _encryptV2(
-        Uint8List.fromList(data), '$keychainSalt$password');
+    final backupPasswordKey = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
+    final backupPassword = await _flutterSecureStorage.read(key: backupPasswordKey);
+    final data = utf8.encode(
+        json.encode({'pin': decodedPin, 'wallets': wallets, backupPasswordKey: backupPassword}));
+    final encrypted = await _encryptV2(Uint8List.fromList(data), '$keychainSalt$password');
 
     return encrypted;
   }
@@ -424,46 +462,67 @@ class BackupService {
     final preferences = <String, dynamic>{
       PreferencesKey.currentWalletName:
           _sharedPreferences.getString(PreferencesKey.currentWalletName),
-      PreferencesKey.currentNodeIdKey:
-          _sharedPreferences.getInt(PreferencesKey.currentNodeIdKey),
-      PreferencesKey.currentBalanceDisplayModeKey: _sharedPreferences
-          .getInt(PreferencesKey.currentBalanceDisplayModeKey),
-      PreferencesKey.currentWalletType:
-          _sharedPreferences.getInt(PreferencesKey.currentWalletType),
+      PreferencesKey.currentNodeIdKey: _sharedPreferences.getInt(PreferencesKey.currentNodeIdKey),
+      PreferencesKey.currentBalanceDisplayModeKey:
+          _sharedPreferences.getInt(PreferencesKey.currentBalanceDisplayModeKey),
+      PreferencesKey.currentWalletType: _sharedPreferences.getInt(PreferencesKey.currentWalletType),
       PreferencesKey.currentFiatCurrencyKey:
           _sharedPreferences.getString(PreferencesKey.currentFiatCurrencyKey),
-      PreferencesKey.shouldSaveRecipientAddressKey: _sharedPreferences
-          .getBool(PreferencesKey.shouldSaveRecipientAddressKey),
-      PreferencesKey.disableBuyKey: _sharedPreferences
-          .getBool(PreferencesKey.disableBuyKey),
-      PreferencesKey.disableSellKey: _sharedPreferences
-          .getBool(PreferencesKey.disableSellKey),
+      PreferencesKey.shouldSaveRecipientAddressKey:
+          _sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey),
+      PreferencesKey.disableBuyKey: _sharedPreferences.getBool(PreferencesKey.disableBuyKey),
+      PreferencesKey.disableSellKey: _sharedPreferences.getBool(PreferencesKey.disableSellKey),
       PreferencesKey.isDarkThemeLegacy:
           _sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy),
-      PreferencesKey.currentPinLength:
-          _sharedPreferences.getInt(PreferencesKey.currentPinLength),
-      PreferencesKey.currentTransactionPriorityKeyLegacy: _sharedPreferences
-          .getInt(PreferencesKey.currentTransactionPriorityKeyLegacy),
-      PreferencesKey.allowBiometricalAuthenticationKey: _sharedPreferences
-          .getBool(PreferencesKey.allowBiometricalAuthenticationKey),
-      PreferencesKey.currentBitcoinElectrumSererIdKey: _sharedPreferences
-          .getInt(PreferencesKey.currentBitcoinElectrumSererIdKey),
+      PreferencesKey.currentPinLength: _sharedPreferences.getInt(PreferencesKey.currentPinLength),
+      PreferencesKey.currentTransactionPriorityKeyLegacy:
+          _sharedPreferences.getInt(PreferencesKey.currentTransactionPriorityKeyLegacy),
+      PreferencesKey.allowBiometricalAuthenticationKey:
+          _sharedPreferences.getBool(PreferencesKey.allowBiometricalAuthenticationKey),
+      PreferencesKey.currentBitcoinElectrumSererIdKey:
+          _sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey),
       PreferencesKey.currentLanguageCode:
           _sharedPreferences.getString(PreferencesKey.currentLanguageCode),
       PreferencesKey.displayActionListModeKey:
           _sharedPreferences.getInt(PreferencesKey.displayActionListModeKey),
-      PreferencesKey.currentTheme:
-          _sharedPreferences.getInt(PreferencesKey.currentTheme),
-      PreferencesKey.exchangeStatusKey:
-          _sharedPreferences.getInt(PreferencesKey.exchangeStatusKey),
-      PreferencesKey.currentDefaultSettingsMigrationVersion: _sharedPreferences
-          .getInt(PreferencesKey.currentDefaultSettingsMigrationVersion),
+      PreferencesKey.currentTheme: _sharedPreferences.getInt(PreferencesKey.currentTheme),
+      PreferencesKey.exchangeStatusKey: _sharedPreferences.getInt(PreferencesKey.exchangeStatusKey),
+      PreferencesKey.currentDefaultSettingsMigrationVersion:
+          _sharedPreferences.getInt(PreferencesKey.currentDefaultSettingsMigrationVersion),
       PreferencesKey.bitcoinTransactionPriority:
           _sharedPreferences.getInt(PreferencesKey.bitcoinTransactionPriority),
       PreferencesKey.moneroTransactionPriority:
           _sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority),
       PreferencesKey.currentFiatApiModeKey:
-      _sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey),
+          _sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey),
+      PreferencesKey.selectedCake2FAPreset:
+          _sharedPreferences.getInt(PreferencesKey.selectedCake2FAPreset),
+      PreferencesKey.shouldRequireTOTP2FAForAccessingWallet:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAccessingWallet),
+      PreferencesKey.shouldRequireTOTP2FAForSendsToContact:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForSendsToContact),
+      PreferencesKey.shouldRequireTOTP2FAForSendsToNonContact:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForSendsToNonContact),
+      PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets),
+      PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets: _sharedPreferences
+          .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets),
+      PreferencesKey.shouldRequireTOTP2FAForAddingContacts:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts),
+      PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets:
+          _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets),
+      PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings: _sharedPreferences
+          .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings),
+      PreferencesKey.sortBalanceBy:
+          _sharedPreferences.getInt(PreferencesKey.sortBalanceBy),
+      PreferencesKey.pinNativeTokenAtTop:
+          _sharedPreferences.getBool(PreferencesKey.pinNativeTokenAtTop),
+      PreferencesKey.useEtherscan:
+          _sharedPreferences.getBool(PreferencesKey.useEtherscan),
+      PreferencesKey.syncModeKey:
+          _sharedPreferences.getInt(PreferencesKey.syncModeKey),
+      PreferencesKey.syncAllKey:
+          _sharedPreferences.getBool(PreferencesKey.syncAllKey),
     };
 
     return json.encode(preferences);
@@ -477,28 +536,23 @@ class BackupService {
   }
 
   @Deprecated('Use v2 instead')
-  Future<Uint8List> _encryptV1(
-      Uint8List data, String secretKeySource, String nonceBase64) async
-    => throw Exception('Deprecated');
+  Future<Uint8List> _encryptV1(Uint8List data, String secretKeySource, String nonceBase64) async =>
+      throw Exception('Deprecated');
 
-  Future<Uint8List> _decryptV1(
-      Uint8List data, String secretKeySource, String nonceBase64, {int macLength = 16}) async {
+  Future<Uint8List> _decryptV1(Uint8List data, String secretKeySource, String nonceBase64,
+      {int macLength = 16}) async {
     final secretKeyHash = await Cryptography.instance.sha256().hash(utf8.encode(secretKeySource));
     final secretKey = SecretKey(secretKeyHash.bytes);
     final nonce = base64.decode(nonceBase64).toList();
-    final box = SecretBox(
-      Uint8List.sublistView(data, 0, data.lengthInBytes - macLength).toList(),
-      nonce: nonce,
-      mac: Mac(Uint8List.sublistView(data, data.lengthInBytes - macLength)));
+    final box = SecretBox(Uint8List.sublistView(data, 0, data.lengthInBytes - macLength).toList(),
+        nonce: nonce, mac: Mac(Uint8List.sublistView(data, data.lengthInBytes - macLength)));
     final plainData = await _cipher.decrypt(box, secretKey: secretKey);
     return Uint8List.fromList(plainData);
   }
 
-  Future<Uint8List> _encryptV2(
-      Uint8List data, String passphrase) async
-    => cake_backup.encrypt(passphrase, data, version: _v2);
+  Future<Uint8List> _encryptV2(Uint8List data, String passphrase) async =>
+      cake_backup.encrypt(passphrase, data, version: _v2);
 
-  Future<Uint8List> _decryptV2(
-      Uint8List data, String passphrase) async
-    => cake_backup.decrypt(passphrase, data);
+  Future<Uint8List> _decryptV2(Uint8List data, String passphrase) async =>
+      cake_backup.decrypt(passphrase, data);
 }

lib/core/fiat_conversion_service.dart

@@ -5,21 +5,20 @@ import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
-
 const _fiatApiClearNetAuthority = 'fiat-api.cakewallet.com';
 const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion';
 const _fiatApiPath = '/v2/rates';
 
 Future<double> _fetchPrice(Map<String, dynamic> args) async {
-  final crypto = args['crypto'] as CryptoCurrency;
-  final fiat = args['fiat'] as FiatCurrency;
+  final crypto = args['crypto'] as String;
+  final fiat = args['fiat'] as String;
   final torOnly = args['torOnly'] as bool;
 
   final Map<String, String> queryParams = {
     'interval_count': '1',
-    'base': crypto.toString(),
-    'quote': fiat.toString(),
-    'key' : secrets.fiatApiKey,
+    'base': crypto,
+    'quote': fiat,
+    'key': secrets.fiatApiKey,
   };
 
   double price = 0.0;
@@ -52,7 +51,11 @@ Future<double> _fetchPrice(Map<String, dynamic> args) async {
 }
 
 Future<double> _fetchPriceAsync(CryptoCurrency crypto, FiatCurrency fiat, bool torOnly) async =>
-    compute(_fetchPrice, {'fiat': fiat, 'crypto': crypto, 'torOnly': torOnly});
+    compute(_fetchPrice, {
+      'fiat': fiat.toString(),
+      'crypto': crypto.toString(),
+      'torOnly': torOnly,
+    });
 
 class FiatConversionService {
   static Future<double> fetchPrice({

lib/core/seed_validator.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/haven/haven.dart';
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/entities/mnemonic_item.dart';
@@ -25,6 +26,8 @@ class SeedValidator extends Validator<MnemonicItem> {
         return monero!.getMoneroWordList(language);
       case WalletType.haven:
         return haven!.getMoneroWordList(language);
+      case WalletType.ethereum:
+        return ethereum!.getEthereumWordList(language);
       default:
         return [];
     }

lib/core/socks_proxy_node_address_validator.dart

@@ -0,0 +1,10 @@
+import 'package:cake_wallet/core/validator.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+
+class SocksProxyNodeAddressValidator extends TextValidator {
+  SocksProxyNodeAddressValidator()
+      : super(
+      errorMessage: S.current.error_text_node_proxy_address,
+      pattern:
+      '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:[0-9]+\$');
+}

lib/di.dart

@@ -7,8 +7,11 @@ import 'package:cake_wallet/anonpay/anonpay_api.dart';
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
 import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
+import 'package:cake_wallet/core/yat_service.dart';
+import 'package:cake_wallet/entities/background_tasks.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/receive_page_option.dart';
+import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/ionia/ionia_anypay.dart';
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
 import 'package:cake_wallet/ionia/ionia_tip.dart';
@@ -19,9 +22,14 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet
 import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
+import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
+import 'package:cake_wallet/src/screens/dashboard/edit_token_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/home_settings_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_invoice_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_receive_page.dart';
 import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/manage_nodes_page.dart';
 import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
 import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
 import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
@@ -42,6 +50,7 @@ import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
 import 'package:cake_wallet/view_model/anon_invoice_page_view_model.dart';
 import 'package:cake_wallet/view_model/anonpay_details_view_model.dart';
+import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/market_place_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart';
 import 'package:cake_wallet/view_model/ionia/ionia_auth_view_model.dart';
@@ -72,6 +81,7 @@ import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_edit_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
+import 'package:cw_core/erc20_token.dart';
 import 'package:cake_wallet/view_model/wallet_unlock_loadable_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_unlock_verifiable_view_model.dart';
 import 'package:cw_core/unspent_coins_info.dart';
@@ -244,15 +254,21 @@ Future setup({
     getIt.registerSingletonAsync<SharedPreferences>(() => SharedPreferences.getInstance());
   }
 
-  final isBitcoinBuyEnabled = (secrets.wyreSecretKey.isNotEmpty ?? false) &&
-      (secrets.wyreApiKey.isNotEmpty ?? false) &&
-      (secrets.wyreAccountId.isNotEmpty ?? false);
+  if (!_isSetupFinished) {
+    getIt.registerFactory(() => BackgroundTasks());
+  }
+
+  final isBitcoinBuyEnabled = (secrets.wyreSecretKey.isNotEmpty) &&
+      (secrets.wyreApiKey.isNotEmpty) &&
+      (secrets.wyreAccountId.isNotEmpty);
 
   final settingsStore = await SettingsStoreBase.load(
     nodeSource: _nodeSource,
     isBitcoinBuyEnabled: isBitcoinBuyEnabled,
     // Enforce darkTheme on platforms other than mobile till the design for other themes is completed
-    initialTheme: DeviceInfo.instance.isMobile ? null : ThemeList.darkTheme,
+    initialTheme: ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile
+        ? null
+        : ThemeList.darkTheme,
   );
 
   if (_isSetupFinished) {
@@ -393,7 +409,9 @@ Future setup({
         final authStore = getIt.get<AuthenticationStore>();
         final appStore = getIt.get<AppStore>();
         final useTotp = appStore.settingsStore.useTOTP2FA;
-        if (useTotp) {
+        final shouldUseTotp2FAToAccessWallets =
+            appStore.settingsStore.shouldRequireTOTP2FAForAccessingWallet;
+        if (useTotp && shouldUseTotp2FAToAccessWallets) {
           authPageState.close(
             route: Routes.totpAuthCodePage,
             arguments: TotpAuthArgumentsModel(
@@ -529,17 +547,22 @@ Future setup({
       getIt.get<SendTemplateStore>(),
       getIt.get<FiatConversionStore>()));
 
-  getIt.registerFactory<SendViewModel>(() => SendViewModel(
+  getIt.registerFactory<SendViewModel>(
+    () => SendViewModel(
       getIt.get<AppStore>().wallet!,
       getIt.get<AppStore>().settingsStore,
       getIt.get<SendTemplateViewModel>(),
       getIt.get<FiatConversionStore>(),
       getIt.get<BalanceViewModel>(),
-      _transactionDescriptionBox));
+      getIt.get<ContactListViewModel>(),
+      _transactionDescriptionBox,
+    ),
+  );
 
   getIt.registerFactoryParam<SendPage, PaymentRequest?, void>(
       (PaymentRequest? initialPaymentRequest, _) => SendPage(
             sendViewModel: getIt.get<SendViewModel>(),
+            authService: getIt.get<AuthService>(),
             initialPaymentRequest: initialPaymentRequest,
           ));
 
@@ -574,8 +597,8 @@ Future setup({
       ));
 
   getIt.registerFactoryParam<WalletEditViewModel, WalletListViewModel, void>(
-      (WalletListViewModel walletListViewModel, _) => WalletEditViewModel(
-          walletListViewModel, getIt.get<WalletLoadingService>()));
+      (WalletListViewModel walletListViewModel, _) =>
+          WalletEditViewModel(walletListViewModel, getIt.get<WalletLoadingService>()));
 
   getIt.registerFactoryParam<WalletEditPage, List<dynamic>, void>((args, _) {
     final walletListViewModel = args.first as WalletListViewModel;
@@ -587,7 +610,6 @@ Future setup({
         editingWallet: editingWallet);
   });
 
-
   getIt.registerFactory(() {
     final wallet = getIt.get<AppStore>().wallet!;
 
@@ -634,7 +656,7 @@ Future setup({
   });
 
   getIt.registerFactory(() {
-    return PrivacySettingsViewModel(getIt.get<SettingsStore>());
+    return PrivacySettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!);
   });
 
   getIt.registerFactory(() {
@@ -658,10 +680,11 @@ Future setup({
       (ContactRecord? contact, _) => ContactViewModel(_contactSource, contact: contact));
 
   getIt.registerFactoryParam<ContactListViewModel, CryptoCurrency?, void>(
-      (CryptoCurrency? cur, _) => ContactListViewModel(_contactSource, _walletInfoSource, cur));
+      (CryptoCurrency? cur, _) =>
+          ContactListViewModel(_contactSource, _walletInfoSource, cur, getIt.get<SettingsStore>()));
 
-  getIt.registerFactoryParam<ContactListPage, CryptoCurrency?, void>(
-      (CryptoCurrency? cur, _) => ContactListPage(getIt.get<ContactListViewModel>(param1: cur)));
+  getIt.registerFactoryParam<ContactListPage, CryptoCurrency?, void>((CryptoCurrency? cur, _) =>
+      ContactListPage(getIt.get<ContactListViewModel>(param1: cur), getIt.get<AuthService>()));
 
   getIt.registerFactoryParam<ContactPage, ContactRecord?, void>(
       (ContactRecord? contact, _) => ContactPage(getIt.get<ContactViewModel>(param1: contact)));
@@ -671,8 +694,7 @@ Future setup({
     return NodeListViewModel(_nodeSource, appStore);
   });
 
-  getIt.registerFactory(
-      () => ConnectionSyncPage(getIt.get<NodeListViewModel>(), getIt.get<DashboardViewModel>()));
+  getIt.registerFactory(() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));
 
   getIt.registerFactory(
       () => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
@@ -706,13 +728,13 @@ Future setup({
       ));
 
   getIt.registerFactory(() => ExchangeViewModel(
-        getIt.get<AppStore>().wallet!,
-        _tradesSource,
-        getIt.get<ExchangeTemplateStore>(),
-        getIt.get<TradesStore>(),
-        getIt.get<AppStore>().settingsStore,
-        getIt.get<SharedPreferences>(),
-      ));
+      getIt.get<AppStore>().wallet!,
+      _tradesSource,
+      getIt.get<ExchangeTemplateStore>(),
+      getIt.get<TradesStore>(),
+      getIt.get<AppStore>().settingsStore,
+      getIt.get<SharedPreferences>(),
+      getIt.get<ContactListViewModel>()));
 
   getIt.registerFactory(() => ExchangeTradeViewModel(
       wallet: getIt.get<AppStore>().wallet!,
@@ -720,7 +742,8 @@ Future setup({
       tradesStore: getIt.get<TradesStore>(),
       sendViewModel: getIt.get<SendViewModel>()));
 
-  getIt.registerFactory(() => ExchangePage(getIt.get<ExchangeViewModel>()));
+  getIt.registerFactory(
+      () => ExchangePage(getIt.get<ExchangeViewModel>(), getIt.get<AuthService>()));
 
   getIt.registerFactory(() => ExchangeConfirmPage(tradesStore: getIt.get<TradesStore>()));
 
@@ -743,6 +766,8 @@ Future setup({
         return bitcoin!.createLitecoinWalletService(
             _walletInfoSource, _unspentCoinsInfoSource!,
             SettingsStoreBase.walletPasswordDirectInput);
+      case WalletType.ethereum:
+        return ethereum!.createEthereumWalletService(_walletInfoSource);
       default:
         throw Exception('Unexpected token: ${param1.toString()} for generating of WalletService');
     }
@@ -785,8 +810,8 @@ Future setup({
           transactionDetailsViewModel:
               getIt.get<TransactionDetailsViewModel>(param1: transactionInfo)));
 
-  getIt.registerFactoryParam<NewWalletTypePage, void Function(BuildContext, WalletType), void>(
-      (param1, _) => NewWalletTypePage(onTypeSelected: param1));
+  getIt.registerFactoryParam<NewWalletTypePage, void Function(BuildContext, WalletType), bool?>(
+      (param1, isCreate) => NewWalletTypePage(onTypeSelected: param1, isCreate: isCreate ?? true));
 
   getIt.registerFactoryParam<PreSeedPage, WalletType, void>(
       (WalletType type, _) => PreSeedPage(type));
@@ -899,10 +924,10 @@ Future setup({
   getIt.registerFactory<IoniaAnyPay>(() => IoniaAnyPay(
       getIt.get<IoniaService>(), getIt.get<AnyPayApi>(), getIt.get<AppStore>().wallet!));
 
-  getIt.registerFactory(()=> MarketPlaceViewModel(getIt.get<IoniaService>()));
-
   getIt.registerFactory(() => IoniaGiftCardsListViewModel(ioniaService: getIt.get<IoniaService>()));
 
+  getIt.registerFactory(() => MarketPlaceViewModel(getIt.get<IoniaService>()));
+
   getIt.registerFactory(() => IoniaAuthViewModel(ioniaService: getIt.get<IoniaService>()));
 
   getIt.registerFactoryParam<IoniaMerchPurchaseViewModel, double, IoniaMerchant>(
@@ -1094,5 +1119,21 @@ Future setup({
         instanceName: 'wallet_unlock_loadable'),
       instanceName: 'wallet_password_login');
 
+  getIt.registerFactoryParam<HomeSettingsPage, BalanceViewModel, void>((balanceViewModel, _) =>
+      HomeSettingsPage(getIt.get<HomeSettingsViewModel>(param1: balanceViewModel)));
+
+  getIt.registerFactoryParam<HomeSettingsViewModel, BalanceViewModel, void>(
+      (balanceViewModel, _) => HomeSettingsViewModel(getIt.get<SettingsStore>(), balanceViewModel));
+
+  getIt.registerFactoryParam<EditTokenPage, HomeSettingsViewModel, Map<String, dynamic>>(
+    (homeSettingsViewModel, arguments) => EditTokenPage(
+      homeSettingsViewModel: homeSettingsViewModel,
+      erc20token: arguments['token'] as Erc20Token?,
+      initialContractAddress: arguments['contractAddress'] as String?,
+    ),
+  );
+
+  getIt.registerFactory<ManageNodesPage>(() => ManageNodesPage(getIt.get<NodeListViewModel>()));
+
   _isSetupFinished = true;
 }

lib/entities/background_tasks.dart

@@ -0,0 +1,164 @@
+import 'dart:io';
+
+import 'package:cake_wallet/core/wallet_loading_service.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/view_model/settings/sync_mode.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:flutter/foundation.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:workmanager/workmanager.dart';
+import 'package:cake_wallet/main.dart';
+import 'package:cake_wallet/di.dart';
+
+const moneroSyncTaskKey = "com.fotolockr.cakewallet.monero_sync_task";
+
+@pragma('vm:entry-point')
+void callbackDispatcher() {
+  Workmanager().executeTask((task, inputData) async {
+    try {
+      switch (task) {
+        case moneroSyncTaskKey:
+
+          /// The work manager runs on a separate isolate from the main flutter isolate.
+          /// thus we initialize app configs first; hive, getIt, etc...
+          await initializeAppConfigs();
+
+          final walletLoadingService = getIt.get<WalletLoadingService>();
+
+          final node = getIt.get<SettingsStore>().getCurrentNode(WalletType.monero);
+
+          final typeRaw = getIt.get<SharedPreferences>().getInt(PreferencesKey.currentWalletType);
+
+          WalletBase? wallet;
+
+          if (inputData!['sync_all'] as bool) {
+            /// get all Monero wallets of the user and sync them
+            final List<WalletListItem> moneroWallets = getIt
+                .get<WalletListViewModel>()
+                .wallets
+                .where((element) => element.type == WalletType.monero)
+                .toList();
+
+            for (int i = 0; i < moneroWallets.length; i++) {
+              wallet = await walletLoadingService.load(WalletType.monero, moneroWallets[i].name);
+
+              await wallet.connectToNode(node: node);
+              await wallet.startSync();
+            }
+          } else {
+            /// if the user chose to sync only active wallet
+            /// if the current wallet is monero; sync it only
+            if (typeRaw == WalletType.monero.index) {
+              final name =
+                  getIt.get<SharedPreferences>().getString(PreferencesKey.currentWalletName);
+
+              wallet = await walletLoadingService.load(WalletType.monero, name!);
+
+              await wallet.connectToNode(node: node);
+              await wallet.startSync();
+            }
+          }
+
+          if (wallet?.syncStatus.progress() == null) {
+            return Future.error("No Monero wallet found");
+          }
+
+          for (int i = 0;; i++) {
+            await Future<void>.delayed(const Duration(seconds: 1));
+            if (wallet?.syncStatus.progress() == 1.0) {
+              break;
+            }
+            if (i > 600) {
+              return Future.error("Synchronization Timed out");
+            }
+          }
+          break;
+      }
+
+      return Future.value(true);
+    } catch (error, stackTrace) {
+      print(error);
+      print(stackTrace);
+      return Future.error(error);
+    }
+  });
+}
+
+class BackgroundTasks {
+  void registerSyncTask({bool changeExisting = false}) async {
+    try {
+      bool hasMonero = getIt
+          .get<WalletListViewModel>()
+          .wallets
+          .any((element) => element.type == WalletType.monero);
+
+      /// if its not android nor ios, or the user has no monero wallets; exit
+      if (!DeviceInfo.instance.isMobile || !hasMonero) {
+        return;
+      }
+
+      final settingsStore = getIt.get<SettingsStore>();
+
+      final SyncMode syncMode = settingsStore.currentSyncMode;
+      final bool syncAll = settingsStore.currentSyncAll;
+
+      if (syncMode.type == SyncType.disabled) {
+        cancelSyncTask();
+        return;
+      }
+
+      await Workmanager().initialize(
+        callbackDispatcher,
+        isInDebugMode: kDebugMode,
+      );
+
+      final inputData = <String, dynamic>{"sync_all": syncAll};
+      final constraints = Constraints(
+        networkType:
+            syncMode.type == SyncType.unobtrusive ? NetworkType.unmetered : NetworkType.connected,
+        requiresBatteryNotLow: syncMode.type == SyncType.unobtrusive,
+        requiresCharging: syncMode.type == SyncType.unobtrusive,
+        requiresDeviceIdle: syncMode.type == SyncType.unobtrusive,
+      );
+
+      if (Platform.isIOS) {
+        await Workmanager().registerOneOffTask(
+          moneroSyncTaskKey,
+          moneroSyncTaskKey,
+          initialDelay: syncMode.frequency,
+          existingWorkPolicy: ExistingWorkPolicy.replace,
+          inputData: inputData,
+          constraints: constraints,
+        );
+        return;
+      }
+
+      await Workmanager().registerPeriodicTask(
+        moneroSyncTaskKey,
+        moneroSyncTaskKey,
+        initialDelay: syncMode.frequency,
+        frequency: syncMode.frequency,
+        existingWorkPolicy: changeExisting ? ExistingWorkPolicy.replace : ExistingWorkPolicy.keep,
+        inputData: inputData,
+        constraints: constraints,
+      );
+    } catch (error, stackTrace) {
+      print(error);
+      print(stackTrace);
+    }
+  }
+
+  void cancelSyncTask() {
+    try {
+      Workmanager().cancelByUniqueName(moneroSyncTaskKey);
+    } catch (error, stackTrace) {
+      print(error);
+      print(stackTrace);
+    }
+  }
+}

lib/entities/cake_2fa_preset_options.dart

@@ -0,0 +1,35 @@
+import 'package:cw_core/enumerable_item.dart';
+
+class Cake2FAPresetsOptions extends EnumerableItem<int> with Serializable<int> {
+  const Cake2FAPresetsOptions({required String super.title, required int super.raw});
+
+  static const narrow = Cake2FAPresetsOptions(title: 'Narrow', raw: 0);
+  static const normal = Cake2FAPresetsOptions(title: 'Normal', raw: 1);
+  static const aggressive = Cake2FAPresetsOptions(title: 'Aggressive', raw: 2);
+
+  static Cake2FAPresetsOptions deserialize({required int raw}) {
+    switch (raw) {
+      case 0:
+        return Cake2FAPresetsOptions.narrow;
+      case 1:
+        return Cake2FAPresetsOptions.normal;
+      case 2:
+        return Cake2FAPresetsOptions.aggressive;
+      default:
+        throw Exception(
+          'Incorrect Cake 2FA Preset $raw  for Cake2FAPresetOptions deserialize',
+        );
+    }
+  }
+}
+
+enum VerboseControlSettings {
+  accessWallet,
+  addingContacts,
+  sendsToContacts,
+  sendsToNonContacts,
+  sendsToInternalWallets,
+  exchangesToInternalWallets,
+  securityAndBackupSettings,
+  creatingNewWallets,
+}

lib/entities/default_settings_migration.dart

@@ -26,6 +26,7 @@ const newCakeWalletMoneroUri = 'xmr-node.cakewallet.com:18081';
 const cakeWalletBitcoinElectrumUri = 'electrum.cakewallet.com:50002';
 const cakeWalletLitecoinElectrumUri = 'ltc-electrum.cakewallet.com:50002';
 const havenDefaultNodeUri = 'nodes.havenprotocol.org:443';
+const ethereumDefaultNodeUri = 'ethereum.publicnode.com';
 
 Future defaultSettingsMigration(
     {required int version,
@@ -157,6 +158,12 @@ Future defaultSettingsMigration(
         case 20:
           await migrateExchangeStatus(sharedPreferences);
           break;
+        case 21:
+          await addEthereumNodeList(nodes: nodes);
+          await changeEthereumCurrentNodeToDefault(
+              sharedPreferences: sharedPreferences, nodes: nodes);
+          break;
+
         default:
           break;
       }
@@ -242,6 +249,12 @@ Node? getHavenDefaultNode({required Box<Node> nodes}) {
           ?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.haven);
 }
 
+Node? getEthereumDefaultNode({required Box<Node> nodes}) {
+    return nodes.values.firstWhereOrNull(
+          (Node node) => node.uriRaw == ethereumDefaultNodeUri)
+          ?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.ethereum);
+}
+
 Node getMoneroDefaultNode({required Box<Node> nodes}) {
   final timeZone = DateTime.now().timeZoneOffset.inHours;
   var nodeUri = '';
@@ -438,6 +451,8 @@ Future<void> checkCurrentNodes(
       .getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
   final currentHavenNodeId = sharedPreferences
       .getInt(PreferencesKey.currentHavenNodeIdKey);
+  final currentEthereumNodeId = sharedPreferences
+      .getInt(PreferencesKey.currentEthereumNodeIdKey);
   final currentMoneroNode = nodeSource.values.firstWhereOrNull(
       (node) => node.key == currentMoneroNodeId);
   final currentBitcoinElectrumServer = nodeSource.values.firstWhereOrNull(
@@ -446,6 +461,8 @@ Future<void> checkCurrentNodes(
       (node) => node.key == currentLitecoinElectrumSeverId);
   final currentHavenNodeServer = nodeSource.values.firstWhereOrNull(
       (node) => node.key == currentHavenNodeId);
+  final currentEthereumNodeServer = nodeSource.values.firstWhereOrNull(
+      (node) => node.key == currentEthereumNodeId);
 
   if (currentMoneroNode == null) {
     final newCakeWalletNode =
@@ -479,6 +496,13 @@ Future<void> checkCurrentNodes(
     await sharedPreferences.setInt(
         PreferencesKey.currentHavenNodeIdKey, node.key as int);
   }
+
+  if (currentEthereumNodeServer == null) {
+    final node = Node(uri: ethereumDefaultNodeUri, type: WalletType.ethereum);
+    await nodeSource.add(node);
+    await sharedPreferences.setInt(
+        PreferencesKey.currentEthereumNodeIdKey, node.key as int);
+  }
 }
 
 Future<void> resetBitcoinElectrumServer(
@@ -522,8 +546,26 @@ Future<void> migrateExchangeStatus(SharedPreferences sharedPreferences) async {
     return;
   }
 
-  await sharedPreferences.setInt(PreferencesKey.exchangeStatusKey, isExchangeDisabled 
+  await sharedPreferences.setInt(PreferencesKey.exchangeStatusKey, isExchangeDisabled
       ? ExchangeApiMode.disabled.raw : ExchangeApiMode.enabled.raw);
-      
+
   await sharedPreferences.remove(PreferencesKey.disableExchangeKey);
 }
+
+Future<void> addEthereumNodeList({required Box<Node> nodes}) async {
+  final nodeList = await loadDefaultEthereumNodes();
+  for (var node in nodeList) {
+    if (nodes.values.firstWhereOrNull((element) => element.uriRaw == node.uriRaw) == null) {
+      await nodes.add(node);
+    }
+  }
+}
+
+Future<void> changeEthereumCurrentNodeToDefault(
+    {required SharedPreferences sharedPreferences,
+      required Box<Node> nodes}) async {
+  final node = getEthereumDefaultNode(nodes: nodes);
+  final nodeId = node?.key as int? ?? 0;
+
+  await sharedPreferences.setInt(PreferencesKey.currentEthereumNodeIdKey, nodeId);
+}

lib/entities/load_current_wallet.dart

@@ -1,8 +1,7 @@
 import 'package:cake_wallet/di.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/core/key_service.dart';
-import 'package:cw_core/wallet_service.dart';
+import 'package:cake_wallet/entities/background_tasks.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
@@ -27,4 +26,6 @@ Future<void> loadCurrentWallet({String? password}) async {
     name,
     password: password);
   appStore.changeCurrentWallet(wallet);
+
+  getIt.get<BackgroundTasks>().registerSyncTask();
 }

lib/entities/main_actions.dart

@@ -47,6 +47,7 @@ class MainActions {
       switch (walletType) {
         case WalletType.bitcoin:
         case WalletType.litecoin:
+        case WalletType.ethereum:
           if (viewModel.isEnabledBuyAction) {
             final uri = getIt.get<OnRamperBuyProvider>().requestUrl();
             if (DeviceInfo.instance.isMobile) {
@@ -120,6 +121,7 @@ class MainActions {
       switch (walletType) {
         case WalletType.bitcoin:
         case WalletType.litecoin:
+        case WalletType.ethereum:
           if (viewModel.isEnabledSellAction) {
             final moonPaySellProvider = MoonPaySellProvider();
             final uri = await moonPaySellProvider.requestUrl(

lib/entities/node_list.dart

@@ -70,6 +70,22 @@ Future<List<Node>> loadDefaultHavenNodes() async {
   return nodes;
 }
 
+Future<List<Node>> loadDefaultEthereumNodes() async {
+  final nodesRaw = await rootBundle.loadString('assets/ethereum_server_list.yml');
+  final loadedNodes = loadYaml(nodesRaw) as YamlList;
+  final nodes = <Node>[];
+
+  for (final raw in loadedNodes) {
+    if (raw is Map) {
+      final node = Node.fromMap(Map<String, Object>.from(raw));
+      node.type = WalletType.ethereum;
+      nodes.add(node);
+    }
+  }
+
+  return nodes;
+}
+
 Future resetToDefault(Box<Node> nodeSource) async {
   final moneroNodes = await loadDefaultNodes();
   final bitcoinElectrumServerList = await loadBitcoinElectrumServerList();

lib/entities/openalias_record.dart

@@ -37,7 +37,7 @@ class OpenaliasRecord {
     required String ticker,
     required List<RRecord> txtRecord,
   })  {
-    String address = formattedName;
+    String address = '';
     String name = formattedName;
     String note = '';
 

lib/entities/parsed_address.dart

@@ -1,7 +1,7 @@
 import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/yat_record.dart';
 
-enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed, twitter }
+enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed, twitter, contact }
 
 class ParsedAddress {
   ParsedAddress({
@@ -40,13 +40,17 @@ class ParsedAddress {
       );
   }
 
-  factory ParsedAddress.fetchOpenAliasAddress({required OpenaliasRecord record, required String name}){
-      return ParsedAddress(
-        addresses: [record.address],
-        name: record.name,
-        description: record.description,
-        parseFrom: ParseFrom.openAlias,
-      );
+  factory ParsedAddress.fetchOpenAliasAddress(
+      {required OpenaliasRecord record, required String name}) {
+    if (record.address.isEmpty) {
+      return ParsedAddress(addresses: [name]);
+    }
+    return ParsedAddress(
+      addresses: [record.address],
+      name: record.name,
+      description: record.description,
+      parseFrom: ParseFrom.openAlias,
+    );
   }
 
   factory ParsedAddress.fetchFioAddress({required String address, required String name}){
@@ -65,6 +69,14 @@ class ParsedAddress {
     );
   }
 
+  factory ParsedAddress.fetchContactAddress({required String address, required String name}){
+    return ParsedAddress(
+      addresses: [address],
+      name: name,
+      parseFrom: ParseFrom.contact,
+    );
+  }
+
   final List<String> addresses;
   final String name;
   final String description;

lib/entities/preferences_key.dart

@@ -5,6 +5,7 @@ class PreferencesKey {
   static const currentBitcoinElectrumSererIdKey = 'current_node_id_btc';
   static const currentLitecoinElectrumSererIdKey = 'current_node_id_ltc';
   static const currentHavenNodeIdKey = 'current_node_id_xhv';
+  static const currentEthereumNodeIdKey = 'current_node_id_eth';
   static const currentFiatCurrencyKey = 'current_fiat_currency';
   static const currentTransactionPriorityKeyLegacy = 'current_fee_priority';
   static const currentBalanceDisplayModeKey = 'current_balance_display_mode';
@@ -31,23 +32,45 @@ class PreferencesKey {
   static const bitcoinTransactionPriority = 'current_fee_priority_bitcoin';
   static const havenTransactionPriority = 'current_fee_priority_haven';
   static const litecoinTransactionPriority = 'current_fee_priority_litecoin';
+  static const ethereumTransactionPriority = 'current_fee_priority_ethereum';
   static const shouldShowReceiveWarning = 'should_show_receive_warning';
   static const shouldShowYatPopup = 'should_show_yat_popup';
   static const moneroWalletPasswordUpdateV1Base = 'monero_wallet_update_v1';
+  static const syncModeKey = 'sync_mode';
+  static const syncAllKey = 'sync_all';
   static const pinTimeOutDuration = 'pin_timeout_duration';
   static const lastAuthTimeMilliseconds = 'last_auth_time_milliseconds';
   static const lastPopupDate = 'last_popup_date';
   static const lastAppReviewDate = 'last_app_review_date';
+  static const sortBalanceBy = 'sort_balance_by';
+  static const pinNativeTokenAtTop = 'pin_native_token_at_top';
+  static const useEtherscan = 'use_etherscan';
 
-
-
-  static String moneroWalletUpdateV1Key(String name)
-    => '${PreferencesKey.moneroWalletPasswordUpdateV1Base}_${name}';
+  static String moneroWalletUpdateV1Key(String name) =>
+      '${PreferencesKey.moneroWalletPasswordUpdateV1Base}_${name}';
 
   static const exchangeProvidersSelection = 'exchange-providers-selection';
-  static const clearnetDonationLink = 'clearnet_donation_link'; 
+  static const clearnetDonationLink = 'clearnet_donation_link';
   static const onionDonationLink = 'onion_donation_link';
   static const lastSeenAppVersion = 'last_seen_app_version';
-  static const shouldShowMarketPlaceInDashboard = 'should_show_marketplace_in_dashboard';
+  static const shouldShowMarketPlaceInDashboard =
+      'should_show_marketplace_in_dashboard';
   static const isNewInstall = 'is_new_install';
+  static const shouldRequireTOTP2FAForAccessingWallet =
+      'should_require_totp_2fa_for_accessing_wallets';
+  static const shouldRequireTOTP2FAForSendsToContact =
+      'should_require_totp_2fa_for_sends_to_contact';
+  static const shouldRequireTOTP2FAForSendsToNonContact =
+      'should_require_totp_2fa_for_sends_to_non_contact';
+  static const shouldRequireTOTP2FAForSendsToInternalWallets =
+      'should_require_totp_2fa_for_sends_to_internal_wallets';
+  static const shouldRequireTOTP2FAForExchangesToInternalWallets =
+      'should_require_totp_2fa_for_exchanges_to_internal_wallets';
+  static const shouldRequireTOTP2FAForAddingContacts =
+      'should_require_totp_2fa_for_adding_contacts';
+  static const shouldRequireTOTP2FAForCreatingNewWallets =
+      'should_require_totp_2fa_for_creating_new_wallets';
+  static const shouldRequireTOTP2FAForAllSecurityAndBackupSettings =
+      'should_require_totp_2fa_for_all_security_and_backup_settings';
+  static const selectedCake2FAPreset = 'selected_cake_2fa_preset';
 }

lib/entities/priority_for_wallet_type.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/haven/haven.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cw_core/transaction_priority.dart';
@@ -14,6 +15,8 @@ List<TransactionPriority> priorityForWalletType(WalletType type) {
       return bitcoin!.getLitecoinTransactionPriorities();
     case WalletType.haven:
       return haven!.getTransactionPriorities();
+    case WalletType.ethereum:
+      return ethereum!.getTransactionPriorities();
     default:
       return [];
   }

lib/entities/sort_balance_types.dart

@@ -0,0 +1,19 @@
+import 'package:cake_wallet/generated/i18n.dart';
+
+enum SortBalanceBy {
+  FiatBalance,
+  GrossBalance,
+  Alphabetical;
+
+  @override
+  String toString() {
+    switch (this) {
+      case SortBalanceBy.FiatBalance:
+        return S.current.fiat_balance;
+      case SortBalanceBy.GrossBalance:
+        return S.current.gross_balance;
+      case SortBalanceBy.Alphabetical:
+        return S.current.alphabetical;
+    }
+  }
+}

lib/entities/template.dart

@@ -4,14 +4,15 @@ part 'template.g.dart';
 
 @HiveType(typeId: Template.typeId)
 class Template extends HiveObject {
-  Template({
-    required this.nameRaw,
-    required this.isCurrencySelectedRaw,
-    required this.addressRaw,
-    required this.cryptoCurrencyRaw,
-    required this.amountRaw,
-    required this.fiatCurrencyRaw,
-    required this.amountFiatRaw});
+  Template(
+      {required this.nameRaw,
+      required this.isCurrencySelectedRaw,
+      required this.addressRaw,
+      required this.cryptoCurrencyRaw,
+      required this.amountRaw,
+      required this.fiatCurrencyRaw,
+      required this.amountFiatRaw,
+      this.additionalRecipientsRaw});
 
   static const typeId = 6;
   static const boxName = 'Template';
@@ -37,6 +38,9 @@ class Template extends HiveObject {
   @HiveField(6)
   String? amountFiatRaw;
 
+  @HiveField(7)
+  List<Template>? additionalRecipientsRaw;
+
   bool get isCurrencySelected => isCurrencySelectedRaw ?? false;
 
   String get fiatCurrency => fiatCurrencyRaw ?? '';
@@ -50,5 +54,6 @@ class Template extends HiveObject {
   String get cryptoCurrency => cryptoCurrencyRaw ?? '';
 
   String get amount => amountRaw ?? '';
-}
 
+  List<Template>? get additionalRecipients => additionalRecipientsRaw;
+}

lib/ethereum/cw_ethereum.dart

@@ -0,0 +1,126 @@
+part of 'ethereum.dart';
+
+class CWEthereum extends Ethereum {
+  @override
+  List<String> getEthereumWordList(String language) => EthereumMnemonics.englishWordlist;
+
+  WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource) =>
+      EthereumWalletService(walletInfoSource);
+
+  @override
+  WalletCredentials createEthereumNewWalletCredentials({
+    required String name,
+    WalletInfo? walletInfo,
+  }) =>
+      EthereumNewWalletCredentials(name: name, walletInfo: walletInfo);
+
+  @override
+  WalletCredentials createEthereumRestoreWalletFromSeedCredentials({
+    required String name,
+    required String mnemonic,
+    required String password,
+  }) =>
+      EthereumRestoreWalletFromSeedCredentials(name: name, password: password, mnemonic: mnemonic);
+
+  @override
+  String getAddress(WalletBase wallet) => (wallet as EthereumWallet).walletAddresses.address;
+
+  @override
+  TransactionPriority getDefaultTransactionPriority() => EthereumTransactionPriority.medium;
+
+  @override
+  List<TransactionPriority> getTransactionPriorities() => EthereumTransactionPriority.all;
+
+  @override
+  TransactionPriority deserializeEthereumTransactionPriority(int raw) =>
+      EthereumTransactionPriority.deserialize(raw: raw);
+
+  Object createEthereumTransactionCredentials(
+    List<Output> outputs, {
+    required TransactionPriority priority,
+    required CryptoCurrency currency,
+    int? feeRate,
+  }) =>
+      EthereumTransactionCredentials(
+        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 EthereumTransactionPriority,
+        currency: currency,
+        feeRate: feeRate,
+      );
+
+  Object createEthereumTransactionCredentialsRaw(
+    List<OutputInfo> outputs, {
+    TransactionPriority? priority,
+    required CryptoCurrency currency,
+    required int feeRate,
+  }) =>
+      EthereumTransactionCredentials(
+        outputs,
+        priority: priority as EthereumTransactionPriority?,
+        currency: currency,
+        feeRate: feeRate,
+      );
+
+  @override
+  int formatterEthereumParseAmount(String amount) => EthereumFormatter.parseEthereumAmount(amount);
+
+  @override
+  double formatterEthereumAmountToDouble(
+      {TransactionInfo? transaction, BigInt? amount, int exponent = 18}) {
+    assert(transaction != null || amount != null);
+
+    if (transaction != null) {
+      transaction as EthereumTransactionInfo;
+      return transaction.ethAmount / BigInt.from(10).pow(transaction.exponent);
+    } else {
+      return (amount!) / BigInt.from(10).pow(exponent);
+    }
+  }
+
+  @override
+  List<Erc20Token> getERC20Currencies(WalletBase wallet) {
+    final ethereumWallet = wallet as EthereumWallet;
+    return ethereumWallet.erc20Currencies;
+  }
+
+  @override
+  Future<void> addErc20Token(WalletBase wallet, Erc20Token token) async =>
+      await (wallet as EthereumWallet).addErc20Token(token);
+
+  @override
+  Future<void> deleteErc20Token(WalletBase wallet, Erc20Token token) async =>
+      await (wallet as EthereumWallet).deleteErc20Token(token);
+
+  @override
+  Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) async {
+    final ethereumWallet = wallet as EthereumWallet;
+    return await ethereumWallet.getErc20Token(contractAddress);
+  }
+
+  @override
+  CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction) {
+    transaction as EthereumTransactionInfo;
+    if (transaction.tokenSymbol == CryptoCurrency.eth.title) {
+      return CryptoCurrency.eth;
+    }
+
+    wallet as EthereumWallet;
+    return wallet.erc20Currencies
+        .firstWhere((element) => transaction.tokenSymbol == element.symbol);
+  }
+
+  @override
+  void updateEtherscanUsageState(WalletBase wallet, bool isEnabled) {
+    (wallet as EthereumWallet).updateEtherscanUsageState(isEnabled);
+  }
+}

lib/main.dart

@@ -58,54 +58,64 @@ Future<void> main() async {
 
       return true;
     };
-    setRootDirFromEnv();
-    final appDir = await getAppDir();
     await Hive.close();
-    Hive.init(appDir.path);
 
-    if (!Hive.isAdapterRegistered(Contact.typeId)) {
-      Hive.registerAdapter(ContactAdapter());
-    }
+    await initializeAppConfigs();
 
-    if (!Hive.isAdapterRegistered(Node.typeId)) {
-      Hive.registerAdapter(NodeAdapter());
-    }
+    runApp(App());
+  }, (error, stackTrace) async {
+    ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stackTrace));
+  });
+}
 
-    if (!Hive.isAdapterRegistered(TransactionDescription.typeId)) {
-      Hive.registerAdapter(TransactionDescriptionAdapter());
-    }
+Future<void> initializeAppConfigs() async {
+  setRootDirFromEnv();
+  final appDir = await getAppDir();
+  Hive.init(appDir.path);
 
-    if (!Hive.isAdapterRegistered(Trade.typeId)) {
-      Hive.registerAdapter(TradeAdapter());
-    }
+  if (!Hive.isAdapterRegistered(Contact.typeId)) {
+    Hive.registerAdapter(ContactAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {
-      Hive.registerAdapter(WalletInfoAdapter());
-    }
+  if (!Hive.isAdapterRegistered(Node.typeId)) {
+    Hive.registerAdapter(NodeAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(walletTypeTypeId)) {
-      Hive.registerAdapter(WalletTypeAdapter());
-    }
+  if (!Hive.isAdapterRegistered(TransactionDescription.typeId)) {
+    Hive.registerAdapter(TransactionDescriptionAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(Template.typeId)) {
-      Hive.registerAdapter(TemplateAdapter());
-    }
+  if (!Hive.isAdapterRegistered(Trade.typeId)) {
+    Hive.registerAdapter(TradeAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(ExchangeTemplate.typeId)) {
-      Hive.registerAdapter(ExchangeTemplateAdapter());
-    }
+  if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {
+    Hive.registerAdapter(WalletInfoAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(Order.typeId)) {
-      Hive.registerAdapter(OrderAdapter());
-    }
+  if (!Hive.isAdapterRegistered(walletTypeTypeId)) {
+    Hive.registerAdapter(WalletTypeAdapter());
+  }
 
-    if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
-      Hive.registerAdapter(UnspentCoinsInfoAdapter());
-    }
+  if (!Hive.isAdapterRegistered(Template.typeId)) {
+    Hive.registerAdapter(TemplateAdapter());
+  }
 
-    if (!Hive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {
-      Hive.registerAdapter(AnonpayInvoiceInfoAdapter());
-    }
+  if (!Hive.isAdapterRegistered(ExchangeTemplate.typeId)) {
+    Hive.registerAdapter(ExchangeTemplateAdapter());
+  }
+
+  if (!Hive.isAdapterRegistered(Order.typeId)) {
+    Hive.registerAdapter(OrderAdapter());
+  }
+
+  if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
+    Hive.registerAdapter(UnspentCoinsInfoAdapter());
+  }
+
+  if (!Hive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {
+    Hive.registerAdapter(AnonpayInvoiceInfoAdapter());
+  }
 
     final secureStorage = secureStorageShared;
     final transactionDescriptionsBoxKey =
@@ -125,30 +135,26 @@ Future<void> main() async {
     final anonpayInvoiceInfo = await Hive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);
     Box<UnspentCoinsInfo>? unspentCoinsInfoSource;
 
-    if (!isMoneroOnly) {
-      unspentCoinsInfoSource = await Hive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);
-    }
+  if (!isMoneroOnly) {
+    unspentCoinsInfoSource = await Hive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);
+  }
 
-    await initialSetup(
-        sharedPreferences: await SharedPreferences.getInstance(),
-        nodes: nodes,
-        walletInfoSource: walletInfoSource,
-        contactSource: contacts,
-        tradesSource: trades,
-        ordersSource: orders,
-        unspentCoinsInfoSource: unspentCoinsInfoSource,
-        // fiatConvertationService: fiatConvertationService,
-        templates: templates,
-        exchangeTemplates: exchangeTemplates,
-        transactionDescriptions: transactionDescriptions,
-        secureStorage: secureStorage,
-        anonpayInvoiceInfo: anonpayInvoiceInfo,
-        initialMigrationVersion: 19);
-    runApp(App());
-  }, (error, stackTrace) async {
-    ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stackTrace));
-  });
-}
+  await initialSetup(
+      sharedPreferences: await SharedPreferences.getInstance(),
+      nodes: nodes,
+      walletInfoSource: walletInfoSource,
+      contactSource: contacts,
+      tradesSource: trades,
+      ordersSource: orders,
+      unspentCoinsInfoSource: unspentCoinsInfoSource,
+      // fiatConvertationService: fiatConvertationService,
+      templates: templates,
+      exchangeTemplates: exchangeTemplates,
+      transactionDescriptions: transactionDescriptions,
+      secureStorage: secureStorage,
+      anonpayInvoiceInfo: anonpayInvoiceInfo,
+      initialMigrationVersion: 21);
+  }
 
 Future<void> initialSetup(
     {required SharedPreferences sharedPreferences,

lib/reactions/fiat_rate_update.dart

@@ -2,10 +2,12 @@ import 'dart:async';
 import 'package:cake_wallet/core/fiat_conversion_service.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/update_haven_rate.dart';
+import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:mobx/mobx.dart';
 
 Timer? _timer;
 
@@ -15,7 +17,7 @@ Future<void> startFiatRateUpdate(
     return;
   }
 
-  _timer = Timer.periodic(Duration(seconds: 30), (_) async {
+  final _updateFiat = (_) async {
     try {
       if (appStore.wallet == null || settingsStore.fiatApiMode == FiatApiMode.disabled) {
         return;
@@ -30,8 +32,37 @@ Future<void> startFiatRateUpdate(
                 fiat: settingsStore.fiatCurrency,
                 torOnly: settingsStore.fiatApiMode == FiatApiMode.torOnly);
       }
+
+      if (appStore.wallet!.type == WalletType.ethereum) {
+        final currencies =
+                ethereum!.getERC20Currencies(appStore.wallet!).where((element) => element.enabled);
+
+        for (final currency in currencies) {
+          () async {
+            fiatConversionStore.prices[currency] = await FiatConversionService.fetchPrice(
+                crypto: currency,
+                fiat: settingsStore.fiatCurrency,
+                torOnly: settingsStore.fiatApiMode == FiatApiMode.torOnly);
+          }.call();
+        }
+      }
     } catch (e) {
       print(e);
     }
+  };
+
+  _timer = Timer.periodic(Duration(seconds: 30), _updateFiat);
+  // also run immediately:
+  _updateFiat(null);
+
+  // setup autorun to listen to changes in fiatApiMode
+  autorun((_) {
+    // restart the timer if fiatApiMode was re-enabled
+    if (settingsStore.fiatApiMode != FiatApiMode.disabled) {
+      _timer = Timer.periodic(Duration(seconds: 30), _updateFiat);
+      _updateFiat(null);
+    } else {
+      _timer?.cancel();
+    }
   });
 }

lib/reactions/on_current_wallet_change.dart

@@ -1,6 +1,6 @@
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
-import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/update_haven_rate.dart';
+import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/transaction_info.dart';
@@ -97,6 +97,20 @@ void startCurrentWalletChangeReaction(AppStore appStore,
               crypto: wallet.currency,
               fiat: settingsStore.fiatCurrency,
               torOnly: settingsStore.fiatApiMode == FiatApiMode.torOnly);
+
+      if (wallet.type == WalletType.ethereum) {
+        final currencies =
+                ethereum!.getERC20Currencies(appStore.wallet!).where((element) => element.enabled);
+
+        for (final currency in currencies) {
+          () async {
+            fiatConversionStore.prices[currency] = await FiatConversionService.fetchPrice(
+                crypto: currency,
+                fiat: settingsStore.fiatCurrency,
+                torOnly: settingsStore.fiatApiMode == FiatApiMode.torOnly);
+          }.call();
+        }
+      }
     } catch (e) {
       print(e.toString());
     }

lib/router.dart

@@ -10,6 +10,8 @@ import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
 import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
 import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/edit_token_page.dart';
+import 'package:cake_wallet/src/screens/dashboard/home_settings_page.dart';
 import 'package:cake_wallet/src/screens/restore/sweeping_wallet_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_invoice_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_receive_page.dart';
@@ -17,6 +19,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_dashbo
 import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
 import 'package:cake_wallet/src/screens/settings/desktop_settings/desktop_settings_page.dart';
 import 'package:cake_wallet/src/screens/settings/display_settings_page.dart';
+import 'package:cake_wallet/src/screens/settings/manage_nodes_page.dart';
 import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
 import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
 import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
@@ -342,7 +345,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(
           fullscreenDialog: true,
           builder: (_) => getIt.get<SecurityBackupPage>());
-    
+
      case Routes.privacyPage:
       return CupertinoPageRoute<void>(
           fullscreenDialog: true,
@@ -357,7 +360,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(
           fullscreenDialog: true,
           builder: (_) => getIt.get<OtherSettingsPage>());
-    
+
     case Routes.newNode:
       final args = settings.arguments as Map<String, dynamic>?;
       return CupertinoPageRoute<void>(
@@ -504,7 +507,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
         fullscreenDialog: true,
         builder: (_) => getIt.get<IoniaWelcomePage>(),
       );
-    
+
     case Routes.ioniaLoginPage:
       return CupertinoPageRoute<void>( builder: (_) => getIt.get<IoniaLoginPage>());
 
@@ -517,7 +520,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.ioniaBuyGiftCardPage:
       final args = settings.arguments as List;
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaBuyGiftCardPage>(param1: args));
-    
+
     case Routes.ioniaBuyGiftCardDetailPage:
       final args = settings.arguments as List;
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaBuyGiftCardDetailPage>(param1: args));
@@ -534,7 +537,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.ioniaAccountPage:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaAccountPage>());
-    
+
     case Routes.ioniaAccountCardsPage:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaAccountCardsPage>());
 
@@ -545,11 +548,11 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.ioniaGiftCardDetailPage:
       final args = settings.arguments as List;
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaGiftCardDetailPage>(param1: args.first));
-    
+
     case Routes.ioniaCustomRedeemPage:
       final args = settings.arguments as List;
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaCustomRedeemPage>(param1: args));
- 
+
     case Routes.ioniaMoreOptionsPage:
       final args = settings.arguments as List;
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaMoreOptionsPage>(param1: args));
@@ -622,6 +625,28 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.modify2FAPage:
       return MaterialPageRoute<void>(builder: (_) => getIt.get<Modify2FAPage>());
 
+    case Routes.homeSettings:
+      return CupertinoPageRoute<void>(
+        builder: (_) => getIt.get<HomeSettingsPage>(param1: settings.arguments),
+      );
+
+    case Routes.editToken:
+      final args = settings.arguments as Map<String, dynamic>;
+
+      return CupertinoPageRoute<void>(
+        settings: RouteSettings(name: Routes.editToken),
+        builder: (_) => getIt.get<EditTokenPage>(
+          param1: args['homeSettingsViewModel'],
+          param2: {
+            'token': args['token'],
+            'contractAddress': args['contractAddress'],
+          },
+        ),
+      );
+
+    case Routes.manageNodes:
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<ManageNodesPage>());
+
     default:
       return MaterialPageRoute<void>(
           builder: (_) => Scaffold(

lib/routes.dart

@@ -91,4 +91,7 @@ class Routes {
   static const setup_2faQRPage = '/setup_2fa_qr_page';
   static const totpAuthCodePage = '/totp_auth_code_page';
   static const modify2FAPage = '/modify_2fa_page';
+  static const homeSettings = '/home_settings';
+  static const editToken = '/edit_token';
+  static const manageNodes = '/manage_nodes';
 }

lib/src/screens/backup/backup_page.dart

@@ -1,21 +1,22 @@
 import 'dart:io';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/trail_button.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/utils/clipboard_util.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cake_wallet/utils/share_util.dart';
+import 'package:cake_wallet/utils/show_bar.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/backup_view_model.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/utils/show_bar.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/widgets/trail_button.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/backup_view_model.dart';
-import 'package:cake_wallet/core/execution_state.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class BackupPage extends BasePage {
@@ -52,7 +53,7 @@ class BackupPage extends BasePage {
                       child: Observer(
                           builder: (_) => GestureDetector(
                                 onTap: () {
-                                  Clipboard.setData(
+                                  ClipboardUtil.setSensitiveDataToClipboard(
                                       ClipboardData(text: backupViewModelBase.backupPassword));
                                   showBar<void>(
                                       context,
@@ -75,15 +76,14 @@ class BackupPage extends BasePage {
                 ]))),
         Positioned(
           child: Observer(
-              builder: (_) => LoadingPrimaryButton(
-                  isLoading: backupViewModelBase.state is IsExecutingState,
-                  onPressed: () => onExportBackup(context),
-                  text: S.of(context).export_backup,
-                  color: Theme.of(context)
-                      .accentTextTheme!
-                      .bodyLarge!
-                      .color!,
-                  textColor: Colors.white)),
+            builder: (_) => LoadingPrimaryButton(
+              isLoading: backupViewModelBase.state is IsExecutingState,
+              onPressed: () => onExportBackup(context),
+              text: S.of(context).export_backup,
+              color: Theme.of(context).accentTextTheme.bodyLarge!.color!,
+              textColor: Colors.white,
+            ),
+          ),
           bottom: 24,
           left: 24,
           right: 24,

lib/src/screens/contact/contact_list_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
@@ -15,9 +16,10 @@ import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart
 import 'package:cake_wallet/src/widgets/collapsible_standart_list.dart';
 
 class ContactListPage extends BasePage {
-  ContactListPage(this.contactListViewModel);
+  ContactListPage(this.contactListViewModel, this.authService);
 
   final ContactListViewModel contactListViewModel;
+  final AuthService authService;
 
   @override
   String get title => S.current.address_book;
@@ -26,95 +28,99 @@ class ContactListPage extends BasePage {
   Widget? trailing(BuildContext context) {
     return MergeSemantics(
       child: Container(
-          width: 32.0,
-          height: 32.0,
-          decoration: BoxDecoration(
-              shape: BoxShape.circle,
-              color: Theme.of(context)
-                .accentTextTheme!
-                .bodySmall!
-                .color!),
-          child: Stack(
-            alignment: Alignment.center,
-            children: <Widget>[
-              Icon(Icons.add,
-                  color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
-                  size: 22.0),
-              ButtonTheme(
-                minWidth: 32.0,
-                height: 32.0,
-                child: Semantics(
-                  label: S.of(context).add,
-                  child: TextButton(
-                      // FIX-ME: Style
-                      //shape: CircleBorder(),
-                      onPressed: () async {
-                        await Navigator.of(context)
-                            .pushNamed(Routes.addressBookAddContact);
-                      },
-                      child: Offstage()),
-                ),
-              )
-            ],
-          )),
+        width: 32.0,
+        height: 32.0,
+        decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            color: Theme.of(context).accentTextTheme!.bodySmall!.color!),
+        child: Stack(
+          alignment: Alignment.center,
+          children: <Widget>[
+            Icon(
+              Icons.add,
+              color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+              size: 22.0,
+            ),
+            ButtonTheme(
+              minWidth: 32.0,
+              height: 32.0,
+              child: TextButton(
+                  // FIX-ME: Style
+                  //shape: CircleBorder(),
+                  onPressed: () async {
+                    if (contactListViewModel
+                        .shouldRequireTOTP2FAForAddingContacts) {
+                      authService.authenticateAction(
+                        context,
+                        route: Routes.addressBookAddContact,
+                        conditionToDetermineIfToUse2FA: contactListViewModel
+                            .shouldRequireTOTP2FAForAddingContacts,
+                      );
+                    } else {
+                      await Navigator.of(context)
+                          .pushNamed(Routes.addressBookAddContact);
+                    }
+                  },
+                  child: Offstage()),
+            )
+          ],
+        ),
+      ),
     );
   }
 
   @override
   Widget body(BuildContext context) {
-
     return Container(
         padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
-        child: Observer(
-        builder: (_) {
+        child: Observer(builder: (_) {
           final contacts = contactListViewModel.contactsToShow;
           final walletContacts = contactListViewModel.walletContactsToShow;
           return CollapsibleSectionList(
-              context: context,
-              sectionCount: 2,
-              themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
-              dividerThemeColor:
-              Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!,
-              sectionTitleBuilder: (_, int sectionIndex) {
-                var title = S.current.contact_list_contacts;
+            context: context,
+            sectionCount: 2,
+            themeColor: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+            dividerThemeColor:
+                Theme.of(context).primaryTextTheme.bodySmall!.decorationColor!,
+            sectionTitleBuilder: (_, int sectionIndex) {
+              var title = S.current.contact_list_contacts;
 
-                if (sectionIndex == 0) {
-                  title = S.current.contact_list_wallets;
-                }
+              if (sectionIndex == 0) {
+                title = S.current.contact_list_wallets;
+              }
 
-                return Container(
-                    padding: EdgeInsets.only(bottom: 10),
-                    child: Text(title, style: TextStyle(fontSize: 36)));
-              },
-              itemCounter: (int sectionIndex) => sectionIndex == 0
-                  ? walletContacts.length
-                  : contacts.length,
-              itemBuilder: (_, sectionIndex, index) {
-                if (sectionIndex == 0) {
-                  final walletInfo = walletContacts[index];
-                  return generateRaw(context, walletInfo);
-                }
+              return Container(
+                  padding: EdgeInsets.only(bottom: 10),
+                  child: Text(title, style: TextStyle(fontSize: 36)));
+            },
+            itemCounter: (int sectionIndex) =>
+                sectionIndex == 0 ? walletContacts.length : contacts.length,
+            itemBuilder: (_, sectionIndex, index) {
+              if (sectionIndex == 0) {
+                final walletInfo = walletContacts[index];
+                return generateRaw(context, walletInfo);
+              }
 
-                final contact = contacts[index];
-                final content = generateRaw(context, contact);
-                return contactListViewModel.isEditable
-                    ? Slidable(
-                        key: Key('${contact.key}'),
-                        endActionPane: _actionPane(context, contact),
-                        child: content,
-                      )
-                    : content;
-              },
-            );})
-       );
+              final contact = contacts[index];
+              final content = generateRaw(context, contact);
+              return contactListViewModel.isEditable
+                  ? Slidable(
+                      key: Key('${contact.key}'),
+                      endActionPane: _actionPane(context, contact),
+                      child: content,
+                    )
+                  : content;
+            },
+          );
+        }));
   }
 
   Widget generateRaw(BuildContext context, ContactBase contact) {
     final image = contact.type.iconPath;
-    final currencyIcon = image != null ? Image.asset(image, height: 24, width: 24)
+    final currencyIcon = image != null
+        ? Image.asset(image, height: 24, width: 24)
         : const SizedBox(height: 24, width: 24);
 
-
     return GestureDetector(
       onTap: () async {
         if (!contactListViewModel.isEditable) {
@@ -128,30 +134,28 @@ class ContactListPage extends BasePage {
         if (isCopied) {
           await Clipboard.setData(ClipboardData(text: contact.address));
           await showBar<void>(context, S.of(context).copied_to_clipboard);
-         
         }
       },
       child: Container(
         color: Colors.transparent,
-        padding:
-            const EdgeInsets.only(top: 16, bottom: 16, right: 24),
+        padding: const EdgeInsets.only(top: 16, bottom: 16, right: 24),
         child: Row(
           mainAxisSize: MainAxisSize.min,
           mainAxisAlignment: MainAxisAlignment.start,
           children: <Widget>[
             currencyIcon,
             Expanded(
-              child: Padding(
-                padding: EdgeInsets.only(left: 12),
-                child: Text(
-                  contact.name,
-                  style: TextStyle(
-                      fontSize: 14,
-                      fontWeight: FontWeight.normal,
-                      color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
+                child: Padding(
+              padding: EdgeInsets.only(left: 12),
+              child: Text(
+                contact.name,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.normal,
+                  color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
                 ),
-              )
-            )
+              ),
+            ))
           ],
         ),
       ),
@@ -160,60 +164,61 @@ class ContactListPage extends BasePage {
 
   Future<bool> showAlertDialog(BuildContext context) async {
     return await showPopUp<bool>(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertWithTwoActions(
-              alertTitle: S.of(context).address_remove_contact,
-              alertContent: S.of(context).address_remove_content,
-              rightButtonText: S.of(context).remove,
-              leftButtonText: S.of(context).cancel,
-              actionRightButton: () => Navigator.of(context).pop(true),
-              actionLeftButton: () => Navigator.of(context).pop(false));
-        }) ?? false;
+            context: context,
+            builder: (BuildContext context) {
+              return AlertWithTwoActions(
+                  alertTitle: S.of(context).address_remove_contact,
+                  alertContent: S.of(context).address_remove_content,
+                  rightButtonText: S.of(context).remove,
+                  leftButtonText: S.of(context).cancel,
+                  actionRightButton: () => Navigator.of(context).pop(true),
+                  actionLeftButton: () => Navigator.of(context).pop(false));
+            }) ??
+        false;
   }
 
   Future<bool> showNameAndAddressDialog(
       BuildContext context, String name, String address) async {
     return await showPopUp<bool>(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertWithTwoActions(
-              alertTitle: name,
-              alertContent: address,
-              rightButtonText: S.of(context).copy,
-              leftButtonText: S.of(context).cancel,
-              actionRightButton: () => Navigator.of(context).pop(true),
-              actionLeftButton: () => Navigator.of(context).pop(false));
-        }) ?? false;
+            context: context,
+            builder: (BuildContext context) {
+              return AlertWithTwoActions(
+                  alertTitle: name,
+                  alertContent: address,
+                  rightButtonText: S.of(context).copy,
+                  leftButtonText: S.of(context).cancel,
+                  actionRightButton: () => Navigator.of(context).pop(true),
+                  actionLeftButton: () => Navigator.of(context).pop(false));
+            }) ??
+        false;
   }
 
-  ActionPane _actionPane(BuildContext context, ContactRecord contact) => ActionPane(
-    motion: const ScrollMotion(),
-    extentRatio: 0.4,
-    children: [
-      SlidableAction(
-        onPressed: (_) async => await Navigator.of(context)
-            .pushNamed(Routes.addressBookAddContact,
-            arguments: contact),
-        backgroundColor: Colors.blue,
-        foregroundColor: Colors.white,
-        icon: Icons.edit,
-        label: S.of(context).edit,
-      ),
-      SlidableAction(
-        onPressed: (_) async {
-          final isDelete =
-              await showAlertDialog(context);
+  ActionPane _actionPane(BuildContext context, ContactRecord contact) =>
+      ActionPane(
+        motion: const ScrollMotion(),
+        extentRatio: 0.4,
+        children: [
+          SlidableAction(
+            onPressed: (_) async => await Navigator.of(context)
+                .pushNamed(Routes.addressBookAddContact, arguments: contact),
+            backgroundColor: Colors.blue,
+            foregroundColor: Colors.white,
+            icon: Icons.edit,
+            label: S.of(context).edit,
+          ),
+          SlidableAction(
+            onPressed: (_) async {
+              final isDelete = await showAlertDialog(context);
 
-          if (isDelete) {
-            await contactListViewModel.delete(contact);
-          }
-        },
-        backgroundColor: Colors.red,
-        foregroundColor: Colors.white,
-        icon: CupertinoIcons.delete,
-        label: S.of(context).delete,
-      ),
-    ],
-  );
+              if (isDelete) {
+                await contactListViewModel.delete(contact);
+              }
+            },
+            backgroundColor: Colors.red,
+            foregroundColor: Colors.white,
+            icon: CupertinoIcons.delete,
+            label: S.of(context).delete,
+          ),
+        ],
+      );
 }

lib/src/screens/dashboard/dashboard_page.dart

@@ -298,24 +298,7 @@ class _DashboardPageView extends BasePage {
       }
     });
 
-    final sharedPrefs = await SharedPreferences.getInstance();
-    final currentAppVersion =
-        VersionComparator.getExtendedVersionNumber(dashboardViewModel.settingsStore.appVersion);
-    final lastSeenAppVersion = sharedPrefs.getInt(PreferencesKey.lastSeenAppVersion);
-    final isNewInstall = sharedPrefs.getBool(PreferencesKey.isNewInstall);
-
-    if (currentAppVersion != lastSeenAppVersion && !isNewInstall!) {
-      await Future<void>.delayed(Duration(seconds: 1));
-      await showPopUp<void>(
-          context: context,
-          builder: (BuildContext context) {
-            return ReleaseNotesScreen(
-                title: 'Version ${dashboardViewModel.settingsStore.appVersion}');
-          });
-      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
-    } else if (isNewInstall!) {
-      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
-    }
+    _showReleaseNotesPopup(context);
 
     var needToPresentYat = false;
     var isInactive = false;
@@ -341,4 +324,27 @@ class _DashboardPageView extends BasePage {
       needToPresentYat = true;
     });
   }
+
+  void _showReleaseNotesPopup(BuildContext context) async {
+    final sharedPrefs = await SharedPreferences.getInstance();
+    final currentAppVersion =
+          VersionComparator.getExtendedVersionNumber(dashboardViewModel.settingsStore.appVersion);
+    final lastSeenAppVersion = sharedPrefs.getInt(PreferencesKey.lastSeenAppVersion);
+    final isNewInstall = sharedPrefs.getBool(PreferencesKey.isNewInstall);
+
+    if (currentAppVersion != lastSeenAppVersion && !isNewInstall!) {
+      Future<void>.delayed(Duration(seconds: 1), () {
+        showPopUp<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return ReleaseNotesScreen(
+                title: 'Version ${dashboardViewModel.settingsStore.appVersion}');
+          });
+      });
+
+      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
+    } else if (isNewInstall!) {
+      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
+    }
+  }
 }

lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart

@@ -33,6 +33,7 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
   final bitcoinIcon = Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
   final litecoinIcon = Image.asset('assets/images/litecoin_icon.png', height: 24, width: 24);
   final havenIcon = Image.asset('assets/images/haven_logo.png', height: 24, width: 24);
+  final ethereumIcon = Image.asset('assets/images/eth_icon.png', height: 24, width: 24);
   final nonWalletTypeIcon = Image.asset('assets/images/close.png', height: 24, width: 24);
   Image _newWalletImage(BuildContext context) => Image.asset(
         'assets/images/new_wallet.png',
@@ -137,6 +138,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         return litecoinIcon;
       case WalletType.haven:
         return havenIcon;
+      case WalletType.ethereum:
+        return ethereumIcon;
       default:
         return nonWalletTypeIcon;
     }
@@ -171,15 +174,29 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
       } catch (e) {
         changeProcessText(S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
       }
-    });
+      },
+      conditionToDetermineIfToUse2FA:
+          widget.walletListViewModel.shouldRequireTOTP2FAForAccessingWallet,
+    );
   }
 
   void _navigateToCreateWallet() {
     if (isSingleCoin) {
-      Navigator.of(context)
-          .pushNamed(Routes.newWallet, arguments: widget.walletListViewModel.currentWalletType);
+      widget._authService.authenticateAction(
+        context,
+        route: Routes.newWallet,
+        arguments: widget.walletListViewModel.currentWalletType,
+        conditionToDetermineIfToUse2FA: widget
+            .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+      );
     } else {
-      Navigator.of(context).pushNamed(Routes.newWalletType);
+      widget._authService.authenticateAction(
+        context,
+        route: Routes.newWalletType,
+        conditionToDetermineIfToUse2FA: widget
+            .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+      );
+     
     }
   }
 

lib/src/screens/dashboard/edit_token_page.dart

@@ -0,0 +1,309 @@
+import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/widgets/address_text_field.dart';
+import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/src/widgets/checkbox_widget.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
+import 'package:cw_core/erc20_token.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class EditTokenPage extends BasePage {
+  EditTokenPage({
+    Key? key,
+    required this.homeSettingsViewModel,
+    this.erc20token,
+    this.initialContractAddress,
+  }) : assert(erc20token == null || initialContractAddress == null);
+
+  final HomeSettingsViewModel homeSettingsViewModel;
+  final Erc20Token? erc20token;
+  final String? initialContractAddress;
+
+  @override
+  String? get title => S.current.edit_token;
+
+  @override
+  Widget body(BuildContext context) {
+    return EditTokenPageBody(
+      homeSettingsViewModel: homeSettingsViewModel,
+      erc20token: erc20token,
+      initialContractAddress: initialContractAddress,
+    );
+  }
+}
+
+class EditTokenPageBody extends StatefulWidget {
+  const EditTokenPageBody({
+    Key? key,
+    required this.homeSettingsViewModel,
+    this.erc20token,
+    this.initialContractAddress,
+  }) : super(key: key);
+
+  final HomeSettingsViewModel homeSettingsViewModel;
+  final Erc20Token? erc20token;
+  final String? initialContractAddress;
+
+  @override
+  State<EditTokenPageBody> createState() => _EditTokenPageBodyState();
+}
+
+class _EditTokenPageBodyState extends State<EditTokenPageBody> {
+  final TextEditingController _contractAddressController = TextEditingController();
+  final TextEditingController _tokenNameController = TextEditingController();
+  final TextEditingController _tokenSymbolController = TextEditingController();
+  final TextEditingController _tokenDecimalController = TextEditingController();
+
+  final FocusNode _contractAddressFocusNode = FocusNode();
+  final FocusNode _tokenNameFocusNode = FocusNode();
+  final FocusNode _tokenSymbolFocusNode = FocusNode();
+  final FocusNode _tokenDecimalFocusNode = FocusNode();
+
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+
+  bool _showDisclaimer = false;
+  bool _disclaimerChecked = false;
+
+  @override
+  void initState() {
+    super.initState();
+
+    if (widget.erc20token != null) {
+      _contractAddressController.text = widget.erc20token!.contractAddress;
+      _tokenNameController.text = widget.erc20token!.name;
+      _tokenSymbolController.text = widget.erc20token!.symbol;
+      _tokenDecimalController.text = widget.erc20token!.decimal.toString();
+    }
+
+    if (widget.initialContractAddress != null) {
+      _contractAddressController.text = widget.initialContractAddress!;
+      _getTokenInfo();
+    }
+
+    _contractAddressFocusNode.addListener(() {
+      if (!_contractAddressFocusNode.hasFocus) {
+        _getTokenInfo();
+      }
+
+      final contractAddress = _contractAddressController.text;
+      if (contractAddress.isNotEmpty && contractAddress != widget.erc20token?.contractAddress) {
+        setState(() {
+          _showDisclaimer = true;
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: ScrollableWithBottomSection(
+        contentPadding: EdgeInsets.zero,
+        content: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 25),
+          child: Column(
+            children: [
+              Container(
+                padding: EdgeInsets.symmetric(vertical: 16, horizontal: 28),
+                decoration: BoxDecoration(
+                  color: Theme.of(context).accentTextTheme.bodySmall!.color!,
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Image.asset('assets/images/restore_keys.png'),
+                    const SizedBox(width: 24),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            S.of(context).warning,
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                            ),
+                          ),
+                          Padding(
+                            padding: EdgeInsets.only(top: 5),
+                            child: Text(
+                              S.of(context).add_token_warning,
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.normal,
+                                color: Theme.of(context).primaryTextTheme.labelSmall!.color!,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              SizedBox(height: 50),
+              _tokenForm(),
+            ],
+          ),
+        ),
+        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+        bottomSection: Column(
+          children: [
+            if (_showDisclaimer) ...[
+              CheckboxWidget(
+                value: _disclaimerChecked,
+                caption: S.of(context).add_token_disclaimer_check,
+                onChanged: (value) {
+                  _disclaimerChecked = value;
+                },
+              ),
+              SizedBox(height: 20),
+            ],
+            Row(
+              children: <Widget>[
+                Expanded(
+                  child: PrimaryButton(
+                    onPressed: () async {
+                      if (widget.erc20token != null) {
+                        await widget.homeSettingsViewModel.deleteErc20Token(widget.erc20token!);
+                      }
+                      Navigator.pop(context);
+                    },
+                    text: widget.erc20token != null ? S.of(context).delete : S.of(context).cancel,
+                    color: Colors.red,
+                    textColor: Colors.white,
+                  ),
+                ),
+                SizedBox(width: 20),
+                Expanded(
+                  child: PrimaryButton(
+                    onPressed: () async {
+                      if (_formKey.currentState!.validate() &&
+                          (!_showDisclaimer || _disclaimerChecked)) {
+                        await widget.homeSettingsViewModel.addErc20Token(Erc20Token(
+                          name: _tokenNameController.text,
+                          symbol: _tokenSymbolController.text,
+                          contractAddress: _contractAddressController.text,
+                          decimal: int.parse(_tokenDecimalController.text),
+                        ));
+                        Navigator.pop(context);
+                      }
+                    },
+                    text: S.of(context).save,
+                    color: Theme.of(context).accentTextTheme.bodyLarge!.color!,
+                    textColor: Colors.white,
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _getTokenInfo() async {
+    if (_contractAddressController.text.isNotEmpty) {
+      final token =
+          await widget.homeSettingsViewModel.getErc20Token(_contractAddressController.text);
+
+      if (token != null) {
+        if (_tokenNameController.text.isEmpty) _tokenNameController.text = token.name;
+        if (_tokenSymbolController.text.isEmpty) _tokenSymbolController.text = token.symbol;
+        if (_tokenDecimalController.text.isEmpty)
+          _tokenDecimalController.text = token.decimal.toString();
+      }
+    }
+  }
+
+  Future<void> _pasteText() async {
+    final value = await Clipboard.getData('text/plain');
+
+    if (value?.text?.isNotEmpty ?? false) {
+      _contractAddressController.text = value!.text!;
+
+      _getTokenInfo();
+      setState(() {
+        _showDisclaimer = true;
+      });
+    }
+  }
+
+  Widget _tokenForm() {
+    return Form(
+      key: _formKey,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          AddressTextField(
+            controller: _contractAddressController,
+            focusNode: _contractAddressFocusNode,
+            placeholder: S.of(context).token_contract_address,
+            options: [AddressTextFieldOption.paste],
+            buttonColor: Theme.of(context).hintColor,
+            validator: AddressValidator(type: widget.homeSettingsViewModel.nativeToken),
+            onPushPasteButton: (_) {
+              _pasteText();
+            },
+          ),
+          const SizedBox(height: 8),
+          BaseTextFormField(
+            controller: _tokenNameController,
+            focusNode: _tokenNameFocusNode,
+            onSubmit: (_) => FocusScope.of(context).requestFocus(_tokenSymbolFocusNode),
+            textInputAction: TextInputAction.next,
+            hintText: S.of(context).token_name,
+            validator: (text) {
+              if (text?.isNotEmpty ?? false) {
+                return null;
+              }
+
+              return S.of(context).field_required;
+            },
+          ),
+          const SizedBox(height: 8),
+          BaseTextFormField(
+            controller: _tokenSymbolController,
+            focusNode: _tokenSymbolFocusNode,
+            onSubmit: (_) => FocusScope.of(context).requestFocus(_tokenDecimalFocusNode),
+            textInputAction: TextInputAction.next,
+            hintText: S.of(context).token_symbol,
+            validator: (text) {
+              if (text?.isNotEmpty ?? false) {
+                return null;
+              }
+
+              return S.of(context).field_required;
+            },
+          ),
+          const SizedBox(height: 8),
+          BaseTextFormField(
+            controller: _tokenDecimalController,
+            focusNode: _tokenDecimalFocusNode,
+            textInputAction: TextInputAction.done,
+            hintText: S.of(context).token_decimal,
+            validator: (text) {
+              if (text?.isEmpty ?? true) {
+                return S.of(context).field_required;
+              }
+              if (int.tryParse(text!) == null) {
+                return S.of(context).invalid_input;
+              }
+
+              return null;
+            },
+          ),
+          SizedBox(height: 24),
+        ],
+      ),
+    );
+  }
+}

lib/src/screens/dashboard/home_settings_page.dart

@@ -0,0 +1,164 @@
+import 'dart:math';
+
+import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/entities/sort_balance_types.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+
+class HomeSettingsPage extends BasePage {
+  HomeSettingsPage(this._homeSettingsViewModel);
+
+  final HomeSettingsViewModel _homeSettingsViewModel;
+
+  final TextEditingController _searchController = TextEditingController();
+
+  @override
+  String? get title => S.current.home_screen_settings;
+
+  @override
+  Widget body(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        children: [
+          Observer(
+            builder: (_) => SettingsPickerCell<SortBalanceBy>(
+              title: S.current.sort_by,
+              items: SortBalanceBy.values,
+              selectedItem: _homeSettingsViewModel.sortBalanceBy,
+              onItemSelected: _homeSettingsViewModel.setSortBalanceBy,
+            ),
+          ),
+          Divider(color: Theme.of(context).primaryTextTheme.bodySmall!.decorationColor!),
+          Observer(
+            builder: (_) => SettingsSwitcherCell(
+              title: S.of(context).pin_at_top(_homeSettingsViewModel.nativeToken.title),
+              value: _homeSettingsViewModel.pinNativeToken,
+              onValueChange: (_, bool value) {
+                _homeSettingsViewModel.setPinNativeToken(value);
+              },
+            ),
+          ),
+          Divider(color: Theme.of(context).primaryTextTheme.bodySmall!.decorationColor!),
+          const SizedBox(height: 20),
+          Row(
+            children: [
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsetsDirectional.only(start: 16),
+                  child: TextFormField(
+                    controller: _searchController,
+                    style: TextStyle(color: Theme.of(context).primaryTextTheme.titleLarge!.color!),
+                    decoration: InputDecoration(
+                      hintText: S.of(context).search_add_token,
+                      prefixIcon: Image.asset("assets/images/search_icon.png"),
+                      filled: true,
+                      fillColor: Theme.of(context).accentTextTheme.displaySmall!.color!,
+                      alignLabelWithHint: false,
+                      contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
+                      enabledBorder: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(30),
+                        borderSide: const BorderSide(color: Colors.transparent),
+                      ),
+                      focusedBorder: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(30),
+                        borderSide: const BorderSide(color: Colors.transparent),
+                      ),
+                    ),
+                    onChanged: (String text) => _homeSettingsViewModel.changeSearchText(text),
+                  ),
+                ),
+              ),
+              RawMaterialButton(
+                onPressed: () async {
+                  Navigator.pushNamed(context, Routes.editToken, arguments: {
+                    'homeSettingsViewModel': _homeSettingsViewModel,
+                    if (AddressValidator(type: _homeSettingsViewModel.nativeToken)
+                        .isValid(_searchController.text))
+                      'contractAddress': _searchController.text,
+                  });
+                },
+                elevation: 0,
+                fillColor: Theme.of(context).accentTextTheme.bodySmall!.color!,
+                child: Icon(
+                  Icons.add,
+                  color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
+                  size: 22.0,
+                ),
+                padding: EdgeInsets.all(12),
+                shape: CircleBorder(),
+                splashColor: Theme.of(context).accentTextTheme.bodySmall!.color!,
+              ),
+            ],
+          ),
+          Padding(
+            padding: const EdgeInsets.only(bottom: 16, left: 16, right: 16),
+            child: Observer(
+              builder: (_) => ListView.builder(
+                itemCount: _homeSettingsViewModel.tokens.length,
+                shrinkWrap: true,
+                physics: NeverScrollableScrollPhysics(),
+                itemBuilder: (context, index) {
+                  return Container(
+                    margin: EdgeInsets.only(top: 16),
+                    child: Observer(
+                      builder: (_) {
+                        final token = _homeSettingsViewModel.tokens.elementAt(index);
+
+                        return SettingsSwitcherCell(
+                          title: "${token.name} "
+                              "(${token.symbol})",
+                          value: token.enabled,
+                          onValueChange: (_, bool value) {
+                            _homeSettingsViewModel.changeTokenAvailability(token, value);
+                          },
+                          onTap: (_) {
+                            Navigator.pushNamed(context, Routes.editToken, arguments: {
+                              'homeSettingsViewModel': _homeSettingsViewModel,
+                              'token': token,
+                            });
+                          },
+                          leading: token.iconPath != null
+                              ? Container(
+                                  child: Image.asset(
+                                    token.iconPath!,
+                                    height: 30.0,
+                                    width: 30.0,
+                                  ),
+                                )
+                              : Container(
+                                  height: 30.0,
+                                  width: 30.0,
+                                  child: Center(
+                                    child: Text(
+                                      token.symbol.substring(0, min(token.symbol.length, 2)),
+                                      style: TextStyle(fontSize: 11),
+                                    ),
+                                  ),
+                                  decoration: BoxDecoration(
+                                    shape: BoxShape.circle,
+                                    color: Colors.grey.shade400,
+                                  ),
+                                ),
+                          decoration: BoxDecoration(
+                            color: Theme.of(context).accentTextTheme.bodySmall!.color!,
+                            borderRadius: BorderRadius.circular(30),
+                          ),
+                        );
+                      },
+                    ),
+                  );
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -27,15 +27,15 @@ class AddressPage extends BasePage {
     required this.addressListViewModel,
     required this.dashboardViewModel,
     required this.receiveOptionViewModel,
-  }) : _cryptoAmountFocus = FocusNode(),
-      _formKey = GlobalKey<FormState>(),
-      _amountController = TextEditingController(){
-      _amountController.addListener(() {
-        if (_formKey.currentState!.validate()) {
-          addressListViewModel.changeAmount(
-            _amountController.text,
-          );
-        }
+  })  : _cryptoAmountFocus = FocusNode(),
+        _formKey = GlobalKey<FormState>(),
+        _amountController = TextEditingController() {
+    _amountController.addListener(() {
+      if (_formKey.currentState!.validate()) {
+        addressListViewModel.changeAmount(
+          _amountController.text,
+        );
+      }
     });
   }
 
@@ -63,15 +63,11 @@ class AddressPage extends BasePage {
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context)
-          .accentTextTheme!
-          .displayMedium!
-          .backgroundColor!,
+      color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
       size: 16,
     );
-    final _closeButton = currentTheme.type == ThemeType.dark
-        ? closeButtonImageDarkTheme
-        : closeButtonImage;
+    final _closeButton =
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = ResponsiveLayoutUtil.instance.isMobile;
 
@@ -82,13 +78,10 @@ class AddressPage extends BasePage {
         child: ButtonTheme(
           minWidth: double.minPositive,
           child: Semantics(
-            label: !isMobileView
-                ? S.of(context).close
-                : S.of(context).seed_alert_back,
+            label: !isMobileView ? S.of(context).close : S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: MaterialStateColor.resolveWith(
-                    (states) => Colors.transparent),
+                overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
@@ -100,8 +93,7 @@ class AddressPage extends BasePage {
   }
 
   @override
-  Widget middle(BuildContext context) =>
-      PresentReceiveOptionPicker(
+  Widget middle(BuildContext context) => PresentReceiveOptionPicker(
         receiveOptionViewModel: receiveOptionViewModel,
         hasWhiteBackground: currentTheme.type == ThemeType.light,
       );
@@ -136,10 +128,7 @@ class AddressPage extends BasePage {
         icon: Icon(
           Icons.share,
           size: 20,
-          color: Theme.of(context)
-              .accentTextTheme!
-              .displayMedium!
-              .backgroundColor!,
+          color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
         ),
       ),
     );
@@ -180,10 +169,7 @@ class AddressPage extends BasePage {
         tapOutsideToDismiss: true,
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context)
-                .accentTextTheme!
-                .bodyLarge!
-                .backgroundColor!,
+            keyboardBarColor: Theme.of(context).accentTextTheme.bodyLarge!.backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -205,62 +191,54 @@ class AddressPage extends BasePage {
                           isLight: dashboardViewModel.settingsStore.currentTheme.type ==
                               ThemeType.light))),
               Observer(builder: (_) {
-                return addressListViewModel.hasAddressList
-                    ? GestureDetector(
-                        onTap: () => Navigator.of(context).pushNamed(Routes.receive),
-                        child: Container(
-                          height: 50,
-                          padding: EdgeInsets.only(left: 24, right: 12),
-                          alignment: Alignment.center,
-                          decoration: BoxDecoration(
-                              borderRadius: BorderRadius.all(Radius.circular(25)),
-                              border: Border.all(
-                                  color: Theme.of(context)
-                                      .textTheme!
-                                      .titleMedium!
-                                      .color!,
-                                  width: 1),
-                              color: Theme.of(context)
-                                  .textTheme!
-                                  .titleLarge!
-                                  .backgroundColor!),
-                          child: Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: <Widget>[
-                              Observer(
-                                  builder: (_) => Text(
-                                        addressListViewModel.hasAccounts
-                                            ? S.of(context).accounts_subaddresses
-                                            : S.of(context).addresses,
-                                        style: TextStyle(
-                                            fontSize: 14,
-                                            fontWeight: FontWeight.w500,
-                                            color: Theme.of(context)
-                                                .accentTextTheme!
-                                                .displayMedium!
-                                                .backgroundColor!),
-                                      )),
-                              Icon(
-                                Icons.arrow_forward_ios,
-                                size: 14,
-                                color: Theme.of(context)
-                                    .accentTextTheme!
-                                    .displayMedium!
-                                    .backgroundColor!,
-                              )
-                            ],
-                          ),
-                        ),
-                      )
-                    : Text(S.of(context).electrum_address_disclaimer,
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                            fontSize: 15,
-                            color: Theme.of(context)
-                                .accentTextTheme!
-                                .displaySmall!
-                                .backgroundColor!));
+                if (addressListViewModel.hasAddressList) {
+                  return GestureDetector(
+                    onTap: () => Navigator.of(context).pushNamed(Routes.receive),
+                    child: Container(
+                      height: 50,
+                      padding: EdgeInsets.only(left: 24, right: 12),
+                      alignment: Alignment.center,
+                      decoration: BoxDecoration(
+                          borderRadius: BorderRadius.all(Radius.circular(25)),
+                          border: Border.all(
+                              color: Theme.of(context).textTheme.titleMedium!.color!, width: 1),
+                          color: Theme.of(context).textTheme.titleLarge!.backgroundColor!),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.max,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: <Widget>[
+                          Observer(
+                              builder: (_) => Text(
+                                    addressListViewModel.hasAccounts
+                                        ? S.of(context).accounts_subaddresses
+                                        : S.of(context).addresses,
+                                    style: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight: FontWeight.w500,
+                                        color: Theme.of(context)
+                                            .accentTextTheme.displayMedium!
+                                            .backgroundColor!),
+                                  )),
+                          Icon(
+                            Icons.arrow_forward_ios,
+                            size: 14,
+                            color:
+                                Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                          )
+                        ],
+                      ),
+                    ),
+                  );
+                } else if (addressListViewModel.showElectrumAddressDisclaimer) {
+                  return Text(S.of(context).electrum_address_disclaimer,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                          fontSize: 15,
+                          color:
+                              Theme.of(context).accentTextTheme.displaySmall!.backgroundColor!));
+                } else {
+                  return const SizedBox();
+                }
               })
             ],
           ),

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

@@ -1,8 +1,8 @@
+import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@@ -20,51 +20,78 @@ class BalancePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-        onLongPress: () => dashboardViewModel.balanceViewModel.isReversing =
-            !dashboardViewModel.balanceViewModel.isReversing,
-        onLongPressUp: () => dashboardViewModel.balanceViewModel.isReversing =
-            !dashboardViewModel.balanceViewModel.isReversing,
-        child: SingleChildScrollView(
-            child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-          SizedBox(height: 56),
-          Container(
+      onLongPress: () => dashboardViewModel.balanceViewModel.isReversing =
+          !dashboardViewModel.balanceViewModel.isReversing,
+      onLongPressUp: () => dashboardViewModel.balanceViewModel.isReversing =
+          !dashboardViewModel.balanceViewModel.isReversing,
+      child: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            SizedBox(height: 56),
+            Container(
               margin: const EdgeInsets.only(left: 24, bottom: 16),
-              child: Observer(builder: (_) {
-                return Text(dashboardViewModel.balanceViewModel.asset,
-                    style: TextStyle(
-                        fontSize: 24,
-                        fontFamily: 'Lato',
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context)
-                            .accentTextTheme!
-                            .displayMedium!
-                            .backgroundColor!,
-                        height: 1),
-                    maxLines: 1,
-                    textAlign: TextAlign.center);
-              })),
-          Observer(builder: (_) {
-            if (dashboardViewModel.balanceViewModel.isShowCard && FeatureFlag.isCakePayEnabled) {
-              return IntroducingCard(
-                  title: S.of(context).introducing_cake_pay,
-                  subTitle: S.of(context).cake_pay_learn_more,
-                  borderColor: settingsStore.currentTheme.type == ThemeType.bright
-                      ? Color.fromRGBO(255, 255, 255, 0.2)
-                      : Colors.transparent,
-                  closeCard: dashboardViewModel.balanceViewModel.disableIntroCakePayCard);
-            }
-            return Container();
-          }),
-          Observer(builder: (_) {
-            return ListView.separated(
-                physics: NeverScrollableScrollPhysics(),
-                shrinkWrap: true,
-                separatorBuilder: (_, __) => Container(padding: EdgeInsets.only(bottom: 8)),
-                itemCount: dashboardViewModel.balanceViewModel.formattedBalances.length,
-                itemBuilder: (__, index) {
-                  final balance =
-                      dashboardViewModel.balanceViewModel.formattedBalances.elementAt(index);
-                  return buildBalanceRow(context,
+              child: Observer(
+                builder: (_) {
+                  return Row(
+                    children: [
+                      Text(
+                        dashboardViewModel.balanceViewModel.asset,
+                        style: TextStyle(
+                          fontSize: 24,
+                          fontFamily: 'Lato',
+                          fontWeight: FontWeight.w600,
+                          color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                          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).accentTextTheme.displayMedium!.backgroundColor!,
+                            ),
+                          ),
+                        ),
+                    ],
+                  );
+                },
+              ),
+            ),
+            Observer(
+              builder: (_) {
+                if (dashboardViewModel.balanceViewModel.isShowCard &&
+                    FeatureFlag.isCakePayEnabled) {
+                  return IntroducingCard(
+                      title: S.of(context).introducing_cake_pay,
+                      subTitle: S.of(context).cake_pay_learn_more,
+                      borderColor: settingsStore.currentTheme.type == ThemeType.bright
+                          ? Color.fromRGBO(255, 255, 255, 0.2)
+                          : Colors.transparent,
+                      closeCard: dashboardViewModel.balanceViewModel.disableIntroCakePayCard);
+                }
+                return Container();
+              },
+            ),
+            Observer(
+              builder: (_) {
+                return ListView.separated(
+                  physics: NeverScrollableScrollPhysics(),
+                  shrinkWrap: true,
+                  separatorBuilder: (_, __) => Container(padding: EdgeInsets.only(bottom: 8)),
+                  itemCount: dashboardViewModel.balanceViewModel.formattedBalances.length,
+                  itemBuilder: (__, index) {
+                    final balance =
+                        dashboardViewModel.balanceViewModel.formattedBalances.elementAt(index);
+                    return buildBalanceRow(
+                      context,
                       availableBalanceLabel:
                           '${dashboardViewModel.balanceViewModel.availableBalanceLabel}',
                       availableBalance: balance.availableBalance,
@@ -75,45 +102,57 @@ class BalancePage extends StatelessWidget {
                       additionalFiatBalance: balance.fiatAdditionalBalance,
                       frozenBalance: balance.frozenBalance,
                       frozenFiatBalance: balance.fiatFrozenBalance,
-                      currency: balance.formattedAssetTitle);
-                });
-          })
-        ])));
+                      currency: balance.formattedAssetTitle,
+                      hasAdditionalBalance:
+                          dashboardViewModel.balanceViewModel.hasAdditionalBalance,
+                    );
+                  },
+                );
+              },
+            )
+          ],
+        ),
+      ),
+    );
   }
 
-  Widget buildBalanceRow(BuildContext context,
-      {required String availableBalanceLabel,
-      required String availableBalance,
-      required String availableFiatBalance,
-      required String additionalBalanceLabel,
-      required String additionalBalance,
-      required String additionalFiatBalance,
-      required String frozenBalance,
-      required String frozenFiatBalance,
-      required String currency}) {
+  Widget buildBalanceRow(
+    BuildContext context, {
+    required String availableBalanceLabel,
+    required String availableBalance,
+    required String availableFiatBalance,
+    required String additionalBalanceLabel,
+    required String additionalBalance,
+    required String additionalFiatBalance,
+    required String frozenBalance,
+    required String frozenFiatBalance,
+    required String currency,
+    required bool hasAdditionalBalance,
+  }) {
     return Container(
       margin: const EdgeInsets.only(left: 16, right: 16),
       decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(30.0),
-          border: Border.all(
-            color: settingsStore.currentTheme.type == ThemeType.bright
-                ? Color.fromRGBO(255, 255, 255, 0.2)
-                : Colors.transparent,
-            width: 1,
-          ),
-          color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!),
+        borderRadius: BorderRadius.circular(30.0),
+        border: Border.all(
+          color: settingsStore.currentTheme.type == ThemeType.bright
+              ? Color.fromRGBO(255, 255, 255, 0.2)
+              : Colors.transparent,
+          width: 1,
+        ),
+        color: Theme.of(context).textTheme.titleLarge!.backgroundColor!,
+      ),
       child: Container(
-          margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
+        margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 GestureDetector(
                   behavior: HitTestBehavior.opaque,
-                  onTap: () => _showBalanceDescription(context),
+                  onTap: hasAdditionalBalance ? () => _showBalanceDescription(context) : null,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -129,19 +168,19 @@ class BalancePage extends StatelessWidget {
                                       .displaySmall!
                                       .backgroundColor!,
                                   height: 1)),
-                          Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 4),
-                            child: Icon(Icons.help_outline,
-                                size: 16,
-                                color: Theme.of(context)
-                                    .accentTextTheme!
-                                    .displaySmall!
-                                    .backgroundColor!),
-                          )
+                          if (hasAdditionalBalance)
+                            Padding(
+                              padding: const EdgeInsets.symmetric(horizontal: 4),
+                              child: Icon(Icons.help_outline,
+                                  size: 16,
+                                  color: Theme.of(context)
+                                      .accentTextTheme!
+                                      .displaySmall!
+                                      .backgroundColor!),
+                            ),
                         ],
-                      ),SizedBox(
-                        height: 6,
                       ),
+                      SizedBox(height: 6),
                       AutoSizeText(availableBalance,
                           style: TextStyle(
                               fontSize: 24,
@@ -154,9 +193,7 @@ class BalancePage extends StatelessWidget {
                               height: 1),
                           maxLines: 1,
                           textAlign: TextAlign.start),
-                      SizedBox(
-                        height: 6,
-                      ),
+                      SizedBox(height: 6),
                       Text('${availableFiatBalance}',
                           textAlign: TextAlign.center,
                           style: TextStyle(
@@ -168,7 +205,6 @@ class BalancePage extends StatelessWidget {
                                   .displayMedium!
                                   .backgroundColor!,
                               height: 1)),
-
                     ],
                   ),
                 ),
@@ -177,97 +213,99 @@ class BalancePage extends StatelessWidget {
                         fontSize: 28,
                         fontFamily: 'Lato',
                         fontWeight: FontWeight.w800,
-                        color: Theme.of(context)
-                            .accentTextTheme!
-                            .displayMedium!
-                            .backgroundColor!,
+                        color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
                         height: 1)),
               ],
             ),
-            SizedBox(height: 26),
             if (frozenBalance.isNotEmpty)
-              Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                Text(S.current.frozen_balance,
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(height: 26),
+                  Text(
+                    S.current.frozen_balance,
                     textAlign: TextAlign.center,
                     style: TextStyle(
-                        fontSize: 12,
-                        fontFamily: 'Lato',
-                        fontWeight: FontWeight.w400,
-                        color: Theme.of(context)
-                            .accentTextTheme!
-                            .displaySmall!
-                            .backgroundColor!,
-                        height: 1)),
-                SizedBox(height: 8),
-                AutoSizeText(frozenBalance,
-                    style: TextStyle(
-                        fontSize: 20,
-                        fontFamily: 'Lato',
-                        fontWeight: FontWeight.w400,
-                        color: Theme.of(context)
-                            .accentTextTheme!
-                            .displayMedium!
-                            .backgroundColor!,
-                        height: 1),
-                    maxLines: 1,
-                    textAlign: TextAlign.center),
-                SizedBox(height: 4),
-                Text(
-                  frozenFiatBalance,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
                       fontSize: 12,
                       fontFamily: 'Lato',
                       fontWeight: FontWeight.w400,
-                      color: Theme.of(context)
-                          .accentTextTheme!
-                          .displayMedium!
-                          .backgroundColor!,
-                      height: 1),
-                ),
-                SizedBox(height: 24)
-              ]),
-            Text('${additionalBalanceLabel}',
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                    fontSize: 12,
-                    fontFamily: 'Lato',
-                    fontWeight: FontWeight.w400,
-                    color: Theme.of(context)
-                        .accentTextTheme!
-                        .displaySmall!
-                        .backgroundColor!,
-                    height: 1)),
-            SizedBox(height: 8),
-            AutoSizeText(additionalBalance,
-                style: TextStyle(
-                    fontSize: 20,
-                    fontFamily: 'Lato',
-                    fontWeight: FontWeight.w400,
-                    color: Theme.of(context)
-                        .accentTextTheme!
-                        .displayMedium!
-                        .backgroundColor!,
-                    height: 1),
-                maxLines: 1,
-                textAlign: TextAlign.center),
-            SizedBox(
-              height: 4,
-            ),
-            Text(
-              '${additionalFiatBalance}',
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                  fontSize: 12,
-                  fontFamily: 'Lato',
-                  fontWeight: FontWeight.w400,
-                  color: Theme.of(context)
-                      .accentTextTheme!
-                      .displayMedium!
-                      .backgroundColor!,
-                  height: 1),
-            )
-          ])),
+                      color: Theme.of(context).accentTextTheme.displaySmall!.backgroundColor!,
+                      height: 1,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  AutoSizeText(
+                    frozenBalance,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                      height: 1,
+                    ),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 4),
+                  Text(
+                    frozenFiatBalance,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                      height: 1,
+                    ),
+                  ),
+                ],
+              ),
+            if (hasAdditionalBalance)
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(height: 24),
+                  Text(
+                    '${additionalBalanceLabel}',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).accentTextTheme.displaySmall!.backgroundColor!,
+                      height: 1,
+                    ),
+                  ),
+                  SizedBox(height: 8),
+                  AutoSizeText(
+                    additionalBalance,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                      height: 1,
+                    ),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  ),
+                  SizedBox(height: 4),
+                  Text(
+                    '${additionalFiatBalance}',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).accentTextTheme.displayMedium!.backgroundColor!,
+                      height: 1,
+                    ),
+                  ),
+                ],
+              ),
+          ],
+        ),
+      ),
     );
   }
 

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

@@ -19,17 +19,18 @@ class MenuWidget extends StatefulWidget {
 
 class MenuWidgetState extends State<MenuWidget> {
   MenuWidgetState()
-      : this.menuWidth = 0,
-        this.screenWidth = 0,
-        this.screenHeight = 0,
-        this.headerHeight = 120,
-        this.tileHeight = 60,
-        this.fromTopEdge = 50,
-        this.fromBottomEdge = 25,
-        this.moneroIcon = Image.asset('assets/images/monero_menu.png'),
-        this.bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png'),
-        this.litecoinIcon = Image.asset('assets/images/litecoin_menu.png'),
-        this.havenIcon = Image.asset('assets/images/haven_menu.png');
+    : this.menuWidth = 0,
+      this.screenWidth = 0,
+      this.screenHeight = 0,
+      this.headerHeight = 120,
+      this.tileHeight = 60,
+      this.fromTopEdge = 50,
+      this.fromBottomEdge = 25,
+      this.moneroIcon = Image.asset('assets/images/monero_menu.png'),
+      this.bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png'),
+      this.litecoinIcon = Image.asset('assets/images/litecoin_menu.png'),
+      this.havenIcon = Image.asset('assets/images/haven_menu.png'),
+      this.ethereumIcon = Image.asset('assets/images/eth_icon.png');
 
   final largeScreen = 731;
 
@@ -46,6 +47,7 @@ class MenuWidgetState extends State<MenuWidget> {
   Image bitcoinIcon;
   Image litecoinIcon;
   Image havenIcon;
+  Image ethereumIcon;
 
   @override
   void initState() {
@@ -85,16 +87,14 @@ class MenuWidgetState extends State<MenuWidget> {
 
     moneroIcon = Image.asset('assets/images/monero_menu.png',
         color: Theme.of(context)
-            .accentTextTheme!
+            .accentTextTheme
             .labelSmall!
             .decorationColor!);
     bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
         color: Theme.of(context)
-            .accentTextTheme!
+            .accentTextTheme
             .labelSmall!
             .decorationColor!);
-    litecoinIcon = Image.asset('assets/images/litecoin_menu.png');
-    havenIcon = Image.asset('assets/images/haven_menu.png');
 
     return Row(
       mainAxisSize: MainAxisSize.max,
@@ -178,7 +178,7 @@ class MenuWidgetState extends State<MenuWidget> {
                         index--;
 
                         final item = SettingActions.all[index];
-                       
+
                         final isLastTile = index == itemCount - 1;
 
                         return SettingActionButton(
@@ -215,6 +215,8 @@ class MenuWidgetState extends State<MenuWidget> {
         return litecoinIcon;
       case WalletType.haven:
         return havenIcon;
+      case WalletType.ethereum:
+        return ethereumIcon;
       default:
         throw Exception('No icon for ${type.toString()}');
     }

lib/src/screens/exchange/exchange_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/desktop_exchange_cards_section.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
@@ -37,7 +38,7 @@ import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
 
 class ExchangePage extends BasePage {
-  ExchangePage(this.exchangeViewModel) {
+  ExchangePage(this.exchangeViewModel, this.authService) {
     depositWalletName = exchangeViewModel.depositCurrency == CryptoCurrency.xmr
         ? exchangeViewModel.wallet.name
         : null;
@@ -47,6 +48,7 @@ class ExchangePage extends BasePage {
   }
 
   final ExchangeViewModel exchangeViewModel;
+  final AuthService authService;
   final depositKey = GlobalKey<ExchangeCardState>();
   final receiveKey = GlobalKey<ExchangeCardState>();
   final _formKey = GlobalKey<FormState>();
@@ -89,16 +91,17 @@ class ExchangePage extends BasePage {
 
   @override
   Widget middle(BuildContext context) => Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(right:6.0),
-          child: Observer(builder: (_) => SyncIndicatorIcon(isSynced: exchangeViewModel.status is SyncedSyncStatus),)
-        ),
-        PresentProviderPicker(exchangeViewModel: exchangeViewModel)
-      ],
-    );
-
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Padding(
+              padding: const EdgeInsets.only(right: 6.0),
+              child: Observer(
+                builder: (_) =>
+                    SyncIndicatorIcon(isSynced: exchangeViewModel.status is SyncedSyncStatus),
+              )),
+          PresentProviderPicker(exchangeViewModel: exchangeViewModel)
+        ],
+      );
 
   @override
   Widget trailing(BuildContext context) => TrailButton(
@@ -110,12 +113,13 @@ class ExchangePage extends BasePage {
 
   @override
   Widget? leading(BuildContext context) {
-    final _backButton = Icon(Icons.arrow_back_ios,
+    final _backButton = Icon(
+      Icons.arrow_back_ios,
       color: titleColor,
       size: 16,
     );
-    final _closeButton = currentTheme.type == ThemeType.dark
-        ? closeButtonImageDarkTheme : closeButtonImage;
+    final _closeButton =
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = ResponsiveLayoutUtil.instance.isMobile;
 
@@ -126,13 +130,10 @@ class ExchangePage extends BasePage {
         child: ButtonTheme(
           minWidth: double.minPositive,
           child: Semantics(
-            label: !isMobileView
-                ? S.of(context).close
-                : S.of(context).seed_alert_back,
+            label: !isMobileView ? S.of(context).close : S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: MaterialStateColor.resolveWith(
-                        (states) => Colors.transparent),
+                overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
@@ -145,23 +146,19 @@ class ExchangePage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    WidgetsBinding.instance
-        .addPostFrameCallback((_) => _setReactions(context, exchangeViewModel));
+    WidgetsBinding.instance.addPostFrameCallback((_) => _setReactions(context, exchangeViewModel));
 
     return KeyboardActions(
         disableScroll: true,
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor:
-                Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!,
+            keyboardBarColor: Theme.of(context).accentTextTheme.bodyLarge!.backgroundColor!,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
-                  focusNode: _depositAmountFocus,
-                  toolbarButtons: [(_) => KeyboardDoneButton()]),
+                  focusNode: _depositAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
               KeyboardActionsItem(
-                  focusNode: _receiveAmountFocus,
-                  toolbarButtons: [(_) => KeyboardDoneButton()])
+                  focusNode: _receiveAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
             ]),
         child: Container(
           color: Theme.of(context).colorScheme.background,
@@ -169,30 +166,28 @@ class ExchangePage extends BasePage {
               key: _formKey,
               child: ScrollableWithBottomSection(
                 contentPadding: EdgeInsets.only(bottom: 24),
-                content: Observer(builder: (_) => Column(
-                  children: <Widget>[
-                    _exchangeCardsSection(context),
-                    Padding(
-                      padding: EdgeInsets.only(top: 12, left: 24),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        children: [
-                          StandardCheckbox(
-                            value: exchangeViewModel.isFixedRateMode,
-                            caption: S.of(context).fixed_rate,
-                            onChanged: (value) =>
-                            exchangeViewModel.isFixedRateMode = value,
-                          ),
-                        ],
-                      )
-                    ),
-                    SizedBox(height: 30),
-                    _buildTemplateSection(context)
+                content: Observer(
+                  builder: (_) => Column(
+                    children: <Widget>[
+                      _exchangeCardsSection(context),
+                      Padding(
+                          padding: EdgeInsets.only(top: 12, left: 24),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: [
+                              StandardCheckbox(
+                                value: exchangeViewModel.isFixedRateMode,
+                                caption: S.of(context).fixed_rate,
+                                onChanged: (value) => exchangeViewModel.isFixedRateMode = value,
+                              ),
+                            ],
+                          )),
+                      SizedBox(height: 30),
+                      _buildTemplateSection(context)
                     ],
                   ),
                 ),
-                bottomSectionPadding:
-                    EdgeInsets.only(left: 24, right: 24, bottom: 24),
+                bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
                 bottomSection: Column(children: <Widget>[
                   Padding(
                     padding: EdgeInsets.only(bottom: 15),
@@ -210,8 +205,7 @@ class ExchangePage extends BasePage {
                           textAlign: TextAlign.center,
                           style: TextStyle(
                               color: Theme.of(context)
-                                  .primaryTextTheme!
-                                  .displayLarge!
+                                  .primaryTextTheme.displayLarge!
                                   .decorationColor!,
                               fontWeight: FontWeight.w500,
                               fontSize: 12),
@@ -223,29 +217,34 @@ class ExchangePage extends BasePage {
                       builder: (_) => LoadingPrimaryButton(
                           text: S.of(context).exchange,
                           onPressed: () {
-                            if (_formKey.currentState != null && _formKey.currentState!.validate()) {
-                              if ((exchangeViewModel.depositCurrency ==
-                                      CryptoCurrency.xmr) &&
-                                  (!(exchangeViewModel.status
-                                      is SyncedSyncStatus))) {
+                            if (_formKey.currentState != null &&
+                                _formKey.currentState!.validate()) {
+                              if ((exchangeViewModel.depositCurrency == CryptoCurrency.xmr) &&
+                                  (!(exchangeViewModel.status is SyncedSyncStatus))) {
                                 showPopUp<void>(
                                     context: context,
                                     builder: (BuildContext context) {
                                       return AlertWithOneAction(
                                           alertTitle: S.of(context).exchange,
-                                          alertContent: S
-                                              .of(context)
-                                              .exchange_sync_alert_content,
+                                          alertContent: S.of(context).exchange_sync_alert_content,
                                           buttonText: S.of(context).ok,
-                                          buttonAction: () =>
-                                              Navigator.of(context).pop());
+                                          buttonAction: () => Navigator.of(context).pop());
                                     });
                               } else {
-                                exchangeViewModel.createTrade();
+                                final check = exchangeViewModel.shouldDisplayTOTP();
+                                authService.authenticateAction(
+                                  context,
+                                  conditionToDetermineIfToUse2FA: check,
+                                  onAuthSuccess: (value) {
+                                    if (value) {
+                                      exchangeViewModel.createTrade();
+                                    }
+                                  },
+                                );
                               }
                             }
                           },
-                          color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
+                          color: Theme.of(context).accentTextTheme.bodyLarge!.color!,
                           textColor: Colors.white,
                           isDisabled: exchangeViewModel.selectedProviders.isEmpty,
                           isLoading: exchangeViewModel.tradeState is TradeIsCreating)),
@@ -264,7 +263,7 @@ class ExchangePage extends BasePage {
         child: Observer(
           builder: (_) {
             final templates = exchangeViewModel.templates;
-      
+
             return Row(
               children: <Widget>[
                 AddTemplateButton(
@@ -293,18 +292,15 @@ class ExchangePage extends BasePage {
                             builder: (dialogContext) {
                               return AlertWithTwoActions(
                                   alertTitle: S.of(context).template,
-                                  alertContent:
-                                      S.of(context).confirm_delete_template,
+                                  alertContent: S.of(context).confirm_delete_template,
                                   rightButtonText: S.of(context).delete,
                                   leftButtonText: S.of(context).cancel,
                                   actionRightButton: () {
                                     Navigator.of(dialogContext).pop();
-                                    exchangeViewModel.removeTemplate(
-                                        template: template);
+                                    exchangeViewModel.removeTemplate(template: template);
                                     exchangeViewModel.updateTemplate();
                                   },
-                                  actionLeftButton: () =>
-                                      Navigator.of(dialogContext).pop());
+                                  actionLeftButton: () => Navigator.of(dialogContext).pop());
                             });
                       },
                     );
@@ -318,8 +314,8 @@ class ExchangePage extends BasePage {
     );
   }
 
-  void applyTemplate(BuildContext context,
-      ExchangeViewModel exchangeViewModel, ExchangeTemplate template) async {
+  void applyTemplate(
+      BuildContext context, ExchangeViewModel exchangeViewModel, ExchangeTemplate template) async {
     exchangeViewModel.changeDepositCurrency(
         currency: CryptoCurrency.fromString(template.depositCurrency));
     exchangeViewModel.changeReceiveCurrency(
@@ -333,22 +329,19 @@ class ExchangePage extends BasePage {
 
     var domain = template.depositAddress;
     var ticker = template.depositCurrency.toLowerCase();
-    exchangeViewModel.depositAddress =
-      await fetchParsedAddress(context, domain, ticker);
+    exchangeViewModel.depositAddress = await fetchParsedAddress(context, domain, ticker);
 
     domain = template.receiveAddress;
     ticker = template.receiveCurrency.toLowerCase();
-    exchangeViewModel.receiveAddress =
-      await fetchParsedAddress(context, domain, ticker);
+    exchangeViewModel.receiveAddress = await fetchParsedAddress(context, domain, ticker);
   }
 
-  void _setReactions(
-      BuildContext context, ExchangeViewModel exchangeViewModel) {
+  void _setReactions(BuildContext context, ExchangeViewModel exchangeViewModel) {
     if (_isReactionsSet) {
       return;
     }
 
-     if (exchangeViewModel.isLowFee) {
+    if (exchangeViewModel.isLowFee) {
       _showFeeAlert(context);
     }
 
@@ -359,42 +352,30 @@ class ExchangePage extends BasePage {
     final limitsState = exchangeViewModel.limitsState;
 
     if (limitsState is LimitsLoadedSuccessfully) {
-      final min = limitsState.limits.min != null
-          ? limitsState.limits.min.toString()
-          : null;
-      final max = limitsState.limits.max != null
-          ? limitsState.limits.max.toString()
-          : null;
-      final key = exchangeViewModel.isFixedRateMode
-        ? receiveKey
-        : depositKey;
+      final min = limitsState.limits.min != null ? limitsState.limits.min.toString() : null;
+      final max = limitsState.limits.max != null ? limitsState.limits.max.toString() : null;
+      final key = exchangeViewModel.isFixedRateMode ? receiveKey : depositKey;
       key.currentState!.changeLimits(min: min, max: max);
     }
 
-    _onCurrencyChange(
-        exchangeViewModel.receiveCurrency, exchangeViewModel, receiveKey);
-    _onCurrencyChange(
-        exchangeViewModel.depositCurrency, exchangeViewModel, depositKey);
+    _onCurrencyChange(exchangeViewModel.receiveCurrency, exchangeViewModel, receiveKey);
+    _onCurrencyChange(exchangeViewModel.depositCurrency, exchangeViewModel, depositKey);
 
     reaction(
         (_) => exchangeViewModel.wallet.name,
-        (String _) => _onWalletNameChange(
-            exchangeViewModel, exchangeViewModel.receiveCurrency, receiveKey));
+        (String _) =>
+            _onWalletNameChange(exchangeViewModel, exchangeViewModel.receiveCurrency, receiveKey));
 
     reaction(
         (_) => exchangeViewModel.wallet.name,
-        (String _) => _onWalletNameChange(
-            exchangeViewModel, exchangeViewModel.depositCurrency, depositKey));
+        (String _) =>
+            _onWalletNameChange(exchangeViewModel, exchangeViewModel.depositCurrency, depositKey));
 
-    reaction(
-        (_) => exchangeViewModel.receiveCurrency,
-        (CryptoCurrency currency) =>
-            _onCurrencyChange(currency, exchangeViewModel, receiveKey));
+    reaction((_) => exchangeViewModel.receiveCurrency,
+        (CryptoCurrency currency) => _onCurrencyChange(currency, exchangeViewModel, receiveKey));
 
-    reaction(
-        (_) => exchangeViewModel.depositCurrency,
-        (CryptoCurrency currency) =>
-            _onCurrencyChange(currency, exchangeViewModel, depositKey));
+    reaction((_) => exchangeViewModel.depositCurrency,
+        (CryptoCurrency currency) => _onCurrencyChange(currency, exchangeViewModel, depositKey));
 
     reaction((_) => exchangeViewModel.depositAmount, (String amount) {
       if (depositKey.currentState!.amountController.text != amount) {
@@ -408,8 +389,7 @@ class ExchangePage extends BasePage {
       }
     });
 
-    reaction((_) => exchangeViewModel.isDepositAddressEnabled,
-        (bool isEnabled) {
+    reaction((_) => exchangeViewModel.isDepositAddressEnabled, (bool isEnabled) {
       depositKey.currentState!.isAddressEditable(isEditable: isEnabled);
     });
 
@@ -425,13 +405,11 @@ class ExchangePage extends BasePage {
       }
     });
 
-    reaction((_) => exchangeViewModel.isReceiveAddressEnabled,
-        (bool isEnabled) {
+    reaction((_) => exchangeViewModel.isReceiveAddressEnabled, (bool isEnabled) {
       receiveKey.currentState!.isAddressEditable(isEditable: isEnabled);
     });
 
-    reaction((_) => exchangeViewModel.isReceiveAmountEditable,
-        (bool isReceiveAmountEditable) {
+    reaction((_) => exchangeViewModel.isReceiveAmountEditable, (bool isReceiveAmountEditable) {
       receiveKey.currentState!.isAmountEditable(isEditable: isReceiveAmountEditable);
     });
 
@@ -483,20 +461,20 @@ class ExchangePage extends BasePage {
       }
     });
 
-    depositAddressController.addListener(
-        () => exchangeViewModel.depositAddress = depositAddressController.text);
+    depositAddressController
+        .addListener(() => exchangeViewModel.depositAddress = depositAddressController.text);
 
     depositAmountController.addListener(() {
       if (depositAmountController.text != exchangeViewModel.depositAmount) {
-        _depositAmountDebounce.run(() { 
+        _depositAmountDebounce.run(() {
           exchangeViewModel.changeDepositAmount(amount: depositAmountController.text);
           exchangeViewModel.isReceiveAmountEntered = false;
         });
       }
     });
 
-    receiveAddressController.addListener(
-        () => exchangeViewModel.receiveAddress = receiveAddressController.text);
+    receiveAddressController
+        .addListener(() => exchangeViewModel.receiveAddress = receiveAddressController.text);
 
     receiveAmountController.addListener(() {
       if (receiveAmountController.text != exchangeViewModel.receiveAmount) {
@@ -507,8 +485,7 @@ class ExchangePage extends BasePage {
       }
     });
 
-    reaction((_) => exchangeViewModel.wallet.walletAddresses.address,
-            (String address) {
+    reaction((_) => exchangeViewModel.wallet.walletAddresses.address, (String address) {
       if (exchangeViewModel.depositCurrency == CryptoCurrency.xmr) {
         depositKey.currentState!.changeAddress(address: address);
       }
@@ -519,22 +496,18 @@ class ExchangePage extends BasePage {
     });
 
     _depositAddressFocus.addListener(() async {
-      if (!_depositAddressFocus.hasFocus &&
-          depositAddressController.text.isNotEmpty) {
+      if (!_depositAddressFocus.hasFocus && depositAddressController.text.isNotEmpty) {
         final domain = depositAddressController.text;
         final ticker = exchangeViewModel.depositCurrency.title.toLowerCase();
-        exchangeViewModel.depositAddress =
-          await fetchParsedAddress(context, domain, ticker);
+        exchangeViewModel.depositAddress = await fetchParsedAddress(context, domain, ticker);
       }
     });
 
     _receiveAddressFocus.addListener(() async {
-      if (!_receiveAddressFocus.hasFocus &&
-          receiveAddressController.text.isNotEmpty) {
+      if (!_receiveAddressFocus.hasFocus && receiveAddressController.text.isNotEmpty) {
         final domain = receiveAddressController.text;
         final ticker = exchangeViewModel.receiveCurrency.title.toLowerCase();
-        exchangeViewModel.receiveAddress =
-          await fetchParsedAddress(context, domain, ticker);
+        exchangeViewModel.receiveAddress = await fetchParsedAddress(context, domain, ticker);
       }
     });
 
@@ -554,29 +527,26 @@ class ExchangePage extends BasePage {
     _isReactionsSet = true;
   }
 
-  void _onCurrencyChange(CryptoCurrency currency,
-      ExchangeViewModel exchangeViewModel, GlobalKey<ExchangeCardState> key) {
+  void _onCurrencyChange(CryptoCurrency currency, ExchangeViewModel exchangeViewModel,
+      GlobalKey<ExchangeCardState> key) {
     final isCurrentTypeWallet = currency == exchangeViewModel.wallet.currency;
 
     key.currentState!.changeSelectedCurrency(currency);
-    key.currentState!.changeWalletName(
-        isCurrentTypeWallet ? exchangeViewModel.wallet.name : '');
+    key.currentState!.changeWalletName(isCurrentTypeWallet ? exchangeViewModel.wallet.name : '');
 
     key.currentState!.changeAddress(
-        address: isCurrentTypeWallet
-            ? exchangeViewModel.wallet.walletAddresses.address : '');
+        address: isCurrentTypeWallet ? exchangeViewModel.wallet.walletAddresses.address : '');
 
     key.currentState!.changeAmount(amount: '');
   }
 
-  void _onWalletNameChange(ExchangeViewModel exchangeViewModel,
-      CryptoCurrency currency, GlobalKey<ExchangeCardState> key) {
+  void _onWalletNameChange(ExchangeViewModel exchangeViewModel, CryptoCurrency currency,
+      GlobalKey<ExchangeCardState> key) {
     final isCurrentTypeWallet = currency == exchangeViewModel.wallet.currency;
 
     if (isCurrentTypeWallet) {
       key.currentState!.changeWalletName(exchangeViewModel.wallet.name);
-      key.currentState!.addressController.text =
-          exchangeViewModel.wallet.walletAddresses.address;
+      key.currentState!.addressController.text = exchangeViewModel.wallet.walletAddresses.address;
     } else if (key.currentState!.addressController.text ==
         exchangeViewModel.wallet.walletAddresses.address) {
       key.currentState!.changeWalletName('');
@@ -584,8 +554,7 @@ class ExchangePage extends BasePage {
     }
   }
 
-  Future<String> fetchParsedAddress(
-      BuildContext context, String domain, String ticker) async {
+  Future<String> fetchParsedAddress(BuildContext context, String domain, String ticker) async {
     final parsedAddress = await getIt.get<AddressResolver>().resolve(domain, ticker);
     final address = await extractAddressFromParsed(context, parsedAddress);
     return address;
@@ -594,16 +563,17 @@ class ExchangePage extends BasePage {
   void _showFeeAlert(BuildContext context) async {
     await Future<void>.delayed(Duration(seconds: 1));
     final confirmed = await showPopUp<bool>(
-        context: context,
-        builder: (dialogContext) {
-          return AlertWithTwoActions(
-              alertTitle: S.of(context).low_fee,
-              alertContent: S.of(context).low_fee_alert,
-              leftButtonText: S.of(context).ignor,
-              rightButtonText: S.of(context).use_suggested,
-              actionLeftButton: () => Navigator.of(context).pop(false),
-              actionRightButton: () => Navigator.of(context).pop(true));
-        }) ?? false;
+            context: context,
+            builder: (dialogContext) {
+              return AlertWithTwoActions(
+                  alertTitle: S.of(context).low_fee,
+                  alertContent: S.of(context).low_fee_alert,
+                  leftButtonText: S.of(context).ignor,
+                  rightButtonText: S.of(context).use_suggested,
+                  actionLeftButton: () => Navigator.of(dialogContext).pop(false),
+                  actionRightButton: () => Navigator.of(dialogContext).pop(true));
+            }) ??
+        false;
     if (confirmed) {
       exchangeViewModel.setDefaultTransactionPriority();
     }
@@ -612,126 +582,122 @@ class ExchangePage extends BasePage {
   void disposeBestRateSync() => exchangeViewModel.bestRateSync.cancel();
 
   Widget _exchangeCardsSection(BuildContext context) {
-    final firstExchangeCard = Observer(builder: (_) => ExchangeCard(
-      onDispose: disposeBestRateSync,
-      hasAllAmount: exchangeViewModel.hasAllAmount,
-      allAmount: exchangeViewModel.hasAllAmount
-          ? () => exchangeViewModel.calculateDepositAllAmount()
-          : null,
-      amountFocusNode: _depositAmountFocus,
-      addressFocusNode: _depositAddressFocus,
-      key: depositKey,
-      title: S.of(context).you_will_send,
-      initialCurrency: exchangeViewModel.depositCurrency,
-      initialWalletName: depositWalletName ?? '',
-      initialAddress:
-      exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
-          ? exchangeViewModel.wallet.walletAddresses.address
-          : exchangeViewModel.depositAddress,
-      initialIsAmountEditable: true,
-      initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
-      isAmountEstimated: false,
-      hasRefundAddress: true,
-      isMoneroWallet: exchangeViewModel.isMoneroWallet,
-      currencies: exchangeViewModel.depositCurrencies,
-      onCurrencySelected: (currency) {
-        // FIXME: need to move it into view model
-        if (currency == CryptoCurrency.xmr &&
-            exchangeViewModel.wallet.type != WalletType.monero) {
-          showPopUp<void>(
-              context: context,
-              builder: (dialogContext) {
-                return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent:
-                    S.of(context).exchange_incorrect_current_wallet_for_xmr,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(dialogContext).pop());
-              });
-          return;
-        }
+    final firstExchangeCard = Observer(
+        builder: (_) => ExchangeCard(
+              onDispose: disposeBestRateSync,
+              hasAllAmount: exchangeViewModel.hasAllAmount,
+              allAmount: exchangeViewModel.hasAllAmount
+                  ? () => exchangeViewModel.calculateDepositAllAmount()
+                  : null,
+              amountFocusNode: _depositAmountFocus,
+              addressFocusNode: _depositAddressFocus,
+              key: depositKey,
+              title: S.of(context).you_will_send,
+              initialCurrency: exchangeViewModel.depositCurrency,
+              initialWalletName: depositWalletName ?? '',
+              initialAddress: exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
+                  ? exchangeViewModel.wallet.walletAddresses.address
+                  : exchangeViewModel.depositAddress,
+              initialIsAmountEditable: true,
+              initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
+              isAmountEstimated: false,
+              hasRefundAddress: true,
+              isMoneroWallet: exchangeViewModel.isMoneroWallet,
+              currencies: exchangeViewModel.depositCurrencies,
+              onCurrencySelected: (currency) {
+                // FIXME: need to move it into view model
+                if (currency == CryptoCurrency.xmr &&
+                    exchangeViewModel.wallet.type != WalletType.monero) {
+                  showPopUp<void>(
+                      context: context,
+                      builder: (dialogContext) {
+                        return AlertWithOneAction(
+                            alertTitle: S.of(context).error,
+                            alertContent: S.of(context).exchange_incorrect_current_wallet_for_xmr,
+                            buttonText: S.of(context).ok,
+                            buttonAction: () => Navigator.of(dialogContext).pop());
+                      });
+                  return;
+                }
 
-        exchangeViewModel.changeDepositCurrency(currency: currency);
-      },
-      imageArrow: arrowBottomPurple,
-      currencyButtonColor: Colors.transparent,
-      addressButtonsColor: Theme.of(context).focusColor!,
-      borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
-      currencyValueValidator: (value) {
-        return !exchangeViewModel.isFixedRateMode
-            ? AmountValidator(
-                isAutovalidate: true,
-                currency: exchangeViewModel.depositCurrency,
-                minValue: exchangeViewModel.limits.min.toString(),
-                maxValue: exchangeViewModel.limits.max.toString(),
-              ).call(value)
-            : null;
-      },
-      addressTextFieldValidator:
-      AddressValidator(type: exchangeViewModel.depositCurrency),
-      onPushPasteButton: (context) async {
-        final domain = exchangeViewModel.depositAddress;
-        final ticker = exchangeViewModel.depositCurrency.title.toLowerCase();
-        exchangeViewModel.depositAddress =
-        await fetchParsedAddress(context, domain, ticker);
-      },
-      onPushAddressBookButton: (context) async {
-        final domain = exchangeViewModel.depositAddress;
-        final ticker = exchangeViewModel.depositCurrency.title.toLowerCase();
-        exchangeViewModel.depositAddress =
-        await fetchParsedAddress(context, domain, ticker);
-      },
-    ));
+                exchangeViewModel.changeDepositCurrency(currency: currency);
+              },
+              imageArrow: arrowBottomPurple,
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor: Theme.of(context).focusColor,
+              borderColor: Theme.of(context).primaryTextTheme.bodyLarge!.color!,
+              currencyValueValidator: (value) {
+                return !exchangeViewModel.isFixedRateMode
+                    ? AmountValidator(
+                        isAutovalidate: true,
+                        currency: exchangeViewModel.depositCurrency,
+                        minValue: exchangeViewModel.limits.min.toString(),
+                        maxValue: exchangeViewModel.limits.max.toString(),
+                      ).call(value)
+                    : null;
+              },
+              addressTextFieldValidator: AddressValidator(type: exchangeViewModel.depositCurrency),
+              onPushPasteButton: (context) async {
+                final domain = exchangeViewModel.depositAddress;
+                final ticker = exchangeViewModel.depositCurrency.title.toLowerCase();
+                exchangeViewModel.depositAddress =
+                    await fetchParsedAddress(context, domain, ticker);
+              },
+              onPushAddressBookButton: (context) async {
+                final domain = exchangeViewModel.depositAddress;
+                final ticker = exchangeViewModel.depositCurrency.title.toLowerCase();
+                exchangeViewModel.depositAddress =
+                    await fetchParsedAddress(context, domain, ticker);
+              },
+            ));
 
-    final secondExchangeCard = Observer(builder: (_) => ExchangeCard(
-      onDispose: disposeBestRateSync,
-      amountFocusNode: _receiveAmountFocus,
-      addressFocusNode: _receiveAddressFocus,
-      key: receiveKey,
-      title: S.of(context).you_will_get,
-      initialCurrency: exchangeViewModel.receiveCurrency,
-      initialWalletName: receiveWalletName ?? '',
-      initialAddress:
-      exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
-          ? exchangeViewModel.wallet.walletAddresses.address
-          : exchangeViewModel.receiveAddress,
-      initialIsAmountEditable: exchangeViewModel.isReceiveAmountEditable,
-      initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
-      isAmountEstimated: true,
-      isMoneroWallet: exchangeViewModel.isMoneroWallet,
-      currencies: exchangeViewModel.receiveCurrencies,
-      onCurrencySelected: (currency) =>
-          exchangeViewModel.changeReceiveCurrency(currency: currency),
-      imageArrow: arrowBottomCakeGreen,
-      currencyButtonColor: Colors.transparent,
-      addressButtonsColor: Theme.of(context).focusColor!,
-      borderColor:
-      Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
-      currencyValueValidator: (value) {
-        return exchangeViewModel.isFixedRateMode
-            ? AmountValidator(
-                isAutovalidate: true,
-                currency: exchangeViewModel.receiveCurrency,
-                minValue: exchangeViewModel.limits.min.toString(),
-                maxValue: exchangeViewModel.limits.max.toString(),
-              ).call(value)
-            : null;
-      },
-      addressTextFieldValidator:
-      AddressValidator(type: exchangeViewModel.receiveCurrency),
-      onPushPasteButton: (context) async {
-        final domain = exchangeViewModel.receiveAddress;
-        final ticker = exchangeViewModel.receiveCurrency.title.toLowerCase();
-        exchangeViewModel.receiveAddress =
-        await fetchParsedAddress(context, domain, ticker);
-      },
-      onPushAddressBookButton: (context) async {
-        final domain = exchangeViewModel.receiveAddress;
-        final ticker = exchangeViewModel.receiveCurrency.title.toLowerCase();
-        exchangeViewModel.receiveAddress =
-        await fetchParsedAddress(context, domain, ticker);
-      },
-    ));
+    final secondExchangeCard = Observer(
+        builder: (_) => ExchangeCard(
+              onDispose: disposeBestRateSync,
+              amountFocusNode: _receiveAmountFocus,
+              addressFocusNode: _receiveAddressFocus,
+              key: receiveKey,
+              title: S.of(context).you_will_get,
+              initialCurrency: exchangeViewModel.receiveCurrency,
+              initialWalletName: receiveWalletName ?? '',
+              initialAddress: exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
+                  ? exchangeViewModel.wallet.walletAddresses.address
+                  : exchangeViewModel.receiveAddress,
+              initialIsAmountEditable: exchangeViewModel.isReceiveAmountEditable,
+              initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
+              isAmountEstimated: true,
+              isMoneroWallet: exchangeViewModel.isMoneroWallet,
+              currencies: exchangeViewModel.receiveCurrencies,
+              onCurrencySelected: (currency) =>
+                  exchangeViewModel.changeReceiveCurrency(currency: currency),
+              imageArrow: arrowBottomCakeGreen,
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor: Theme.of(context).focusColor,
+              borderColor: Theme.of(context).primaryTextTheme.bodyLarge!.decorationColor!,
+              currencyValueValidator: (value) {
+                return exchangeViewModel.isFixedRateMode
+                    ? AmountValidator(
+                        isAutovalidate: true,
+                        currency: exchangeViewModel.receiveCurrency,
+                        minValue: exchangeViewModel.limits.min.toString(),
+                        maxValue: exchangeViewModel.limits.max.toString(),
+                      ).call(value)
+                    : null;
+              },
+              addressTextFieldValidator: AddressValidator(type: exchangeViewModel.receiveCurrency),
+              onPushPasteButton: (context) async {
+                final domain = exchangeViewModel.receiveAddress;
+                final ticker = exchangeViewModel.receiveCurrency.title.toLowerCase();
+                exchangeViewModel.receiveAddress =
+                    await fetchParsedAddress(context, domain, ticker);
+              },
+              onPushAddressBookButton: (context) async {
+                final domain = exchangeViewModel.receiveAddress;
+                final ticker = exchangeViewModel.receiveCurrency.title.toLowerCase();
+                exchangeViewModel.receiveAddress =
+                    await fetchParsedAddress(context, domain, ticker);
+              },
+            ));
 
     if (ResponsiveLayoutUtil.instance.isMobile) {
       return MobileExchangeCardsSection(

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

@@ -511,17 +511,16 @@ class ExchangeCardState extends State<ExchangeCard> {
 
   void _presentPicker(BuildContext context) {
     showPopUp<void>(
-        builder: (_) => CurrencyPicker(
-            selectedAtIndex: widget.currencies.indexOf(_selectedCurrency),
-            items: widget.currencies,
-            hintText: S.of(context).search_currency,
-            isMoneroWallet: _isMoneroWallet,
-            isConvertFrom: widget.hasRefundAddress,
-            onItemSelected: (Currency item) =>
-                widget.onCurrencySelected != null
-                    ? widget.onCurrencySelected(item as CryptoCurrency)
-                    : null),
-        context: context);
+      context: context,
+      builder: (_) => CurrencyPicker(
+        selectedAtIndex: widget.currencies.indexOf(_selectedCurrency),
+        items: widget.currencies,
+        hintText: S.of(context).search_currency,
+        isMoneroWallet: _isMoneroWallet,
+        isConvertFrom: widget.hasRefundAddress,
+        onItemSelected: (Currency item) => widget.onCurrencySelected(item as CryptoCurrency),
+      ),
+    );
   }
 
   void _showAmountPopup(BuildContext context, PaymentRequest paymentRequest) {