Merge branch 'main' into CW-436-Replace-images-with-SVGs

.github/workflows/pr_test_build.yml

@@ -42,6 +42,7 @@ jobs:
           cd cake_wallet/scripts/android/
           ./install_ndk.sh
           source ./app_env.sh cakewallet
+          chmod +x pubspec_gen.sh
           ./app_config.sh
 
       - name: Cache Externals
@@ -92,6 +93,7 @@ jobs:
           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 ..
+          cd cw_bitcoin_cash && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           cd cw_nano && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
           flutter packages pub run build_runner build --delete-conflicting-outputs
 
@@ -141,18 +143,18 @@ jobs:
           cd /opt/android/cake_wallet
           flutter build apk --release
 
-      #      - name: Push to App Center
+#            - name: Push to App Center
-      #        run: |
+#              run: |
-      #          echo 'Installing App Center CLI tools'
+#                echo 'Installing App Center CLI tools'
-      #          npm install -g appcenter-cli
+#                npm install -g appcenter-cli
-      #          echo "Publishing test to App Center"
+#                echo "Publishing test to App Center"
-      #          appcenter distribute release \
+#                appcenter distribute release \
-      #              --group "Testers" \
+#                    --group "Testers" \
-      #              --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
+#                    --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
-      #              --release-notes ${GITHUB_HEAD_REF} \
+#                    --release-notes ${GITHUB_HEAD_REF} \
-      #              --app Cake-Labs/Cake-Wallet \
+#                    --app Cake-Labs/Cake-Wallet \
-      #              --token ${{ secrets.APP_CENTER_TOKEN }} \
+#                    --token ${{ secrets.APP_CENTER_TOKEN }} \
-      #              --quiet
+#                    --quiet
 
       - name: Rename apk file
         run: |

.gitignore

@@ -124,6 +124,7 @@ lib/bitcoin/bitcoin.dart
 lib/monero/monero.dart
 lib/haven/haven.dart
 lib/ethereum/ethereum.dart
+lib/bitcoin_cash/bitcoin_cash.dart
 lib/nano/nano.dart
 
 ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png

android/app/src/main/AndroidManifestBase.xml

@@ -52,6 +52,15 @@
                 <data android:scheme="litecoin" />
                 <data android:scheme="litecoin-wallet" />
                 <data android:scheme="litecoin_wallet" />
+                <data android:scheme="ethereum" />
+                <data android:scheme="ethereum-wallet" />
+                <data android:scheme="ethereum_wallet" />
+                <data android:scheme="nano" />
+                <data android:scheme="nano-wallet" />
+                <data android:scheme="nano_wallet" />
+                <data android:scheme="bitcoincash" />
+                <data android:scheme="bitcoincash-wallet" />
+                <data android:scheme="bitcoincash_wallet" />
             </intent-filter>
         </activity>
         <meta-data

android/gradle.properties

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

assets/bitcoin_cash_electrum_server_list.yml

@@ -0,0 +1,3 @@
+-
+  uri: bitcoincash.stackwallet.com:50002
+  is_default: true

assets/node_list.yml

@@ -5,7 +5,8 @@
   uri: cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081
   is_default: false
 -
-  uri: node.sethforprivacy.com:18089
+  uri: node.sethforprivacy.com:443
+  useSSL: true
   is_default: false
 -
   uri: nodes.hashvault.pro:18081

assets/text/Monerocom_Release_Notes.txt

@@ -1,3 +1,3 @@
-Fix 2FA code issue
+Support getting Addresses from ENS and Mastodon
 Bug fixes
 Minor enhancements

assets/text/Release_Notes.txt

@@ -1,4 +1,3 @@
-Ethereum enhancements and bug fixes
+Add BitcoinCash (BCH)
-Fix 2FA code issue
 Bug fixes
-Minor enhancements
+Accessibility enhancements

configure_cake_wallet_android.sh

@@ -8,4 +8,5 @@ cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build
 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 ..
 cd cw_nano && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+cd cw_bitcoin_cash && 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/bitcoin_transaction_priority.dart

@@ -1,5 +1,4 @@
 import 'package:cw_core/transaction_priority.dart';
-//import 'package:cake_wallet/generated/i18n.dart';
 
 class BitcoinTransactionPriority extends TransactionPriority {
   const BitcoinTransactionPriority({required String title, required int raw})
@@ -100,4 +99,55 @@ class LitecoinTransactionPriority extends BitcoinTransactionPriority {
 
     return label;
   }
+
 }
+class BitcoinCashTransactionPriority extends BitcoinTransactionPriority {
+  const BitcoinCashTransactionPriority({required String title, required int raw})
+      : super(title: title, raw: raw);
+
+  static const List<BitcoinCashTransactionPriority> all = [fast, medium, slow];
+  static const BitcoinCashTransactionPriority slow =
+  BitcoinCashTransactionPriority(title: 'Slow', raw: 0);
+  static const BitcoinCashTransactionPriority medium =
+  BitcoinCashTransactionPriority(title: 'Medium', raw: 1);
+  static const BitcoinCashTransactionPriority fast =
+  BitcoinCashTransactionPriority(title: 'Fast', raw: 2);
+
+  static BitcoinCashTransactionPriority 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 BitcoinCashTransactionPriority deserialize');
+    }
+  }
+
+  @override
+  String get units => 'Satoshi';
+
+  @override
+  String toString() {
+    var label = '';
+
+    switch (this) {
+      case BitcoinCashTransactionPriority.slow:
+        label = 'Slow'; // S.current.transaction_priority_slow;
+        break;
+      case BitcoinCashTransactionPriority.medium:
+        label = 'Medium'; // S.current.transaction_priority_medium;
+        break;
+      case BitcoinCashTransactionPriority.fast:
+        label = 'Fast'; // S.current.transaction_priority_fast;
+        break;
+      default:
+        break;
+    }
+
+    return label;
+  }
+}
+

cw_bitcoin/lib/bitcoin_unspent.dart

@@ -1,24 +1,15 @@
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_core/unspent_transaction_output.dart';
 
-class BitcoinUnspent {
+class BitcoinUnspent extends Unspent {
-  BitcoinUnspent(this.address, this.hash, this.value, this.vout)
+  BitcoinUnspent(BitcoinAddressRecord addressRecord, String hash, int value, int vout)
-      : isSending = true,
+      : bitcoinAddressRecord = addressRecord,
-        isFrozen = false,
+        super(addressRecord.address, hash, value, vout, null);
-        note = '';
 
   factory BitcoinUnspent.fromJSON(
-          BitcoinAddressRecord address, Map<String, dynamic> json) =>
+      BitcoinAddressRecord address, Map<String, dynamic> json) =>
       BitcoinUnspent(address, json['tx_hash'] as String, json['value'] as int,
           json['tx_pos'] as int);
 
-  final BitcoinAddressRecord address;
+  final BitcoinAddressRecord bitcoinAddressRecord;
-  final String hash;
-  final int value;
-  final int vout;
-
-  bool get isP2wpkh =>
-      address.address.startsWith('bc') || address.address.startsWith('ltc');
-  bool isSending;
-  bool isFrozen;
-  String note;
 }

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -1,39 +1,34 @@
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cw_bitcoin/electrum.dart';
-import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/electrum.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
+import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/wallet_info.dart';
-import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 
 part 'bitcoin_wallet_addresses.g.dart';
 
-class BitcoinWalletAddresses = BitcoinWalletAddressesBase
+class BitcoinWalletAddresses = BitcoinWalletAddressesBase with _$BitcoinWalletAddresses;
-    with _$BitcoinWalletAddresses;
 
-abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses
+abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with Store {
-    with Store {
+  BitcoinWalletAddressesBase(WalletInfo walletInfo,
-  BitcoinWalletAddressesBase(
-      WalletInfo walletInfo,
       {required bitcoin.HDWallet mainHd,
-        required bitcoin.HDWallet sideHd,
+      required bitcoin.HDWallet sideHd,
-        required bitcoin.NetworkType networkType,
+      required bitcoin.NetworkType networkType,
-        required ElectrumClient electrumClient,
+      required ElectrumClient electrumClient,
-        List<BitcoinAddressRecord>? initialAddresses,
+      List<BitcoinAddressRecord>? initialAddresses,
-        int initialRegularAddressIndex = 0,
+      int initialRegularAddressIndex = 0,
-        int initialChangeAddressIndex = 0})
+      int initialChangeAddressIndex = 0})
-      : super(
+      : super(walletInfo,
-        walletInfo,
+            initialAddresses: initialAddresses,
-        initialAddresses: initialAddresses,
+            initialRegularAddressIndex: initialRegularAddressIndex,
-        initialRegularAddressIndex: initialRegularAddressIndex,
+            initialChangeAddressIndex: initialChangeAddressIndex,
-        initialChangeAddressIndex: initialChangeAddressIndex,
+            mainHd: mainHd,
-        mainHd: mainHd,
+            sideHd: sideHd,
-        sideHd: sideHd,
+            electrumClient: electrumClient,
-        electrumClient: electrumClient,
+            networkType: networkType);
-        networkType: networkType);
 
   @override
   String getAddress({required int index, required bitcoin.HDWallet hd}) =>
       generateP2WPKHAddress(hd: hd, index: index, networkType: networkType);
-}
+}

cw_bitcoin/lib/electrum_wallet.dart

@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
+import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:hive/hive.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
 import 'package:mobx/mobx.dart';
@@ -34,45 +36,52 @@ import 'package:cw_bitcoin/electrum.dart';
 import 'package:hex/hex.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:collection/collection.dart';
+import 'package:bip32/bip32.dart';
 
 part 'electrum_wallet.g.dart';
 
 class ElectrumWallet = ElectrumWalletBase with _$ElectrumWallet;
 
-abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
+abstract class ElectrumWalletBase
-    ElectrumTransactionHistory, ElectrumTransactionInfo> with Store {
+    extends WalletBase<ElectrumBalance, ElectrumTransactionHistory, ElectrumTransactionInfo>
+    with Store {
   ElectrumWalletBase(
       {required String password,
-      required WalletInfo walletInfo,
+        required WalletInfo walletInfo,
-      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+        required Box<UnspentCoinsInfo> unspentCoinsInfo,
-      required this.networkType,
+        required this.networkType,
-      required this.mnemonic,
+        required this.mnemonic,
-      required Uint8List seedBytes,
+        required Uint8List seedBytes,
-      List<BitcoinAddressRecord>? initialAddresses,
+        List<BitcoinAddressRecord>? initialAddresses,
-      ElectrumClient? electrumClient,
+        ElectrumClient? electrumClient,
-      ElectrumBalance? initialBalance,
+        ElectrumBalance? initialBalance,
-      CryptoCurrency? currency})
+        CryptoCurrency? currency})
-      : hd = bitcoin.HDWallet.fromSeed(seedBytes, network: networkType)
+      : hd = currency == CryptoCurrency.bch
-            .derivePath("m/0'/0"),
+      ? bitcoinCashHDWallet(seedBytes)
+      : bitcoin.HDWallet.fromSeed(seedBytes, network: networkType).derivePath("m/0'/0"),
         syncStatus = NotConnectedSyncStatus(),
         _password = password,
         _feeRates = <int>[],
         _isTransactionUpdating = false,
         unspentCoins = [],
         _scripthashesUpdateSubject = {},
-        balance = ObservableMap<CryptoCurrency, ElectrumBalance>.of(
+        balance = ObservableMap<CryptoCurrency, ElectrumBalance>.of(currency != null
-          currency != null
+            ? {
-           ? {currency: initialBalance ?? const ElectrumBalance(confirmed: 0, unconfirmed: 0,
+          currency:
-          frozen: 0)}
+          initialBalance ?? const ElectrumBalance(confirmed: 0, unconfirmed: 0, frozen: 0)
-           : {}),
+        }
+            : {}),
         this.unspentCoinsInfo = unspentCoinsInfo,
         super(walletInfo) {
     this.electrumClient = electrumClient ?? ElectrumClient();
     this.walletInfo = walletInfo;
-    transactionHistory =
+    transactionHistory = ElectrumTransactionHistory(walletInfo: walletInfo, password: password);
-        ElectrumTransactionHistory(walletInfo: walletInfo, password: password);
   }
 
+  static bitcoin.HDWallet bitcoinCashHDWallet(Uint8List seedBytes) =>
+      bitcoin.HDWallet.fromSeed(seedBytes)
+          .derivePath("m/44'/145'/0'/0");
+
   static int estimatedTransactionSize(int inputsCount, int outputsCounts) =>
       inputsCount * 146 + outputsCounts * 33 + 8;
 
@@ -98,9 +107,9 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       .toList();
 
   List<String> get publicScriptHashes => walletAddresses.addresses
-    .where((addr) => !addr.isHidden)
+      .where((addr) => !addr.isHidden)
-    .map((addr) => scriptHash(addr.address, networkType: networkType))
+      .map((addr) => scriptHash(addr.address, networkType: networkType))
-    .toList();
+      .toList();
 
   String get xpub => hd.base58!;
 
@@ -110,8 +119,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   bitcoin.NetworkType networkType;
 
   @override
-  BitcoinWalletKeys get keys => BitcoinWalletKeys(
+  BitcoinWalletKeys get keys =>
-      wif: hd.wif!, privateKey: hd.privKey!, publicKey: hd.pubKey!);
+      BitcoinWalletKeys(wif: hd.wif!, privateKey: hd.privKey!, publicKey: hd.pubKey!);
 
   String _password;
   List<BitcoinUnspent> unspentCoins;
@@ -139,8 +148,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       await updateBalance();
       _feeRates = await electrumClient.feeRates();
 
-      Timer.periodic(const Duration(minutes: 1),
+      Timer.periodic(
-          (timer) async => _feeRates = await electrumClient.feeRates());
+          const Duration(minutes: 1), (timer) async => _feeRates = await electrumClient.feeRates());
 
       syncStatus = SyncedSyncStatus();
     } catch (e, stacktrace) {
@@ -169,8 +178,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   }
 
   @override
-  Future<PendingBitcoinTransaction> createTransaction(
+  Future<PendingTransaction> createTransaction(Object credentials) async {
-      Object credentials) async {
     const minAmount = 546;
     final transactionCredentials = credentials as BitcoinTransactionCredentials;
     final inputs = <BitcoinUnspent>[];
@@ -204,13 +212,11 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     var fee = 0;
 
     if (hasMultiDestination) {
-      if (outputs.any((item) => item.sendAll
+      if (outputs.any((item) => item.sendAll || item.formattedCryptoAmount! <= 0)) {
-          || item.formattedCryptoAmount! <= 0)) {
         throw BitcoinTransactionWrongBalanceException(currency);
       }
 
-      credentialsAmount = outputs.fold(0, (acc, value) =>
+      credentialsAmount = outputs.fold(0, (acc, value) => acc + value.formattedCryptoAmount!);
-          acc + value.formattedCryptoAmount!);
 
       if (allAmount - credentialsAmount < minAmount) {
         throw BitcoinTransactionWrongBalanceException(currency);
@@ -227,9 +233,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
     } else {
       final output = outputs.first;
-      credentialsAmount = !output.sendAll
+      credentialsAmount = !output.sendAll ? output.formattedCryptoAmount! : 0;
-          ? output.formattedCryptoAmount!
-          : 0;
 
       if (credentialsAmount > allAmount) {
         throw BitcoinTransactionWrongBalanceException(currency);
@@ -291,8 +295,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
         final p2wpkh = bitcoin
             .P2WPKH(
             data: generatePaymentData(
-              hd: input.address.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
+                hd: input.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
-              index: input.address.index),
+                index: input.bitcoinAddressRecord.index),
             network: networkType)
             .data;
 
@@ -303,19 +307,12 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     });
 
     outputs.forEach((item) {
-      final outputAmount = hasMultiDestination
+      final outputAmount = hasMultiDestination ? item.formattedCryptoAmount : amount;
-          ? item.formattedCryptoAmount
+      final outputAddress = item.isParsedAddress ? item.extractedAddress! : item.address;
-          : amount;
+      txb.addOutput(addressToOutputScript(outputAddress, networkType), outputAmount!);
-      final outputAddress = item.isParsedAddress
-          ? item.extractedAddress!
-          : item.address;
-      txb.addOutput(
-          addressToOutputScript(outputAddress, networkType),
-          outputAmount!);
     });
 
-    final estimatedSize =
+    final estimatedSize = estimatedTransactionSize(inputs.length, outputs.length + 1);
-      estimatedTransactionSize(inputs.length, outputs.length + 1);
     var feeAmount = 0;
 
     if (transactionCredentials.feeRate != null) {
@@ -333,8 +330,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     for (var i = 0; i < inputs.length; i++) {
       final input = inputs[i];
       final keyPair = generateKeyPair(
-          hd: input.address.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
+          hd: input.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
-          index: input.address.index,
+          index: input.bitcoinAddressRecord.index,
           network: networkType);
       final witnessValue = input.isP2wpkh ? input.value : null;
 
@@ -350,12 +347,12 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   }
 
   String toJSON() => json.encode({
-        'mnemonic': mnemonic,
+    'mnemonic': mnemonic,
-        'account_index': walletAddresses.currentReceiveAddressIndex.toString(),
+    'account_index': walletAddresses.currentReceiveAddressIndex.toString(),
-        'change_address_index': walletAddresses.currentChangeAddressIndex.toString(),
+    'change_address_index': walletAddresses.currentChangeAddressIndex.toString(),
-        'addresses': walletAddresses.addresses.map((addr) => addr.toJSON()).toList(),
+    'addresses': walletAddresses.addresses.map((addr) => addr.toJSON()).toList(),
-        'balance': balance[currency]?.toJSON()
+    'balance': balance[currency]?.toJSON()
-      });
+  });
 
   int feeRate(TransactionPriority priority) {
     try {
@@ -364,34 +361,29 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
 
       return 0;
-    } catch(_) {
+    } catch (_) {
       return 0;
     }
   }
 
-  int feeAmountForPriority(BitcoinTransactionPriority priority, int inputsCount,
+  int feeAmountForPriority(
-          int outputsCount) =>
+      BitcoinTransactionPriority priority, int inputsCount, int outputsCount) =>
       feeRate(priority) * estimatedTransactionSize(inputsCount, outputsCount);
 
-  int feeAmountWithFeeRate(int feeRate, int inputsCount,
+  int feeAmountWithFeeRate(int feeRate, int inputsCount, int outputsCount) =>
-          int outputsCount) =>
       feeRate * estimatedTransactionSize(inputsCount, outputsCount);
 
   @override
-  int calculateEstimatedFee(TransactionPriority? priority, int? amount,
+  int calculateEstimatedFee(TransactionPriority? priority, int? amount, {int? outputsCount}) {
-    {int? outputsCount}) {
     if (priority is BitcoinTransactionPriority) {
-      return calculateEstimatedFeeWithFeeRate(
+      return calculateEstimatedFeeWithFeeRate(feeRate(priority), amount,
-        feeRate(priority),
+          outputsCount: outputsCount);
-        amount,
-        outputsCount: outputsCount);
     }
 
     return 0;
   }
 
-  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount,
+  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount, {int? outputsCount}) {
-  {int? outputsCount}) {
     int inputsCount = 0;
 
     if (amount != null) {
@@ -420,8 +412,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     // If send all, then we have no change value
     final _outputsCount = outputsCount ?? (amount != null ? 2 : 1);
 
-    return feeAmountWithFeeRate(
+    return feeAmountWithFeeRate(feeRate, inputsCount, _outputsCount);
-        feeRate, inputsCount, _outputsCount);
   }
 
   @override
@@ -436,8 +427,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type);
     final currentWalletFile = File(currentWalletPath);
 
-    final currentDirPath =
+    final currentDirPath = await pathForWalletDir(name: walletInfo.name, type: type);
-        await pathForWalletDir(name: walletInfo.name, type: type);
     final currentTransactionsFile = File('$currentDirPath/$transactionsHistoryFileName');
 
     // Copies current wallet files into new wallet name's dir and files
@@ -474,21 +464,20 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     } catch (_) {}
   }
 
-  Future<String> makePath() async =>
+  Future<String> makePath() async => pathForWallet(name: walletInfo.name, type: walletInfo.type);
-      pathForWallet(name: walletInfo.name, type: walletInfo.type);
 
   Future<void> updateUnspent() async {
     final unspent = await Future.wait(walletAddresses
         .addresses.map((address) => electrumClient
         .getListUnspentWithAddress(address.address, networkType)
         .then((unspent) => unspent
-            .map((unspent) {
+        .map((unspent) {
-              try {
+      try {
-                return BitcoinUnspent.fromJSON(address, unspent);
+        return BitcoinUnspent.fromJSON(address, unspent);
-              } catch(_) {
+      } catch(_) {
-                return null;
+        return null;
-              }
+      }
-            }).whereNotNull())));
+    }).whereNotNull())));
     unspentCoins = unspent.expand((e) => e).toList();
 
     if (unspentCoinsInfo.isEmpty) {
@@ -498,8 +487,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
     if (unspentCoins.isNotEmpty) {
       unspentCoins.forEach((coin) {
-        final coinInfoList = unspentCoinsInfo.values.where((element) =>
+        final coinInfoList = unspentCoinsInfo.values
-          element.walletId.contains(id) && element.hash.contains(coin.hash));
+            .where((element) => element.walletId.contains(id) && element.hash.contains(coin.hash));
 
         if (coinInfoList.isNotEmpty) {
           final coinInfo = coinInfoList.first;
@@ -518,14 +507,14 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
   Future<void> _addCoinInfo(BitcoinUnspent coin) async {
     final newInfo = UnspentCoinsInfo(
-        walletId: id,
+      walletId: id,
-        hash: coin.hash,
+      hash: coin.hash,
-        isFrozen: coin.isFrozen,
+      isFrozen: coin.isFrozen,
-        isSending: coin.isSending,
+      isSending: coin.isSending,
-        noteRaw: coin.note,
+      noteRaw: coin.note,
-        address: coin.address.address,
+      address: coin.bitcoinAddressRecord.address,
-        value: coin.value,
+      value: coin.value,
-        vout: coin.vout,
+      vout: coin.vout,
     );
 
     await unspentCoinsInfo.add(newInfo);
@@ -534,8 +523,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   Future<void> _refreshUnspentCoinsInfo() async {
     try {
       final List<dynamic> keys = <dynamic>[];
-      final currentWalletUnspentCoins = unspentCoinsInfo.values
+      final currentWalletUnspentCoins =
-          .where((element) => element.walletId.contains(id));
+      unspentCoinsInfo.values.where((element) => element.walletId.contains(id));
 
       if (currentWalletUnspentCoins.isNotEmpty) {
         currentWalletUnspentCoins.forEach((element) {
@@ -571,27 +560,19 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       ins.add(tx);
     }
 
-    return ElectrumTransactionBundle(
+    return ElectrumTransactionBundle(original, ins: ins, time: time, confirmations: confirmations);
-      original,
-      ins: ins,
-      time: time,
-      confirmations: confirmations);
   }
 
   Future<ElectrumTransactionInfo?> fetchTransactionInfo(
       {required String hash, required int height}) async {
-        try {
+    try {
-    final tx = await getTransactionExpanded(hash: hash, height: height);
+      final tx = await getTransactionExpanded(hash: hash, height: height);
-    final addresses = walletAddresses.addresses.map((addr) => addr.address).toSet();
+      final addresses = walletAddresses.addresses.map((addr) => addr.address).toSet();
-    return ElectrumTransactionInfo.fromElectrumBundle(
+      return ElectrumTransactionInfo.fromElectrumBundle(tx, walletInfo.type, networkType,
-      tx,
+          addresses: addresses, height: height);
-      walletInfo.type,
+    } catch (_) {
-      networkType,
+      return null;
-      addresses: addresses,
+    }
-      height: height);
-      } catch(_) {
-        return null;
-      }
   }
 
   @override
@@ -602,10 +583,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       final sh = scriptHash(addressRecord.address, networkType: networkType);
       addressHashes[sh] = addressRecord;
     });
-    final histories =
+    final histories = addressHashes.keys.map((scriptHash) =>
-        addressHashes.keys.map((scriptHash) => electrumClient
+        electrumClient.getHistory(scriptHash).then((history) => {scriptHash: history}));
-          .getHistory(scriptHash)
-          .then((history) => {scriptHash: history}));
     final historyResults = await Future.wait(histories);
     historyResults.forEach((history) {
       history.entries.forEach((historyItem) {
@@ -616,19 +595,16 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
         }
       });
     });
-    final historiesWithDetails = await Future.wait(
+    final historiesWithDetails = await Future.wait(normalizedHistories.map((transaction) {
-      normalizedHistories
+      try {
-        .map((transaction) {
+        return fetchTransactionInfo(
-          try {
+            hash: transaction['tx_hash'] as String, height: transaction['height'] as int);
-            return fetchTransactionInfo(
+      } catch (_) {
-              hash: transaction['tx_hash'] as String,
+        return Future.value(null);
-              height: transaction['height'] as int);
+      }
-          } catch(_) {
+    }));
-            return Future.value(null);
+    return historiesWithDetails
-          }
+        .fold<Map<String, ElectrumTransactionInfo>>(<String, ElectrumTransactionInfo>{}, (acc, tx) {
-        }));
-    return historiesWithDetails.fold<Map<String, ElectrumTransactionInfo>>(
-        <String, ElectrumTransactionInfo>{}, (acc, tx) {
       if (tx == null) {
         return acc;
       }
@@ -680,9 +656,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   Future<ElectrumBalance> _fetchBalances() async {
     final addresses = walletAddresses.addresses.toList();
     final balanceFutures = <Future<Map<String, dynamic>>>[];
-
     for (var i = 0; i < addresses.length; i++) {
-      final addressRecord = addresses[i];
+      final addressRecord = addresses[i] ;
       final sh = scriptHash(addressRecord.address, networkType: networkType);
       final balanceFuture = electrumClient.getBalance(sh);
       balanceFutures.add(balanceFuture);
@@ -691,8 +666,10 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
     var totalFrozen = 0;
     unspentCoinsInfo.values.forEach((info) {
       unspentCoins.forEach((element) {
-        if (element.hash == info.hash && info.isFrozen && element.address.address == info.address
+        if (element.hash == info.hash &&
-            && element.value == info.value) {
+            info.isFrozen &&
+            element.bitcoinAddressRecord.address == info.address &&
+            element.value == info.value) {
           totalFrozen += element.value;
         }
       });
@@ -715,8 +692,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
       }
     }
 
-    return ElectrumBalance(confirmed: totalConfirmed, unconfirmed: totalUnconfirmed,
+    return ElectrumBalance(
-    frozen: totalFrozen);
+        confirmed: totalConfirmed, unconfirmed: totalUnconfirmed, frozen: totalFrozen);
   }
 
   Future<void> updateBalance() async {
@@ -727,9 +704,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   String getChangeAddress() {
     const minCountOfHiddenAddresses = 5;
     final random = Random();
-    var addresses = walletAddresses.addresses
+    var addresses = walletAddresses.addresses.where((addr) => addr.isHidden).toList();
-      .where((addr) => addr.isHidden)
-      .toList();
 
     if (addresses.length < minCountOfHiddenAddresses) {
       addresses = walletAddresses.addresses.toList();

cw_bitcoin/lib/electrum_wallet_addresses.dart

@@ -1,9 +1,11 @@
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:bitbox/bitbox.dart' as bitbox;
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/electrum.dart';
 import 'package:cw_bitcoin/script_hash.dart';
 import 'package:cw_core/wallet_addresses.dart';
 import 'package:cw_core/wallet_info.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 
 part 'electrum_wallet_addresses.g.dart';
@@ -38,6 +40,8 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   static const defaultChangeAddressesCount = 17;
   static const gap = 20;
 
+  static String toCashAddr(String address) => bitbox.Address.toCashAddress(address);
+
   final ObservableList<BitcoinAddressRecord> addresses;
   final ObservableList<BitcoinAddressRecord> receiveAddresses;
   final ObservableList<BitcoinAddressRecord> changeAddresses;
@@ -50,10 +54,12 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   @computed
   String get address {
     if (receiveAddresses.isEmpty) {
-      return generateNewAddress().address;
+      final address = generateNewAddress().address;
+      return walletInfo.type == WalletType.bitcoinCash ? toCashAddr(address) : address;
     }
+    final receiveAddress = receiveAddresses.first.address;
 
-    return receiveAddresses.first.address;
+    return walletInfo.type == WalletType.bitcoinCash ? toCashAddr(receiveAddress) : receiveAddress;
   }
 
   @override
@@ -105,10 +111,9 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   @action
   Future<String> getChangeAddress() async {
     updateChangeAddresses();
-    
+
     if (changeAddresses.isEmpty) {
-      final newAddresses = await _createNewAddresses(
+      final newAddresses = await _createNewAddresses(gap,
-        gap,
         hd: sideHd,
         startIndex: totalCountOfChangeAddresses > 0
           ? totalCountOfChangeAddresses -  1
@@ -179,7 +184,7 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
     } else {
       addrs = await _createNewAddresses(
           isHidden
-            ? defaultChangeAddressesCount
+            ?  defaultChangeAddressesCount
             : defaultReceiveAddressesCount,
           startIndex: 0,
           hd: hd,

cw_bitcoin/pubspec.lock

@@ -66,6 +66,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
+  bitbox:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: master
+      resolved-ref: ea65073efbaf395a5557e8cd7bd72f195cd7eb11
+      url: "https://github.com/cake-tech/bitbox-flutter.git"
+    source: git
+    version: "1.0.1"
   bitcoin_flutter:
     dependency: "direct main"
     description:

cw_bitcoin/pubspec.yaml

@@ -23,6 +23,10 @@ dependencies:
     git:
       url: https://github.com/cake-tech/bitcoin_flutter.git
       ref: cake-update-v3
+  bitbox:
+    git:
+      url: https://github.com/cake-tech/bitbox-flutter.git
+      ref: master
   rxdart: ^0.27.5
   unorm_dart: ^0.2.0
   cryptography: ^2.0.5

cw_bitcoin_cash/.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_bitcoin_cash/.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: b06b8b2710955028a6b562f5aa6fe62941d6febf
+  channel: stable
+
+project_type: package

cw_bitcoin_cash/CHANGELOG.md

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

cw_bitcoin_cash/LICENSE

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

cw_bitcoin_cash/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_bitcoin_cash/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_bitcoin_cash/lib/cw_bitcoin_cash.dart

@@ -0,0 +1,9 @@
+library cw_bitcoin_cash;
+
+export 'src/bitcoin_cash_base.dart';
+
+/// A Calculator.
+class Calculator {
+  /// Returns [value] plus 1.
+  int addOne(int value) => value + 1;
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_address_utils.dart

@@ -0,0 +1,5 @@
+import 'package:bitbox/bitbox.dart' as bitbox;
+
+class AddressUtils {
+  static String getCashAddrFormat(String address) => bitbox.Address.toCashAddress(address);
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_base.dart

@@ -0,0 +1,7 @@
+export 'bitcoin_cash_wallet.dart';
+export 'bitcoin_cash_wallet_addresses.dart';
+export 'bitcoin_cash_wallet_creation_credentials.dart';
+export 'bitcoin_cash_wallet_service.dart';
+export 'exceptions/exceptions.dart';
+export 'mnemonic.dart';
+export 'bitcoin_cash_address_utils.dart';

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart

@@ -0,0 +1,297 @@
+import 'package:bitbox/bitbox.dart' as bitbox;
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
+import 'package:cw_bitcoin/bitcoin_transaction_wrong_balance_exception.dart';
+import 'package:cw_bitcoin/bitcoin_unspent.dart';
+import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_wallet.dart';
+import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
+import 'package:cw_bitcoin_cash/src/pending_bitcoin_cash_transaction.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/transaction_priority.dart';
+import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:flutter/foundation.dart';
+import 'package:hive/hive.dart';
+import 'package:mobx/mobx.dart';
+
+import 'bitcoin_cash_base.dart';
+
+part 'bitcoin_cash_wallet.g.dart';
+
+class BitcoinCashWallet = BitcoinCashWalletBase with _$BitcoinCashWallet;
+
+abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
+  BitcoinCashWalletBase(
+      {required String mnemonic,
+      required String password,
+      required WalletInfo walletInfo,
+      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      required Uint8List seedBytes,
+      List<BitcoinAddressRecord>? initialAddresses,
+      ElectrumBalance? initialBalance,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0})
+      : super(
+            mnemonic: mnemonic,
+            password: password,
+            walletInfo: walletInfo,
+            unspentCoinsInfo: unspentCoinsInfo,
+            networkType: bitcoin.bitcoin,
+            initialAddresses: initialAddresses,
+            initialBalance: initialBalance,
+            seedBytes: seedBytes,
+            currency: CryptoCurrency.bch) {
+    walletAddresses = BitcoinCashWalletAddresses(walletInfo,
+        electrumClient: electrumClient,
+        initialAddresses: initialAddresses,
+        initialRegularAddressIndex: initialRegularAddressIndex,
+        initialChangeAddressIndex: initialChangeAddressIndex,
+        mainHd: hd,
+        sideHd: bitcoin.HDWallet.fromSeed(seedBytes)
+            .derivePath("m/44'/145'/0'/1"),
+        networkType: networkType);
+  }
+
+
+  static Future<BitcoinCashWallet> create(
+      {required String mnemonic,
+      required String password,
+      required WalletInfo walletInfo,
+      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      List<BitcoinAddressRecord>? initialAddresses,
+      ElectrumBalance? initialBalance,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0}) async {
+    return BitcoinCashWallet(
+        mnemonic: mnemonic,
+        password: password,
+        walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfo,
+        initialAddresses: initialAddresses,
+        initialBalance: initialBalance,
+        seedBytes: await Mnemonic.toSeed(mnemonic),
+        initialRegularAddressIndex: initialRegularAddressIndex,
+        initialChangeAddressIndex: initialChangeAddressIndex);
+  }
+
+  static Future<BitcoinCashWallet> open({
+    required String name,
+    required WalletInfo walletInfo,
+    required Box<UnspentCoinsInfo> unspentCoinsInfo,
+    required String password,
+  }) async {
+    final snp = await ElectrumWallletSnapshot.load(name, walletInfo.type, password);
+    return BitcoinCashWallet(
+        mnemonic: snp.mnemonic,
+        password: password,
+        walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfo,
+        initialAddresses: snp.addresses,
+        initialBalance: snp.balance,
+        seedBytes: await Mnemonic.toSeed(snp.mnemonic),
+        initialRegularAddressIndex: snp.regularAddressIndex,
+        initialChangeAddressIndex: snp.changeAddressIndex);
+  }
+
+  @override
+  Future<PendingBitcoinCashTransaction> createTransaction(Object credentials) async {
+    const minAmount = 546;
+    final transactionCredentials = credentials as BitcoinTransactionCredentials;
+    final inputs = <BitcoinUnspent>[];
+    final outputs = transactionCredentials.outputs;
+    final hasMultiDestination = outputs.length > 1;
+
+    var allInputsAmount = 0;
+
+    if (unspentCoins.isEmpty) await updateUnspent();
+
+    for (final utx in unspentCoins) {
+      if (utx.isSending) {
+        allInputsAmount += utx.value;
+        inputs.add(utx);
+      }
+    }
+
+    if (inputs.isEmpty) throw BitcoinTransactionNoInputsException();
+
+    final allAmountFee = transactionCredentials.feeRate != null
+        ? feeAmountWithFeeRate(transactionCredentials.feeRate!, inputs.length, outputs.length)
+        : feeAmountForPriority(transactionCredentials.priority!, inputs.length, outputs.length);
+
+    final allAmount = allInputsAmount - allAmountFee;
+
+    var credentialsAmount = 0;
+    var amount = 0;
+    var fee = 0;
+
+    if (hasMultiDestination) {
+      if (outputs.any((item) => item.sendAll || item.formattedCryptoAmount! <= 0)) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      credentialsAmount = outputs.fold(0, (acc, value) => acc + value.formattedCryptoAmount!);
+
+      if (allAmount - credentialsAmount < minAmount) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      amount = credentialsAmount;
+
+      if (transactionCredentials.feeRate != null) {
+        fee = calculateEstimatedFeeWithFeeRate(transactionCredentials.feeRate!, amount,
+            outputsCount: outputs.length + 1);
+      } else {
+        fee = calculateEstimatedFee(transactionCredentials.priority, amount,
+            outputsCount: outputs.length + 1);
+      }
+    } else {
+      final output = outputs.first;
+      credentialsAmount = !output.sendAll ? output.formattedCryptoAmount! : 0;
+
+      if (credentialsAmount > allAmount) {
+        throw BitcoinTransactionWrongBalanceException(currency);
+      }
+
+      amount = output.sendAll || allAmount - credentialsAmount < minAmount
+          ? allAmount
+          : credentialsAmount;
+
+      if (output.sendAll || amount == allAmount) {
+        fee = allAmountFee;
+      } else if (transactionCredentials.feeRate != null) {
+        fee = calculateEstimatedFeeWithFeeRate(transactionCredentials.feeRate!, amount);
+      } else {
+        fee = calculateEstimatedFee(transactionCredentials.priority, amount);
+      }
+    }
+
+    if (fee == 0) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+
+    final totalAmount = amount + fee;
+
+    if (totalAmount > balance[currency]!.confirmed || totalAmount > allInputsAmount) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+    final txb = bitbox.Bitbox.transactionBuilder(testnet: false);
+
+    final changeAddress = await walletAddresses.getChangeAddress();
+    var leftAmount = totalAmount;
+    var totalInputAmount = 0;
+
+    inputs.clear();
+
+    for (final utx in unspentCoins) {
+      if (utx.isSending) {
+        leftAmount = leftAmount - utx.value;
+        totalInputAmount += utx.value;
+        inputs.add(utx);
+
+        if (leftAmount <= 0) {
+          break;
+        }
+      }
+    }
+
+    if (inputs.isEmpty) throw BitcoinTransactionNoInputsException();
+
+    if (amount <= 0 || totalInputAmount < totalAmount) {
+      throw BitcoinTransactionWrongBalanceException(currency);
+    }
+
+    inputs.forEach((input) {
+      txb.addInput(input.hash, input.vout);
+    });
+
+    outputs.forEach((item) {
+      final outputAmount = hasMultiDestination ? item.formattedCryptoAmount : amount;
+      final outputAddress = item.isParsedAddress ? item.extractedAddress! : item.address;
+      txb.addOutput(outputAddress, outputAmount!);
+    });
+
+    final estimatedSize = bitbox.BitcoinCash.getByteCount(inputs.length, outputs.length + 1);
+
+    var feeAmount = 0;
+
+    if (transactionCredentials.feeRate != null) {
+      feeAmount = transactionCredentials.feeRate! * estimatedSize;
+    } else {
+      feeAmount = feeRate(transactionCredentials.priority!) * estimatedSize;
+    }
+
+    final changeValue = totalInputAmount - amount - feeAmount;
+
+    if (changeValue > minAmount) {
+      txb.addOutput(changeAddress, changeValue);
+    }
+
+    for (var i = 0; i < inputs.length; i++) {
+      final input = inputs[i];
+      final keyPair = generateKeyPair(
+          hd: input.bitcoinAddressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
+          index: input.bitcoinAddressRecord.index);
+      txb.sign(i, keyPair, input.value);
+    }
+
+    // Build the transaction
+    final tx = txb.build();
+
+    return PendingBitcoinCashTransaction(tx, type,
+        electrumClient: electrumClient, amount: amount, fee: fee);
+  }
+
+  bitbox.ECPair generateKeyPair(
+          {required bitcoin.HDWallet hd,
+          required int index}) =>
+      bitbox.ECPair.fromWIF(hd.derive(index).wif!);
+
+  @override
+  int feeAmountForPriority(
+          BitcoinTransactionPriority priority, int inputsCount, int outputsCount) =>
+      feeRate(priority) * bitbox.BitcoinCash.getByteCount(inputsCount, outputsCount);
+
+  int feeAmountWithFeeRate(int feeRate, int inputsCount, int outputsCount) =>
+      feeRate * bitbox.BitcoinCash.getByteCount(inputsCount, outputsCount);
+
+  int calculateEstimatedFeeWithFeeRate(int feeRate, int? amount, {int? outputsCount}) {
+    int inputsCount = 0;
+    int totalValue = 0;
+
+    for (final input in unspentCoins) {
+      if (input.isSending) {
+        inputsCount++;
+        totalValue += input.value;
+      }
+      if (amount != null && totalValue >= amount) {
+        break;
+      }
+    }
+
+    if (amount != null && totalValue < amount) return 0;
+
+    final _outputsCount = outputsCount ?? (amount != null ? 2 : 1);
+
+    return feeAmountWithFeeRate(feeRate, inputsCount, _outputsCount);
+  }
+
+  @override
+  int feeRate(TransactionPriority priority) {
+    if (priority is BitcoinCashTransactionPriority) {
+      switch (priority) {
+        case BitcoinCashTransactionPriority.slow:
+          return 1;
+        case BitcoinCashTransactionPriority.medium:
+          return 5;
+        case BitcoinCashTransactionPriority.fast:
+          return 10;
+      }
+    }
+
+    return 0;
+  }
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_addresses.dart

@@ -0,0 +1,34 @@
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:cw_bitcoin/bitcoin_address_record.dart';
+import 'package:cw_bitcoin/electrum.dart';
+import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
+import 'package:cw_bitcoin/utils.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:mobx/mobx.dart';
+
+part 'bitcoin_cash_wallet_addresses.g.dart';
+
+class BitcoinCashWalletAddresses = BitcoinCashWalletAddressesBase with _$BitcoinCashWalletAddresses;
+
+abstract class BitcoinCashWalletAddressesBase extends ElectrumWalletAddresses with Store {
+  BitcoinCashWalletAddressesBase(WalletInfo walletInfo,
+      {required bitcoin.HDWallet mainHd,
+      required bitcoin.HDWallet sideHd,
+      required bitcoin.NetworkType networkType,
+      required ElectrumClient electrumClient,
+      List<BitcoinAddressRecord>? initialAddresses,
+      int initialRegularAddressIndex = 0,
+      int initialChangeAddressIndex = 0})
+      : super(walletInfo,
+            initialAddresses: initialAddresses,
+            initialRegularAddressIndex: initialRegularAddressIndex,
+            initialChangeAddressIndex: initialChangeAddressIndex,
+            mainHd: mainHd,
+            sideHd: sideHd,
+            electrumClient: electrumClient,
+            networkType: networkType);
+
+  @override
+  String getAddress({required int index, required bitcoin.HDWallet hd}) =>
+      generateP2PKHAddress(hd: hd, index: index, networkType: networkType);
+}

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_creation_credentials.dart

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

cw_bitcoin_cash/lib/src/bitcoin_cash_wallet_service.dart

@@ -0,0 +1,107 @@
+import 'dart:io';
+
+import 'package:bip39/bip39.dart';
+import 'package:cw_bitcoin_cash/cw_bitcoin_cash.dart';
+import 'package:cw_core/balance.dart';
+import 'package:cw_core/pathForWallet.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/unspent_coins_info.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:collection/collection.dart';
+import 'package:hive/hive.dart';
+
+class BitcoinCashWalletService extends WalletService<BitcoinCashNewWalletCredentials,
+    BitcoinCashRestoreWalletFromSeedCredentials,
+    BitcoinCashRestoreWalletFromWIFCredentials> {
+  BitcoinCashWalletService(this.walletInfoSource, this.unspentCoinsInfoSource);
+
+  final Box<WalletInfo> walletInfoSource;
+  final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
+
+  @override
+  WalletType getType() => WalletType.bitcoinCash;
+
+  @override
+  Future<bool> isWalletExit(String name) async =>
+      File(await pathForWallet(name: name, type: getType())).existsSync();
+
+  @override
+  Future<BitcoinCashWallet> create(
+      credentials) async {
+    final wallet = await BitcoinCashWalletBase.create(
+        mnemonic: await Mnemonic.generate(),
+        password: credentials.password!,
+        walletInfo: credentials.walletInfo!,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.save();
+    await wallet.init();
+    return wallet;
+  }
+
+  @override
+  Future<BitcoinCashWallet> openWallet(String name, String password) async {
+    final walletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(name, getType()))!;
+    final wallet = await BitcoinCashWalletBase.open(
+        password: password, name: name, walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.init();
+    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<void> rename(String currentName, String password, String newName) async {
+    final currentWalletInfo = walletInfoSource.values.firstWhereOrNull(
+            (info) => info.id == WalletBase.idFor(currentName, getType()))!;
+    final currentWallet = await BitcoinCashWalletBase.open(
+        password: password,
+        name: currentName,
+        walletInfo: currentWalletInfo,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+
+    await currentWallet.renameWalletFiles(newName);
+
+    final newWalletInfo = currentWalletInfo;
+    newWalletInfo.id = WalletBase.idFor(newName, getType());
+    newWalletInfo.name = newName;
+
+    await walletInfoSource.put(currentWalletInfo.key, newWalletInfo);
+  }
+
+  @override
+  Future<BitcoinCashWallet>
+  restoreFromKeys(credentials) {
+    // TODO: implement restoreFromKeys
+    throw UnimplementedError('restoreFromKeys() is not implemented');
+  }
+
+  @override
+  Future<BitcoinCashWallet> restoreFromSeed(
+      BitcoinCashRestoreWalletFromSeedCredentials credentials) async {
+    if (!validateMnemonic(credentials.mnemonic)) {
+      throw BitcoinCashMnemonicIsIncorrectException();
+    }
+
+    final wallet = await BitcoinCashWalletBase.create(
+        password: credentials.password!,
+        mnemonic: credentials.mnemonic,
+        walletInfo: credentials.walletInfo!,
+        unspentCoinsInfo: unspentCoinsInfoSource);
+    await wallet.save();
+    await wallet.init();
+    return wallet;
+  }
+}

cw_bitcoin_cash/lib/src/exceptions/bitcoin_cash_mnemonic_is_incorrect_exception.dart

@@ -0,0 +1,5 @@
+class BitcoinCashMnemonicIsIncorrectException implements Exception {
+  @override
+  String toString() =>
+      'Bitcoin Cash mnemonic has incorrect format. Mnemonic should contain 12 or 24 words separated by space.';
+}

cw_bitcoin_cash/lib/src/exceptions/exceptions.dart

@@ -0,0 +1 @@
+export 'bitcoin_cash_mnemonic_is_incorrect_exception.dart';

cw_bitcoin_cash/lib/src/mnemonic.dart

@@ -0,0 +1,11 @@
+import 'dart:typed_data';
+
+import 'package:bip39/bip39.dart' as bip39;
+
+class Mnemonic {
+  /// Generate bip39 mnemonic
+  static String generate({int strength = 128}) => bip39.generateMnemonic(strength: strength);
+
+  /// Create root seed from mnemonic
+  static Uint8List toSeed(String mnemonic) => bip39.mnemonicToSeed(mnemonic);
+}

cw_bitcoin_cash/lib/src/pending_bitcoin_cash_transaction.dart

@@ -0,0 +1,62 @@
+import 'package:cw_bitcoin/bitcoin_commit_transaction_exception.dart';
+import 'package:bitbox/bitbox.dart' as bitbox;
+import 'package:cw_core/pending_transaction.dart';
+import 'package:cw_bitcoin/electrum.dart';
+import 'package:cw_bitcoin/bitcoin_amount_format.dart';
+import 'package:cw_bitcoin/electrum_transaction_info.dart';
+import 'package:cw_core/transaction_direction.dart';
+import 'package:cw_core/wallet_type.dart';
+
+class PendingBitcoinCashTransaction with PendingTransaction {
+  PendingBitcoinCashTransaction(this._tx, this.type,
+      {required this.electrumClient,
+      required this.amount,
+      required this.fee})
+      : _listeners = <void Function(ElectrumTransactionInfo transaction)>[];
+
+  final WalletType type;
+  final bitbox.Transaction _tx;
+  final ElectrumClient electrumClient;
+  final int amount;
+  final int fee;
+
+  @override
+  String get id => _tx.getId();
+
+  @override
+  String get hex => _tx.toHex();
+
+  @override
+  String get amountFormatted => bitcoinAmountToString(amount: amount);
+
+  @override
+  String get feeFormatted => bitcoinAmountToString(amount: fee);
+
+  final List<void Function(ElectrumTransactionInfo transaction)> _listeners;
+
+  @override
+  Future<void> commit() async {
+    final result =
+      await electrumClient.broadcastTransaction(transactionRaw: _tx.toHex());
+
+    if (result.isEmpty) {
+      throw BitcoinCommitTransactionException();
+    }
+
+    _listeners?.forEach((listener) => listener(transactionInfo()));
+  }
+
+  void addListener(
+          void Function(ElectrumTransactionInfo transaction) listener) =>
+      _listeners.add(listener);
+
+  ElectrumTransactionInfo transactionInfo() => ElectrumTransactionInfo(type,
+      id: id,
+      height: 0,
+      amount: amount,
+      direction: TransactionDirection.outgoing,
+      date: DateTime.now(),
+      isPending: true,
+      confirmations: 0,
+      fee: fee);
+}

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

@@ -0,0 +1 @@
+C:/Users/borod/AppData/Local/Pub/Cache/hosted/pub.dev/path_provider_linux-2.2.0/

cw_bitcoin_cash/linux/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+}

cw_bitcoin_cash/linux/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

cw_bitcoin_cash/linux/flutter/generated_plugins.cmake

@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

cw_bitcoin_cash/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -0,0 +1,12 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import path_provider_foundation
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+}

cw_bitcoin_cash/macos/Flutter/ephemeral/Flutter-Generated.xcconfig

@@ -0,0 +1,11 @@
+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=C:\Users\borod\flutter
+FLUTTER_APPLICATION_PATH=C:\cake_wallet\cw_bitcoin_cash
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=0.0.1
+FLUTTER_BUILD_NUMBER=0.0.1
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=.dart_tool/package_config.json

cw_bitcoin_cash/macos/Flutter/ephemeral/flutter_export_environment.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=C:\Users\borod\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\cake_wallet\cw_bitcoin_cash"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_BUILD_DIR=build"
+export "FLUTTER_BUILD_NAME=0.0.1"
+export "FLUTTER_BUILD_NUMBER=0.0.1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=true"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.dart_tool/package_config.json"

cw_bitcoin_cash/pubspec.yaml

@@ -0,0 +1,76 @@
+name: cw_bitcoin_cash
+description: A new Flutter package project.
+version: 0.0.1
+publish_to: none
+author: Cake Wallet
+homepage: https://cakewallet.com
+
+environment:
+  sdk: '>=2.19.0 <3.0.0'
+  flutter: ">=1.17.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  bip39: ^1.0.6
+  bip32: ^2.0.0
+  path_provider: ^2.0.11
+  mobx: ^2.0.7+4
+  flutter_mobx: ^2.0.6+1
+  cw_core:
+    path: ../cw_core
+  cw_bitcoin:
+    path: ../cw_bitcoin
+  bitcoin_flutter:
+    git:
+      url: https://github.com/cake-tech/bitcoin_flutter.git
+      ref: cake-update-v3
+  bitbox:
+    git:
+      url: https://github.com/cake-tech/bitbox-flutter.git
+      ref: master
+
+
+
+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
+#
+

cw_bitcoin_cash/test/cw_bitcoin_cash_test.dart

@@ -0,0 +1,12 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:cw_bitcoin_cash/cw_bitcoin_cash.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_bitcoin_cash/windows/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+}

cw_bitcoin_cash/windows/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

cw_bitcoin_cash/windows/flutter/generated_plugins.cmake

@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

cw_core/lib/amount_converter.dart

@@ -80,6 +80,7 @@ class AmountConverter {
       case CryptoCurrency.xmr:
         return _moneroAmountToString(amount);
       case CryptoCurrency.btc:
+      case CryptoCurrency.bch:
         return _bitcoinAmountToString(amount);
       case CryptoCurrency.xhv:
       case CryptoCurrency.xag:

cw_core/lib/currency_for_wallet_type.dart

@@ -13,6 +13,8 @@ CryptoCurrency currencyForWalletType(WalletType type) {
       return CryptoCurrency.xhv;
     case WalletType.ethereum:
       return CryptoCurrency.eth;
+    case WalletType.bitcoinCash:
+      return CryptoCurrency.bch;
     case WalletType.nano:
       return CryptoCurrency.nano;
     case WalletType.banano:

cw_core/lib/node.dart

@@ -78,6 +78,8 @@ class Node extends HiveObject with Keyable {
         return Uri.http(uriRaw, '');
       case WalletType.ethereum:
         return Uri.https(uriRaw, '');
+      case WalletType.bitcoinCash:
+        return createUriFromElectrumAddress(uriRaw);
       case WalletType.nano:
       case WalletType.banano:
         if (isSSL) {
@@ -138,6 +140,8 @@ class Node extends HiveObject with Keyable {
           return requestMoneroNode();
         case WalletType.ethereum:
           return requestElectrumServer();
+        case WalletType.bitcoinCash:
+          return requestElectrumServer();
         case WalletType.nano:
         case WalletType.banano:
           return requestNanoNode();

cw_core/lib/wallet_type.dart

@@ -10,6 +10,7 @@ const walletTypes = [
   WalletType.litecoin,
   WalletType.haven,
   WalletType.ethereum,
+  WalletType.bitcoinCash,
   WalletType.nano,
   WalletType.banano,
 ];
@@ -39,6 +40,10 @@ enum WalletType {
 
   @HiveField(7)
   banano,
+
+  @HiveField(8)
+  bitcoinCash,
+
 }
 
 int serializeToInt(WalletType type) {
@@ -57,6 +62,8 @@ int serializeToInt(WalletType type) {
       return 5;
     case WalletType.banano:
       return 6;
+    case WalletType.bitcoinCash:
+      return 7;
     default:
       return -1;
   }
@@ -78,6 +85,8 @@ WalletType deserializeFromInt(int raw) {
       return WalletType.nano;
     case 6:
       return WalletType.banano;
+    case 7:
+      return WalletType.bitcoinCash;
     default:
       throw Exception('Unexpected token: $raw for WalletType deserializeFromInt');
   }
@@ -95,6 +104,8 @@ String walletTypeToString(WalletType type) {
       return 'Haven';
     case WalletType.ethereum:
       return 'Ethereum';
+    case WalletType.bitcoinCash:
+      return 'Bitcoin Cash';
     case WalletType.nano:
       return 'Nano';
     case WalletType.banano:
@@ -116,6 +127,8 @@ String walletTypeToDisplayName(WalletType type) {
       return 'Haven (XHV)';
     case WalletType.ethereum:
       return 'Ethereum (ETH)';
+    case WalletType.bitcoinCash:
+      return 'Bitcoin Cash (BCH)';
     case WalletType.nano:
       return 'Nano (XNO)';
     case WalletType.banano:
@@ -137,6 +150,8 @@ CryptoCurrency walletTypeToCryptoCurrency(WalletType type) {
       return CryptoCurrency.xhv;
     case WalletType.ethereum:
       return CryptoCurrency.eth;
+    case WalletType.bitcoinCash:
+      return CryptoCurrency.bch;
     case WalletType.nano:
       return CryptoCurrency.nano;
     case WalletType.banano:

cw_ethereum/lib/ethereum_client.dart

@@ -42,13 +42,21 @@ class EthereumClient {
       await _client!.getBalance(address);
 
   Future<int> getGasUnitPrice() async {
-    final gasPrice = await _client!.getGasPrice();
+    try {
-    return gasPrice.getInWei.toInt();
+      final gasPrice = await _client!.getGasPrice();
+      return gasPrice.getInWei.toInt();
+    } catch (_) {
+      return 0;
+    }
   }
 
   Future<int> getEstimatedGas() async {
-    final estimatedGas = await _client!.estimateGas();
+    try {
-    return estimatedGas.toInt();
+      final estimatedGas = await _client!.estimateGas();
+      return estimatedGas.toInt();
+    } catch (_) {
+      return 0;
+    }
   }
 
   Future<PendingEthereumTransaction> signTransaction({

cw_nano/lib/nano_client.dart

@@ -13,6 +13,11 @@ class NanoClient {
   static const String DEFAULT_REPRESENTATIVE =
       "nano_38713x95zyjsqzx6nm1dsom1jmm668owkeb9913ax6nfgj15az3nu8xkx579";
 
+  static const Map<String, String> CAKE_HEADERS = {
+    "Content-Type": "application/json",
+    "nano-app": "cake-wallet"
+  };
+
   Node? _node;
   Node? _powNode;
 
@@ -37,7 +42,7 @@ class NanoClient {
   Future<NanoBalance> getBalance(String address) async {
     final response = await http.post(
       _node!.uri,
-      headers: {"Content-Type": "application/json"},
+      headers: CAKE_HEADERS,
       body: jsonEncode(
         {
           "action": "account_balance",
@@ -57,7 +62,7 @@ class NanoClient {
     try {
       final response = await http.post(
         _node!.uri,
-        headers: {"Content-Type": "application/json"},
+        headers: CAKE_HEADERS,
         body: jsonEncode(
           {
             "action": "account_info",
@@ -123,7 +128,7 @@ class NanoClient {
   Future<String> requestWork(String hash) async {
     final response = await http.post(
       _powNode!.uri,
-      headers: {'Content-type': 'application/json'},
+      headers: CAKE_HEADERS,
       body: json.encode(
         {
           "action": "work_generate",
@@ -157,7 +162,6 @@ class NanoClient {
   }
 
   Future<String> processBlock(Map<String, String> block, String subtype) async {
-    final headers = {"Content-Type": "application/json"};
     final processBody = jsonEncode({
       "action": "process",
       "json_block": "true",
@@ -167,7 +171,7 @@ class NanoClient {
 
     final processResponse = await http.post(
       _node!.uri,
-      headers: headers,
+      headers: CAKE_HEADERS,
       body: processBody,
     );
 
@@ -260,10 +264,6 @@ class NanoClient {
   }) async {
     bool openBlock = false;
 
-    final headers = {
-      "Content-Type": "application/json",
-    };
-
     // first check if the account is open:
     // get the account info (we need the frontier and representative):
     AccountInfoResponse? infoData = await getAccountInfo(destinationAddress);
@@ -335,7 +335,7 @@ class NanoClient {
     });
     final processResponse = await http.post(
       _node!.uri,
-      headers: headers,
+      headers: CAKE_HEADERS,
       body: processBody,
     );
 
@@ -351,7 +351,7 @@ class NanoClient {
     required String privateKey,
   }) async {
     final receivableResponse = await http.post(_node!.uri,
-        headers: {"Content-Type": "application/json"},
+        headers: CAKE_HEADERS,
         body: jsonEncode({
           "action": "receivable",
           "account": destinationAddress,
@@ -401,7 +401,7 @@ class NanoClient {
   Future<List<NanoTransactionModel>> fetchTransactions(String address) async {
     try {
       final response = await http.post(_node!.uri,
-          headers: {"Content-Type": "application/json"},
+          headers: CAKE_HEADERS,
           body: jsonEncode({
             "action": "account_history",
             "account": address,

cw_nano/lib/nano_wallet.dart

@@ -169,8 +169,8 @@ abstract class NanoWalletBase
       if (txOut.sendAll) {
         amt = balance[currency]?.currentBalance ?? BigInt.zero;
       } else {
-        amt = BigInt.tryParse(
+        amt = BigInt.tryParse(NanoUtil.getAmountAsRaw(
-                NanoUtil.getAmountAsRaw(txOut.cryptoAmount ?? "0", NanoUtil.rawPerNano)) ??
+                txOut.cryptoAmount?.replaceAll(',', '.') ?? "0", NanoUtil.rawPerNano)) ??
             BigInt.zero;
       }
 
@@ -182,7 +182,9 @@ abstract class NanoWalletBase
 
       final block = await _client.constructSendBlock(
         amountRaw: amt.toString(),
-        destinationAddress: txOut.extractedAddress ?? txOut.address,
+        destinationAddress: credentials.outputs.first.isParsedAddress
+            ? credentials.outputs.first.extractedAddress!
+            : credentials.outputs.first.address,
         privateKey: _privateKey!,
         balanceAfterTx: runningBalance,
         previousHash: previousHash,

cw_nano/lib/nano_wallet_creation_credentials.dart

@@ -10,13 +10,11 @@ class NanoRestoreWalletFromSeedCredentials extends WalletCredentials {
   NanoRestoreWalletFromSeedCredentials({
     required String name,
     required this.mnemonic,
-    int height = 0,
     String? password,
     DerivationType? derivationType,
   }) : super(
           name: name,
           password: password,
-          height: height,
           derivationType: derivationType,
         );
 
@@ -33,9 +31,12 @@ class NanoRestoreWalletFromKeysCredentials extends WalletCredentials {
     required String name,
     required String password,
     required this.seedKey,
-    this.derivationType,
+    DerivationType? derivationType,
-  }) : super(name: name, password: password);
+  }) : super(
+          name: name,
+          password: password,
+          derivationType: derivationType,
+        );
 
   final String seedKey;
-  final DerivationType? derivationType;
+}
-}

ios/Podfile.lock

@@ -272,7 +272,7 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
+  flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d

ios/Runner/InfoBase.plist

@@ -100,6 +100,66 @@
                 <string>litecoin-wallet</string>
             </array>
         </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLName</key>
+            <string>ethereum</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>ethereum</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>CFBundleURLName</key>
+            <string>ethereum-wallet</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>ethereum-wallet</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLName</key>
+            <string>nano</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>nano</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>CFBundleURLName</key>
+            <string>nano-wallet</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>nano-wallet</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLName</key>
+            <string>bitcoincash</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>bitcoincash</string>
+            </array>
+        </dict>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Viewer</string>
+            <key>CFBundleURLName</key>
+            <string>bitcoincash-wallet</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>bitcoincash-wallet</string>
+            </array>
+        </dict>
     </array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>

lib/bitcoin/cw_bitcoin.dart

@@ -44,6 +44,7 @@ class CWBitcoin extends Bitcoin {
 	List<TransactionPriority> getTransactionPriorities() 
 		=> BitcoinTransactionPriority.all;
 
+	@override
 	List<TransactionPriority> getLitecoinTransactionPriorities()
 		=> LitecoinTransactionPriority.all;
 
@@ -121,16 +122,9 @@ class CWBitcoin extends Bitcoin {
     => (priority as BitcoinTransactionPriority).labelWithRate(rate);
 
 	@override
-	List<Unspent> getUnspents(Object wallet) {
+	List<BitcoinUnspent> getUnspents(Object wallet) {
 		final bitcoinWallet = wallet as ElectrumWallet;
-		return bitcoinWallet.unspentCoins
+		return bitcoinWallet.unspentCoins;
-			.map((BitcoinUnspent bitcoinUnspent) => Unspent(
-				bitcoinUnspent.address.address,
-				bitcoinUnspent.hash,
-				bitcoinUnspent.value,
-				bitcoinUnspent.vout,
-				null))
-			.toList();
 	}
 
 	void updateUnspents(Object wallet) async {

lib/bitcoin_cash/cw_bitcoin_cash.dart

@@ -0,0 +1,45 @@
+part of 'bitcoin_cash.dart';
+
+class CWBitcoinCash extends BitcoinCash {
+  @override
+  String getMnemonic(int? strength) => Mnemonic.generate();
+
+  @override
+  Uint8List getSeedFromMnemonic(String seed) => Mnemonic.toSeed(seed);
+
+  @override
+  String getCashAddrFormat(String address) => AddressUtils.getCashAddrFormat(address);
+
+  @override
+  WalletService createBitcoinCashWalletService(
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) {
+    return BitcoinCashWalletService(walletInfoSource, unspentCoinSource);
+  }
+
+  @override
+  WalletCredentials createBitcoinCashNewWalletCredentials({
+    required String name,
+    WalletInfo? walletInfo,
+  }) =>
+      BitcoinCashNewWalletCredentials(name: name, walletInfo: walletInfo);
+
+  @override
+  WalletCredentials createBitcoinCashRestoreWalletFromSeedCredentials(
+          {required String name, required String mnemonic, required String password}) =>
+      BitcoinCashRestoreWalletFromSeedCredentials(
+          name: name, mnemonic: mnemonic, password: password);
+
+  @override
+  TransactionPriority deserializeBitcoinCashTransactionPriority(int raw) =>
+      BitcoinCashTransactionPriority.deserialize(raw: raw);
+
+  @override
+  TransactionPriority getDefaultTransactionPriority() => BitcoinCashTransactionPriority.medium;
+
+  @override
+  List<TransactionPriority> getTransactionPriorities() => BitcoinCashTransactionPriority.all;
+
+  @override
+  TransactionPriority getBitcoinCashTransactionPrioritySlow() =>
+      BitcoinCashTransactionPriority.slow;
+}

lib/buy/onramper/onramper_buy_provider.dart

@@ -27,6 +27,8 @@ class OnRamperBuyProvider {
         return "LTC_LITECOIN";
       case CryptoCurrency.xmr:
         return "XMR_MONERO";
+      case CryptoCurrency.bch:
+        return "BCH_BITCOINCASH";
       case CryptoCurrency.nano:
         return "XNO_NANO";
       default:

lib/core/address_validator.dart

@@ -88,7 +88,9 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.dai:
       case CryptoCurrency.dash:
       case CryptoCurrency.eos:
+      return '[0-9a-zA-Z]';
       case CryptoCurrency.bch:
+        return '^(?!bitcoincash:)[0-9a-zA-Z]*\$|^(?!bitcoincash:)q[0-9a-zA-Z]{41}\$|^(?!bitcoincash:)q[0-9a-zA-Z]{42}\$|^bitcoincash:q[0-9a-zA-Z]{41}\$|^bitcoincash:q[0-9a-zA-Z]{42}\$';
       case CryptoCurrency.bnb:
         return '[0-9a-zA-Z]';
       case CryptoCurrency.ltc:
@@ -172,7 +174,9 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.steth:
       case CryptoCurrency.shib:
       case CryptoCurrency.avaxc:
+        return [42];
       case CryptoCurrency.bch:
+        return [42, 43, 44, 54, 55];
       case CryptoCurrency.bnb:
         return [42];
       case CryptoCurrency.ltc:
@@ -267,6 +271,15 @@ class AddressValidator extends TextValidator {
             '|([^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}';
+      case CryptoCurrency.nano:
+        return 'nano_[0-9a-zA-Z]{60}';
+      case CryptoCurrency.banano:
+        return 'ban_[0-9a-zA-Z]{60}';
+      case CryptoCurrency.bch:
+        return 'bitcoincash:q[0-9a-zA-Z]{41}([^0-9a-zA-Z]|\$)'
+            '|bitcoincash:q[0-9a-zA-Z]{42}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)q[0-9a-zA-Z]{41}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)q[0-9a-zA-Z]{42}([^0-9a-zA-Z]|\$)';
       default:
         return null;
     }

lib/core/backup_service.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
@@ -308,7 +309,7 @@ class BackupService {
     if (currentPinLength != null)
       await _sharedPreferences.setInt(PreferencesKey.currentPinLength, currentPinLength);
 
-    if (currentTheme != null)
+    if (currentTheme != null && DeviceInfo.instance.isMobile)
       await _sharedPreferences.setInt(PreferencesKey.currentTheme, currentTheme);
 
     if (exchangeStatus != null)

lib/core/seed_validator.dart

@@ -29,6 +29,8 @@ class SeedValidator extends Validator<MnemonicItem> {
         return haven!.getMoneroWordList(language);
       case WalletType.ethereum:
         return ethereum!.getEthereumWordList(language);
+      case WalletType.bitcoinCash:
+        return getBitcoinWordList(language);
       case WalletType.nano:
       case WalletType.banano:
         return nano!.getNanoWordList(language);

lib/di.dart

@@ -2,6 +2,7 @@ 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/onramper/onramper_buy_provider.dart';
+import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
 import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/core/wallet_connect/wallet_connect_key_service.dart';
 import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
@@ -217,7 +218,6 @@ import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';
-import 'package:cake_wallet/nano/nano.dart' as nanoNano;
 
 import 'core/totp_request_details.dart';
 
@@ -248,6 +248,7 @@ Future<void> setup({
   required Box<Order> ordersSource,
   required Box<UnspentCoinsInfo> unspentCoinsInfoSource,
   required Box<AnonpayInvoiceInfo> anonpayInvoiceInfoSource,
+  required FlutterSecureStorage secureStorage,
 }) async {
   _walletInfoSource = walletInfoSource;
   _nodeSource = nodeSource;
@@ -289,7 +290,7 @@ Future<void> setup({
   getIt.registerFactory<Box<Node>>(() => _nodeSource);
   getIt.registerFactory<Box<Node>>(() => _powNodeSource, instanceName: Node.boxName + "pow");
 
-  getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
+  getIt.registerSingleton<FlutterSecureStorage>(secureStorage);
   getIt.registerSingleton(AuthenticationStore());
   getIt.registerSingleton<WalletListStore>(WalletListStore());
   getIt.registerSingleton(NodeListStoreBase.instance);
@@ -418,10 +419,6 @@ Future<void> setup({
                 }
                 if (appStore.wallet != null) {
                   authStore.allowed();
-
-                  if (appStore.wallet!.type == WalletType.ethereum) {
-                    getIt.get<Web3WalletService>().init();
-                  }
                   return;
                 }
 
@@ -442,10 +439,6 @@ Future<void> setup({
         } else {
           if (appStore.wallet != null) {
             authStore.allowed();
-
-            if (appStore.wallet!.type == WalletType.ethereum) {
-              getIt.get<Web3WalletService>().init();
-            }
             return;
           }
 
@@ -644,7 +637,7 @@ Future<void> setup({
       return MoneroAccountListViewModel(wallet);
     }
     throw Exception(
-        'Unexpected wallet type: ${wallet.type} for generate Nano/Monero AccountListViewModel');
+        'Unexpected wallet type: ${wallet.type} for generate Monero AccountListViewModel');
   });
 
   getIt.registerFactory(
@@ -740,9 +733,13 @@ Future<void> setup({
     return PowNodeListViewModel(_powNodeSource, appStore);
   });
 
-  getIt.registerFactory(
+  getIt.registerFactory(() {
-    () => ConnectionSyncPage(getIt.get<DashboardViewModel>(), getIt.get<Web3WalletService>()),
+    final wallet = getIt.get<AppStore>().wallet;
-  );
+    return ConnectionSyncPage(
+      getIt.get<DashboardViewModel>(),
+      wallet?.type == WalletType.ethereum ? getIt.get<Web3WalletService>() : null,
+    );
+  });
 
   getIt.registerFactory(
       () => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
@@ -825,6 +822,8 @@ Future<void> setup({
         return bitcoin!.createLitecoinWalletService(_walletInfoSource, _unspentCoinsInfoSource);
       case WalletType.ethereum:
         return ethereum!.createEthereumWalletService(_walletInfoSource);
+      case WalletType.bitcoinCash:
+        return bitcoinCash!.createBitcoinCashWalletService(_walletInfoSource, _unspentCoinsInfoSource!);
       case WalletType.nano:
         return nano!.createNanoWalletService(_walletInfoSource);
       default:
@@ -925,7 +924,7 @@ Future<void> setup({
         wallet: wallet!);
   });
 
-  getIt.registerFactoryParam<BuyWebViewPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<BuyWebViewPage, List<dynamic>, void>((List<dynamic> args, _) {
     final url = args.first as String;
     final buyViewModel = args[1] as BuyViewModel;
 
@@ -954,7 +953,7 @@ Future<void> setup({
   getIt.registerFactory(() {
     final wallet = getIt.get<AppStore>().wallet;
 
-    return UnspentCoinsListViewModel(wallet: wallet!, unspentCoinsInfo: _unspentCoinsInfoSource!);
+    return UnspentCoinsListViewModel(wallet: wallet!, unspentCoinsInfo: _unspentCoinsInfoSource);
   });
 
   getIt.registerFactory(() =>
@@ -965,7 +964,7 @@ Future<void> setup({
       (item, model) =>
           UnspentCoinsDetailsViewModel(unspentCoinsItem: item, unspentCoinsListViewModel: model));
 
-  getIt.registerFactoryParam<UnspentCoinsDetailsPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<UnspentCoinsDetailsPage, List<dynamic>, void>((List<dynamic> args, _) {
     final item = args.first as UnspentCoinsItem;
     final unspentCoinsListViewModel = args[1] as UnspentCoinsListViewModel;
 
@@ -1018,7 +1017,7 @@ Future<void> setup({
 
   getIt.registerFactory(() => IoniaLoginPage(getIt.get<IoniaAuthViewModel>()));
 
-  getIt.registerFactoryParam<IoniaVerifyIoniaOtp, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaVerifyIoniaOtp, List<dynamic>, void>((List<dynamic> args, _) {
     final email = args.first as String;
     final isSignIn = args[1] as bool;
 
@@ -1027,13 +1026,14 @@ Future<void> setup({
 
   getIt.registerFactory(() => IoniaWelcomePage());
 
-  getIt.registerFactoryParam<IoniaBuyGiftCardPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaBuyGiftCardPage, List<dynamic>, void>((List<dynamic> args, _) {
     final merchant = args.first as IoniaMerchant;
 
     return IoniaBuyGiftCardPage(getIt.get<IoniaBuyCardViewModel>(param1: merchant));
   });
 
-  getIt.registerFactoryParam<IoniaBuyGiftCardDetailPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaBuyGiftCardDetailPage, List<dynamic>, void>(
+      (List<dynamic> args, _) {
     final amount = args.first as double;
     final merchant = args.last as IoniaMerchant;
     return IoniaBuyGiftCardDetailPage(
@@ -1046,7 +1046,7 @@ Future<void> setup({
         ioniaService: getIt.get<IoniaService>(), giftCard: giftCard);
   });
 
-  getIt.registerFactoryParam<IoniaCustomTipViewModel, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaCustomTipViewModel, List<dynamic>, void>((List<dynamic> args, _) {
     final amount = args[0] as double;
     final merchant = args[1] as IoniaMerchant;
     final tip = args[2] as IoniaTip;
@@ -1059,7 +1059,7 @@ Future<void> setup({
     return IoniaGiftCardDetailPage(getIt.get<IoniaGiftCardDetailsViewModel>(param1: giftCard));
   });
 
-  getIt.registerFactoryParam<IoniaMoreOptionsPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaMoreOptionsPage, List<dynamic>, void>((List<dynamic> args, _) {
     final giftCard = args.first as IoniaGiftCard;
 
     return IoniaMoreOptionsPage(giftCard);
@@ -1069,13 +1069,13 @@ Future<void> setup({
       (IoniaGiftCard giftCard, _) =>
           IoniaCustomRedeemViewModel(giftCard: giftCard, ioniaService: getIt.get<IoniaService>()));
 
-  getIt.registerFactoryParam<IoniaCustomRedeemPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaCustomRedeemPage, List<dynamic>, void>((List<dynamic> args, _) {
     final giftCard = args.first as IoniaGiftCard;
 
     return IoniaCustomRedeemPage(getIt.get<IoniaCustomRedeemViewModel>(param1: giftCard));
   });
 
-  getIt.registerFactoryParam<IoniaCustomTipPage, List, void>((List args, _) {
+  getIt.registerFactoryParam<IoniaCustomTipPage, List<dynamic>, void>((List<dynamic> args, _) {
     return IoniaCustomTipPage(getIt.get<IoniaCustomTipViewModel>(param1: args));
   });
 

lib/entities/cake_2fa_preset_options.dart

@@ -6,6 +6,7 @@ class Cake2FAPresetsOptions extends EnumerableItem<int> with Serializable<int> {
   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 const none = Cake2FAPresetsOptions(title: 'None', raw: 3);
 
   static Cake2FAPresetsOptions deserialize({required int raw}) {
     switch (raw) {
@@ -15,6 +16,8 @@ class Cake2FAPresetsOptions extends EnumerableItem<int> with Serializable<int> {
         return Cake2FAPresetsOptions.normal;
       case 2:
         return Cake2FAPresetsOptions.aggressive;
+      case 3:
+        return Cake2FAPresetsOptions.none;
       default:
         throw Exception(
           'Incorrect Cake 2FA Preset $raw  for Cake2FAPresetOptions deserialize',

lib/entities/default_settings_migration.dart

@@ -26,6 +26,7 @@ const cakeWalletBitcoinElectrumUri = 'electrum.cakewallet.com:50002';
 const cakeWalletLitecoinElectrumUri = 'ltc-electrum.cakewallet.com:50002';
 const havenDefaultNodeUri = 'nodes.havenprotocol.org:443';
 const ethereumDefaultNodeUri = 'ethereum.publicnode.com';
+const cakeWalletBitcoinCashDefaultNodeUri = 'bitcoincash.stackwallet.com:50002';
 const nanoDefaultNodeUri = 'rpc.nano.to';
 const nanoDefaultPowNodeUri = 'rpc.nano.to';
 
@@ -81,7 +82,10 @@ Future<void> defaultSettingsMigration(
               sharedPreferences: sharedPreferences, nodes: nodes);
           await changeLitecoinCurrentElectrumServerToDefault(
               sharedPreferences: sharedPreferences, nodes: nodes);
-          await changeHavenCurrentNodeToDefault(sharedPreferences: sharedPreferences, nodes: nodes);
+          await changeHavenCurrentNodeToDefault(
+              sharedPreferences: sharedPreferences, nodes: nodes);
+          await changeBitcoinCashCurrentNodeToDefault(
+              sharedPreferences: sharedPreferences, nodes: nodes);
 
           break;
         case 2:
@@ -161,11 +165,16 @@ Future<void> defaultSettingsMigration(
           break;
         case 22:
           await addNanoNodeList(nodes: nodes);
-          await addNanoPowNodeList(nodes: nodes);
+          await addNanoPowNodeList(nodes: powNodes);
           await changeNanoCurrentNodeToDefault(sharedPreferences: sharedPreferences, nodes: nodes);
           await changeNanoCurrentPowNodeToDefault(
               sharedPreferences: sharedPreferences, nodes: powNodes);
           break;
+        case 23:
+          await addBitcoinCashElectrumServerList(nodes: nodes);
+          await changeBitcoinCurrentElectrumServerToDefault(
+              sharedPreferences: sharedPreferences, nodes: nodes);
+          break;
 
         default:
           break;
@@ -323,6 +332,12 @@ Node? getNanoDefaultPowNode({required Box<Node> nodes}) {
       nodes.values.firstWhereOrNull((node) => (node.type == WalletType.nano));
 }
 
+Node? getBitcoinCashDefaultElectrumServer({required Box<Node> nodes}) {
+  return nodes.values.firstWhereOrNull(
+          (Node node) => node.uriRaw == cakeWalletBitcoinCashDefaultNodeUri)
+      ?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.bitcoinCash);
+}
+
 Node getMoneroDefaultNode({required Box<Node> nodes}) {
   final timeZone = DateTime.now().timeZoneOffset.inHours;
   var nodeUri = '';
@@ -358,6 +373,15 @@ Future<void> changeLitecoinCurrentElectrumServerToDefault(
   await sharedPreferences.setInt(PreferencesKey.currentLitecoinElectrumSererIdKey, serverId);
 }
 
+Future<void> changeBitcoinCashCurrentNodeToDefault(
+    {required SharedPreferences sharedPreferences,
+      required Box<Node> nodes}) async {
+  final server = getBitcoinCashDefaultElectrumServer(nodes: nodes);
+  final serverId = server?.key as int ?? 0;
+
+  await sharedPreferences.setInt(PreferencesKey.currentBitcoinCashNodeIdKey, serverId);
+}
+
 Future<void> changeHavenCurrentNodeToDefault(
     {required SharedPreferences sharedPreferences, required Box<Node> nodes}) async {
   final node = getHavenDefaultNode(nodes: nodes);
@@ -411,6 +435,15 @@ Future<void> addLitecoinElectrumServerList({required Box<Node> nodes}) async {
   }
 }
 
+Future<void> addBitcoinCashElectrumServerList({required Box<Node> nodes}) async {
+  final serverList = await loadBitcoinCashElectrumServerList();
+  for (var node in serverList) {
+    if (nodes.values.firstWhereOrNull((element) => element.uriRaw == node.uriRaw) == null) {
+      await nodes.add(node);
+    }
+  }
+}
+
 Future<void> addHavenNodeList({required Box<Node> nodes}) async {
   final nodeList = await loadDefaultHavenNodes();
   for (var node in nodeList) {
@@ -497,27 +530,34 @@ Future<void> checkCurrentNodes(
   final currentMoneroNodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
   final currentBitcoinElectrumSeverId =
       sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
-  final currentLitecoinElectrumSeverId =
+  final currentLitecoinElectrumSeverId = sharedPreferences
-      sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
+      .getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
-  final currentHavenNodeId = sharedPreferences.getInt(PreferencesKey.currentHavenNodeIdKey);
+  final currentHavenNodeId = sharedPreferences
-  final currentEthereumNodeId = sharedPreferences.getInt(PreferencesKey.currentEthereumNodeIdKey);
+      .getInt(PreferencesKey.currentHavenNodeIdKey);
-  final currentNanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoNodeIdKey);
+  final currentEthereumNodeId = sharedPreferences
-  final currentNanoPowNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoPowNodeIdKey);
+      .getInt(PreferencesKey.currentEthereumNodeIdKey);
-  final currentMoneroNode =
+  final currentNanoNodeId = sharedPreferences
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentMoneroNodeId);
+      .getInt(PreferencesKey.currentNanoNodeIdKey);
-  final currentBitcoinElectrumServer =
+  final currentNanoPowNodeId = sharedPreferences
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentBitcoinElectrumSeverId);
+      .getInt(PreferencesKey.currentNanoPowNodeIdKey);
-  final currentLitecoinElectrumServer =
+  final currentBitcoinCashNodeId = sharedPreferences
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentLitecoinElectrumSeverId);
+      .getInt(PreferencesKey.currentBitcoinCashNodeIdKey);
-  final currentHavenNodeServer =
+  final currentMoneroNode = nodeSource.values.firstWhereOrNull(
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentHavenNodeId);
+      (node) => node.key == currentMoneroNodeId);
-  final currentEthereumNodeServer =
+  final currentBitcoinElectrumServer = nodeSource.values.firstWhereOrNull(
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentEthereumNodeId);
+      (node) => node.key == currentBitcoinElectrumSeverId);
+  final currentLitecoinElectrumServer = nodeSource.values.firstWhereOrNull(
+      (node) => node.key == currentLitecoinElectrumSeverId);
+  final currentHavenNodeServer = nodeSource.values.firstWhereOrNull(
+      (node) => node.key == currentHavenNodeId);
+  final currentEthereumNodeServer = nodeSource.values.firstWhereOrNull(
+      (node) => node.key == currentEthereumNodeId);
   final currentNanoNodeServer =
-      nodeSource.values.firstWhereOrNull((node) => node.key == currentNanoNodeId);
+  nodeSource.values.firstWhereOrNull((node) => node.key == currentNanoNodeId);
   final currentNanoPowNodeServer =
-      powNodeSource.values.firstWhereOrNull((node) => node.key == currentNanoPowNodeId);
+  powNodeSource.values.firstWhereOrNull((node) => node.key == currentNanoPowNodeId);
-
+  final currentBitcoinCashNodeServer = nodeSource.values.firstWhereOrNull(
+          (node) => node.key == currentBitcoinCashNodeId);
   if (currentMoneroNode == null) {
     final newCakeWalletNode = Node(uri: newCakeWalletMoneroUri, type: WalletType.monero);
     await nodeSource.add(newCakeWalletNode);
@@ -565,6 +605,13 @@ Future<void> checkCurrentNodes(
     }
     await sharedPreferences.setInt(PreferencesKey.currentNanoPowNodeIdKey, node.key as int);
   }
+
+  if (currentBitcoinCashNodeServer == null) {
+    final node = Node(uri: cakeWalletBitcoinCashDefaultNodeUri, type: WalletType.bitcoinCash);
+    await nodeSource.add(node);
+    await sharedPreferences.setInt(
+        PreferencesKey.currentBitcoinCashNodeIdKey, node.key as int);
+  }
 }
 
 Future<void> resetBitcoinElectrumServer(

lib/entities/main_actions.dart

@@ -52,8 +52,7 @@ class MainActions {
         case WalletType.bitcoin:
         case WalletType.litecoin:
         case WalletType.ethereum:
-        case WalletType.nano:
+        case WalletType.bitcoinCash:
-        case WalletType.banano:
           switch (defaultBuyProvider) {
             case BuyProviderType.AskEachTime:
               Navigator.pushNamed(context, Routes.buy);
@@ -66,6 +65,8 @@ class MainActions {
               break;
           }
           break;
+        case WalletType.nano:
+        case WalletType.banano:
         case WalletType.monero:
           await getIt.get<OnRamperBuyProvider>().launchProvider(context);
           break;
@@ -123,6 +124,7 @@ class MainActions {
         case WalletType.bitcoin:
         case WalletType.litecoin:
         case WalletType.ethereum:
+        case WalletType.bitcoinCash:
           if (viewModel.isEnabledSellAction) {
             final moonPaySellProvider = MoonPaySellProvider();
             final uri = await moonPaySellProvider.requestUrl(

lib/entities/node_list.dart

@@ -84,6 +84,23 @@ Future<List<Node>> loadDefaultEthereumNodes() async {
   return nodes;
 }
 
+Future<List<Node>> loadBitcoinCashElectrumServerList() async {
+  final serverListRaw =
+  await rootBundle.loadString('assets/bitcoin_cash_electrum_server_list.yml');
+  final loadedServerList = loadYaml(serverListRaw) as YamlList;
+  final serverList = <Node>[];
+
+  for (final raw in loadedServerList) {
+    if (raw is Map) {
+      final node = Node.fromMap(Map<String, Object>.from(raw));
+      node.type = WalletType.bitcoinCash;
+      serverList.add(node);
+    }
+  }
+
+  return serverList;
+}
+
 Future<List<Node>> loadDefaultNanoNodes() async {
   final nodesRaw = await rootBundle.loadString('assets/nano_node_list.yml');
   final loadedNodes = loadYaml(nodesRaw) as YamlList;
@@ -116,10 +133,11 @@ Future<List<Node>> loadDefaultNanoPowNodes() async {
   return nodes;
 }
 
-Future resetToDefault(Box<Node> nodeSource) async {
+Future<void> resetToDefault(Box<Node> nodeSource) async {
   final moneroNodes = await loadDefaultNodes();
   final bitcoinElectrumServerList = await loadBitcoinElectrumServerList();
   final litecoinElectrumServerList = await loadLitecoinElectrumServerList();
+  final bitcoinCashElectrumServerList = await loadBitcoinCashElectrumServerList();
   final havenNodes = await loadDefaultHavenNodes();
   final ethereumNodes = await loadDefaultEthereumNodes();
   final nanoNodes = await loadDefaultNanoNodes();
@@ -129,13 +147,14 @@ Future resetToDefault(Box<Node> nodeSource) async {
       litecoinElectrumServerList +
       havenNodes +
       ethereumNodes +
+      bitcoinCashElectrumServerList +
       nanoNodes;
 
   await nodeSource.clear();
   await nodeSource.addAll(nodes);
 }
 
-Future resetPowToDefault(Box<Node> powNodeSource) async {
+Future<void> resetPowToDefault(Box<Node> powNodeSource) async {
   final nanoPowNodes = await loadDefaultNanoPowNodes();
   final nodes = nanoPowNodes;
   await powNodeSource.clear();

lib/entities/parse_address_from_domain.dart

@@ -5,6 +5,7 @@ import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/parsed_address.dart';
 import 'package:cake_wallet/entities/unstoppable_domain_address.dart';
 import 'package:cake_wallet/entities/emoji_string_extension.dart';
+import 'package:cake_wallet/mastodon/mastodon_api.dart';
 import 'package:cake_wallet/twitter/twitter_api.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -45,7 +46,13 @@ class AddressResolver {
     }
 
     final match = RegExp(addressPattern).firstMatch(raw);
-    return match?.group(0)?.replaceAll(RegExp('[^0-9a-zA-Z]'), '');
+    return match?.group(0)?.replaceAllMapped(RegExp('[^0-9a-zA-Z]|bitcoincash:|nano_'), (Match match) {
+      String group = match.group(0)!;
+      if (group.startsWith('bitcoincash:') || group.startsWith('nano_')) {
+        return group;
+      }
+      return '';
+    });
   }
 
   Future<ParsedAddress> resolve(String text, String ticker) async {
@@ -58,21 +65,50 @@ class AddressResolver {
         if (addressFromBio != null) {
           return ParsedAddress.fetchTwitterAddress(address: addressFromBio, name: text);
         }
-        final tweets = twitterUser.tweets;
-        if (tweets != null) {
-          var subString = StringBuffer();
-          tweets.forEach((item) {
-            subString.writeln(item.text);
-          });
-          final userTweetsText = subString.toString();
-          final addressFromPinnedTweet =
-              extractAddressByType(raw: userTweetsText, type: CryptoCurrency.fromString(ticker));
 
+        final pinnedTweet = twitterUser.pinnedTweet?.text;
+        if (pinnedTweet != null) {
+          final addressFromPinnedTweet =
+          extractAddressByType(raw: pinnedTweet, type: CryptoCurrency.fromString(ticker));
           if (addressFromPinnedTweet != null) {
             return ParsedAddress.fetchTwitterAddress(address: addressFromPinnedTweet, name: text);
           }
         }
       }
+
+      if (text.startsWith('@') && text.contains('@', 1) && text.contains('.', 1)) {
+        final subText = text.substring(1);
+        final hostNameIndex = subText.indexOf('@');
+        final hostName = subText.substring(hostNameIndex + 1);
+        final userName = subText.substring(0, hostNameIndex);
+
+        final mastodonUser =
+        await MastodonAPI.lookupUserByUserName(userName: userName, apiHost: hostName);
+
+        if (mastodonUser != null) {
+          String? addressFromBio =
+          extractAddressByType(raw: mastodonUser.note, type: CryptoCurrency.fromString(ticker));
+
+          if (addressFromBio != null) {
+            return ParsedAddress.fetchMastodonAddress(address: addressFromBio, name: text);
+          } else {
+            final pinnedPosts =
+            await MastodonAPI.getPinnedPosts(userId: mastodonUser.id, apiHost: hostName);
+
+            if (pinnedPosts.isNotEmpty) {
+              final userPinnedPostsText = pinnedPosts.map((item) => item.content).join('\n');
+              String? addressFromPinnedPost = extractAddressByType(
+                  raw: userPinnedPostsText, type: CryptoCurrency.fromString(ticker));
+
+              if (addressFromPinnedPost != null) {
+                return ParsedAddress.fetchMastodonAddress(
+                    address: addressFromPinnedPost, name: text);
+              }
+            }
+          }
+        }
+      }
+
       if (!text.startsWith('@') && text.contains('@') && !text.contains('.')) {
         final bool isFioRegistered = await FioAddressProvider.checkAvail(text);
         if (isFioRegistered) {

lib/entities/parsed_address.dart

@@ -1,7 +1,8 @@
 import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/yat_record.dart';
 
-enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed, twitter, ens, contact }
+
+enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed, twitter, ens, contact, mastodon }
 
 class ParsedAddress {
   ParsedAddress({
@@ -69,6 +70,14 @@ class ParsedAddress {
     );
   }
 
+  factory ParsedAddress.fetchMastodonAddress({required String address, required String name}){
+    return ParsedAddress(
+      addresses: [address],
+      name: name,
+      parseFrom: ParseFrom.mastodon
+    );
+  }
+
   factory ParsedAddress.fetchContactAddress({required String address, required String name}){
     return ParsedAddress(
       addresses: [address],

lib/entities/preferences_key.dart

@@ -11,6 +11,7 @@ class PreferencesKey {
   static const currentBananoNodeIdKey = 'current_node_id_banano';
   static const currentBananoPowNodeIdKey = 'current_node_id_banano_pow';
   static const currentFiatCurrencyKey = 'current_fiat_currency';
+  static const currentBitcoinCashNodeIdKey = 'current_node_id_bch';
   static const currentTransactionPriorityKeyLegacy = 'current_fee_priority';
   static const currentBalanceDisplayModeKey = 'current_balance_display_mode';
   static const shouldSaveRecipientAddressKey = 'save_recipient_address';
@@ -36,6 +37,7 @@ class PreferencesKey {
   static const havenTransactionPriority = 'current_fee_priority_haven';
   static const litecoinTransactionPriority = 'current_fee_priority_litecoin';
   static const ethereumTransactionPriority = 'current_fee_priority_ethereum';
+  static const bitcoinCashTransactionPriority = 'current_fee_priority_bitcoin_cash';
   static const shouldShowReceiveWarning = 'should_show_receive_warning';
   static const shouldShowYatPopup = 'should_show_yat_popup';
   static const moneroWalletPasswordUpdateV1Base = 'monero_wallet_update_v1';

lib/entities/priority_for_wallet_type.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
 import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/haven/haven.dart';
 import 'package:cake_wallet/monero/monero.dart';
@@ -17,6 +18,8 @@ List<TransactionPriority> priorityForWalletType(WalletType type) {
       return haven!.getTransactionPriorities();
     case WalletType.ethereum:
       return ethereum!.getTransactionPriorities();
+    case WalletType.bitcoinCash:
+      return bitcoinCash!.getTransactionPriorities();
     // no such thing for nano/banano:
     case WalletType.nano:
     case WalletType.banano:

lib/ethereum/cw_ethereum.dart

@@ -50,6 +50,9 @@ class CWEthereum extends Ethereum {
   @override
   TransactionPriority getDefaultTransactionPriority() => EthereumTransactionPriority.medium;
 
+  @override
+  TransactionPriority getEthereumTransactionPrioritySlow() => EthereumTransactionPriority.slow;
+
   @override
   List<TransactionPriority> getTransactionPriorities() => EthereumTransactionPriority.all;
 

lib/exchange/exolix/exolix_exchange_provider.dart

@@ -225,6 +225,7 @@ class ExolixExchangeProvider extends ExchangeProvider {
         'networkFrom': _networkFor(from),
         'networkTo': _networkFor(to),
         'rateType': getRateType(isFixedRateMode),
+        'apiToken': apiKey,
       };
 
       if (isReceiveAmount) {

lib/main.dart

@@ -97,10 +97,10 @@ Future<void> initializeAppConfigs() async {
     CakeHive.registerAdapter(WalletInfoAdapter());
   }
 
-  if (!Hive.isAdapterRegistered(DERIVATION_TYPE_TYPE_ID)) {
+  if (!CakeHive.isAdapterRegistered(DERIVATION_TYPE_TYPE_ID)) {
     CakeHive.registerAdapter(DerivationTypeAdapter());
   }
-  
+
   if (!CakeHive.isAdapterRegistered(WALLET_TYPE_TYPE_ID)) {
     CakeHive.registerAdapter(WalletTypeAdapter());
   }
@@ -125,14 +125,17 @@ Future<void> initializeAppConfigs() async {
     CakeHive.registerAdapter(AnonpayInvoiceInfoAdapter());
   }
 
-  final secureStorage = FlutterSecureStorage();
+  final secureStorage = FlutterSecureStorage(
+    iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock),
+  );
   final transactionDescriptionsBoxKey =
       await getEncryptionKey(secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
   final tradesBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Trade.boxKey);
   final ordersBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Order.boxKey);
   final contacts = await CakeHive.openBox<Contact>(Contact.boxName);
   final nodes = await CakeHive.openBox<Node>(Node.boxName);
-  final powNodes = await CakeHive.openBox<Node>(Node.boxName + "pow");// must be different from Node.boxName
+  final powNodes =
+      await CakeHive.openBox<Node>(Node.boxName + "pow"); // must be different from Node.boxName
   final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(
       TransactionDescription.boxName,
       encryptionKey: transactionDescriptionsBoxKey);
@@ -159,8 +162,8 @@ Future<void> initializeAppConfigs() async {
       transactionDescriptions: transactionDescriptions,
       secureStorage: secureStorage,
       anonpayInvoiceInfo: anonpayInvoiceInfo,
-      initialMigrationVersion: 22);
+      initialMigrationVersion: 23);
-  }
+}
 
 Future<void> initialSetup(
     {required SharedPreferences sharedPreferences,
@@ -199,7 +202,8 @@ Future<void> initialSetup(
       transactionDescriptionBox: transactionDescriptions,
       ordersSource: ordersSource,
       anonpayInvoiceInfoSource: anonpayInvoiceInfo,
-      unspentCoinsInfoSource: unspentCoinsInfoSource);
+      unspentCoinsInfoSource: unspentCoinsInfoSource,
+      secureStorage: secureStorage);
   await bootstrap(navigatorKey);
   monero?.onStartup();
 }

lib/mastodon/mastodon_api.dart

@@ -0,0 +1,63 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'package:cake_wallet/mastodon/mastodon_user.dart';
+
+class MastodonAPI {
+  static const httpsScheme = 'https';
+  static const userPath = '/api/v1/accounts/lookup';
+  static const statusesPath = '/api/v1/accounts/:id/statuses';
+
+  static Future<MastodonUser?> lookupUserByUserName(
+      {required String userName, required String apiHost}) async {
+    try {
+      final queryParams = {'acct': userName};
+
+      final uri = Uri(
+        scheme: httpsScheme,
+        host: apiHost,
+        path: userPath,
+        queryParameters: queryParams,
+      );
+
+      final response = await http.get(uri);
+
+      if (response.statusCode != 200) return null;
+
+      final Map<String, dynamic> responseJSON = json.decode(response.body) as Map<String, dynamic>;
+
+      return MastodonUser.fromJson(responseJSON);
+    } catch (e) {
+      print('Error in lookupUserByUserName: $e');
+      return null;
+    }
+  }
+
+  static Future<List<PinnedPost>> getPinnedPosts({
+    required String userId,
+    required String apiHost,
+  }) async {
+    try {
+      final queryParams = {'pinned': 'true'};
+
+      final uri = Uri(
+        scheme: httpsScheme,
+        host: apiHost,
+        path: statusesPath.replaceAll(':id', userId),
+        queryParameters: queryParams,
+      );
+
+      final response = await http.get(uri);
+
+      if (response.statusCode != 200) {
+        throw Exception('Unexpected HTTP status: ${response.statusCode}');
+      }
+
+      final List<dynamic> responseJSON = json.decode(response.body) as List<dynamic>;
+
+      return responseJSON.map((json) => PinnedPost.fromJson(json as Map<String, dynamic>)).toList();
+    } catch (e) {
+      print('Error in getPinnedPosts: $e');
+      throw e;
+    }
+  }
+}

lib/mastodon/mastodon_user.dart

@@ -0,0 +1,36 @@
+class MastodonUser {
+  String id;
+  String username;
+  String acct;
+  String note;
+
+  MastodonUser({
+    required this.id,
+    required this.username,
+    required this.acct,
+    required this.note,
+  });
+
+  factory MastodonUser.fromJson(Map<String, dynamic> json) {
+    return MastodonUser(
+      id: json['id'] as String,
+      username: json['username'] as String,
+      acct: json['acct'] as String,
+      note: json['note'] as String,
+    );
+  }
+}
+
+class PinnedPost {
+  final String id;
+  final String content;
+
+  PinnedPost({required this.id, required this.content});
+
+  factory PinnedPost.fromJson(Map<String, dynamic> json) {
+    return PinnedPost(
+      id: json['id'] as String,
+      content: json['content'] as String,
+    );
+  }
+}

lib/nano/cw_nano.dart

@@ -178,6 +178,11 @@ class CWNano extends Nano {
   BigInt getTransactionAmountRaw(TransactionInfo transactionInfo) {
     return (transactionInfo as NanoTransactionInfo).amountRaw;
   }
+
+  @override
+  String getRepresentative(Object wallet) {
+    return (wallet as NanoWallet).representative;
+  }
 }
 
 class CWNanoUtil extends NanoUtil {
@@ -308,14 +313,19 @@ class CWNanoUtil extends NanoUtil {
   /// @param raw 100000000000000000000000000000
   /// @return Decimal value 1.000000000000000000000000000000
   ///
-  @override
+  Decimal _getRawAsDecimal(String? raw, BigInt? rawPerCur) {
-  Decimal getRawAsDecimal(String? raw, BigInt? rawPerCur) {
     rawPerCur ??= rawPerNano;
     final Decimal amount = Decimal.parse(raw.toString());
     final Decimal result = (amount / Decimal.parse(rawPerCur.toString())).toDecimal();
     return result;
   }
 
+  @override
+  String getRawAsDecimalString(String? raw, BigInt? rawPerCur) {
+    final Decimal result = _getRawAsDecimal(raw, rawPerCur);
+    return result.toString();
+  }
+
   @override
   String truncateDecimal(Decimal input, {int digits = maxDecimalDigits}) {
     Decimal bigger = input.shift(digits);
@@ -332,7 +342,7 @@ class CWNanoUtil extends NanoUtil {
   @override
   String getRawAsUsableString(String? raw, BigInt rawPerCur) {
     final String res =
-        truncateDecimal(getRawAsDecimal(raw, rawPerCur), digits: maxDecimalDigits + 9);
+        truncateDecimal(_getRawAsDecimal(raw, rawPerCur), digits: maxDecimalDigits + 9);
 
     if (raw == null || raw == "0" || raw == "00000000000000000000000000000000") {
       return "0";
@@ -361,7 +371,7 @@ class CWNanoUtil extends NanoUtil {
   @override
   String getRawAccuracy(String? raw, BigInt rawPerCur) {
     final String rawString = getRawAsUsableString(raw, rawPerCur);
-    final String rawDecimalString = getRawAsDecimal(raw, rawPerCur).toString();
+    final String rawDecimalString = _getRawAsDecimal(raw, rawPerCur).toString();
 
     if (raw == null || raw.isEmpty || raw == "0") {
       return "";
@@ -396,6 +406,13 @@ class CWNanoUtil extends NanoUtil {
     late String publicAddress;
 
     if (seedKey != null) {
+      if (seedKey.length == 64) {
+        try {
+          mnemonic = nanoUtil!.seedToMnemonic(seedKey);
+        } catch (e) {
+          print("not a valid 'nano' seed key");
+        }
+      }
       if (derivationType == DerivationType.bip39) {
         publicAddress = await hdSeedToAddress(seedKey, 0);
       } else if (derivationType == DerivationType.nano) {
@@ -419,7 +436,8 @@ class CWNanoUtil extends NanoUtil {
 
     AccountInfoResponse? accountInfo = await nanoClient.getAccountInfo(publicAddress);
     if (accountInfo == null) {
-      accountInfo = AccountInfoResponse(frontier: "", balance: "0", representative: "", confirmationHeight: 0);
+      accountInfo = AccountInfoResponse(
+          frontier: "", balance: "0", representative: "", confirmationHeight: 0);
     }
     accountInfo.address = publicAddress;
     return accountInfo;
@@ -439,7 +457,11 @@ class CWNanoUtil extends NanoUtil {
     if (seedKey?.length == 128) {
       return [DerivationType.bip39];
     } else if (seedKey?.length == 64) {
-      return [DerivationType.nano];
+      try {
+        mnemonic = nanoUtil!.seedToMnemonic(seedKey!);
+      } catch (e) {
+        print("not a valid 'nano' seed key");
+      }
     }
 
     late String publicAddressStandard;
@@ -493,7 +515,7 @@ class CWNanoUtil extends NanoUtil {
       // we don't know for sure:
       return [DerivationType.nano, DerivationType.bip39];
     } catch (e) {
-      return [DerivationType.unknown];
+      return [DerivationType.nano, DerivationType.bip39];
     }
   }
 }

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

@@ -29,6 +29,14 @@ class DesktopWalletSelectionDropDown extends StatefulWidget {
 }
 
 class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionDropDown> {
+  final moneroIcon = Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
+  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 bitcoinCashIcon = Image.asset('assets/images/bch_icon.png', height: 24, width: 24);
+  final nanoIcon = Image.asset('assets/images/nano_icon.png', height: 24, width: 24);
+  final bananoIcon = Image.asset('assets/images/nano_icon.png', height: 24, width: 24);
   final nonWalletTypeIcon = Image.asset('assets/images/close.png', height: 24, width: 24);
 
   Image _newWalletImage(BuildContext context) => Image.asset(

lib/src/screens/dashboard/edit_token_page.dart

@@ -194,7 +194,9 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                           contractAddress: _contractAddressController.text,
                           decimal: int.parse(_tokenDecimalController.text),
                         ));
-                        Navigator.pop(context);
+                        if (context.mounted) {
+                          Navigator.pop(context);
+                        }
                       }
                     },
                     text: S.of(context).save,

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

@@ -99,19 +99,22 @@ class AddressPage extends BasePage {
   Widget? trailing(BuildContext context) {
     return Material(
       color: Colors.transparent,
-      child: IconButton(
+      child: Semantics(
-        padding: EdgeInsets.zero,
+        label: S.of(context).share,
-        constraints: BoxConstraints(),
+        child: IconButton(
-        highlightColor: Colors.transparent,
+          padding: EdgeInsets.zero,
-        splashColor: Colors.transparent,
+          constraints: BoxConstraints(),
-        iconSize: 25,
+          highlightColor: Colors.transparent,
-        onPressed: () {
+          splashColor: Colors.transparent,
-          ShareUtil.share(
+          iconSize: 25,
-            text: addressListViewModel.uri.toString(),
+          onPressed: () {
-            context: context,
+            ShareUtil.share(
-          );
+              text: addressListViewModel.uri.toString(),
-        },
+              context: context,
-        icon: Icon(Icons.share, size: 20, color: pageIconColor(context)),
+            );
+          },
+          icon: Icon(Icons.share, size: 20, color: pageIconColor(context)),
+        ),
       ),
     );
   }

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

@@ -31,21 +31,29 @@ class HeaderRow extends StatelessWidget {
                 fontWeight: FontWeight.w500,
                 color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor),
           ),
-          GestureDetector(
+          Semantics(
-            onTap: () {
+            container: true,
-              showPopUp<void>(
+            child: GestureDetector(
-                context: context,
+              onTap: () {
-                builder: (context) =>
+                showPopUp<void>(
-                    FilterWidget(dashboardViewModel: dashboardViewModel)
+                  context: context,
-              );
+                  builder: (context) => FilterWidget(dashboardViewModel: dashboardViewModel),
-            },
+                );
-            child: Container(
+              },
-              height: 36,
+              child: Semantics(
-              width: 36,
+                label: 'Transaction Filter',
-              decoration: BoxDecoration(
+                button: true,
-                  shape: BoxShape.circle,
+                enabled: true,
-                  color: Theme.of(context).extension<FilterTheme>()!.buttonColor),
+                child: Container(
-              child: filterIcon,
+                  height: 36,
+                  width: 36,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Theme.of(context).extension<FilterTheme>()!.buttonColor,
+                  ),
+                  child: filterIcon,
+                ),
+              ),
             ),
           )
         ],

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

@@ -30,9 +30,9 @@ class MenuWidgetState extends State<MenuWidget> {
       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'),
-      this.nanoIcon = Image.asset('assets/images/nano_menu.png'),
+      this.nanoIcon = Image.asset('assets/images/nano_icon.png'),
-      this.bananoIcon = Image.asset('assets/images/nano_menu.png');
+      this.bananoIcon = Image.asset('assets/images/nano_icon.png'),
-
+      this.bitcoinCashIcon = Image.asset('assets/images/bch_icon.png');
 
   final largeScreen = 731;
 
@@ -50,10 +50,10 @@ class MenuWidgetState extends State<MenuWidget> {
   Image litecoinIcon;
   Image havenIcon;
   Image ethereumIcon;
+  Image bitcoinCashIcon;
   Image nanoIcon;
   Image bananoIcon;
 
-
   @override
   void initState() {
     menuWidth = 0;
@@ -212,6 +212,8 @@ class MenuWidgetState extends State<MenuWidget> {
         return havenIcon;
       case WalletType.ethereum:
         return ethereumIcon;
+      case WalletType.bitcoinCash:
+        return bitcoinCashIcon;
       case WalletType.nano:
         return nanoIcon;
       case WalletType.banano:

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

@@ -1,5 +1,5 @@
+import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/rounded_checkbox.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/typography.dart';
@@ -71,77 +71,69 @@ class PresentReceiveOptionPicker extends StatelessWidget {
       builder: (BuildContext popUpContext) => Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: Colors.transparent,
-        body: AlertBackground(
+        body: Stack(
-          child: Column(
+          alignment: AlignmentDirectional.center,
-            mainAxisSize: MainAxisSize.min,
+          children:[ AlertBackground(
-            mainAxisAlignment: MainAxisAlignment.center,
+            child: Column(
-            children: [
+              mainAxisSize: MainAxisSize.min,
-              Spacer(),
+              mainAxisAlignment: MainAxisAlignment.center,
-              Container(
+              children: [
-                margin: EdgeInsets.symmetric(horizontal: 24),
+                Spacer(),
-                decoration: BoxDecoration(
+                Container(
-                  borderRadius: BorderRadius.circular(30),
+                  margin: EdgeInsets.symmetric(horizontal: 24),
-                  color: Theme.of(context).colorScheme.background,
+                  decoration: BoxDecoration(
-                ),
+                    borderRadius: BorderRadius.circular(30),
-                child: Padding(
+                    color: Theme.of(context).colorScheme.background,
-                  padding: const EdgeInsets.only(top: 24, bottom: 24),
+                  ),
-                  child: (ListView.separated(
+                  child: Padding(
-                    padding: EdgeInsets.zero,
+                    padding: const EdgeInsets.only(top: 24, bottom: 24),
-                    shrinkWrap: true,
+                    child: (ListView.separated(
-                    itemCount: receiveOptionViewModel.options.length,
+                      padding: EdgeInsets.zero,
-                    itemBuilder: (_, index) {
+                      shrinkWrap: true,
-                      final option = receiveOptionViewModel.options[index];
+                      itemCount: receiveOptionViewModel.options.length,
-                      return InkWell(
+                      itemBuilder: (_, index) {
-                        onTap: () {
+                        final option = receiveOptionViewModel.options[index];
-                          Navigator.pop(popUpContext);
+                        return InkWell(
+                          onTap: () {
+                            Navigator.pop(popUpContext);
 
-                          receiveOptionViewModel.selectReceiveOption(option);
+                            receiveOptionViewModel.selectReceiveOption(option);
-                        },
+                          },
-                        child: Padding(
+                          child: Padding(
-                          padding: const EdgeInsets.only(left: 24, right: 24),
+                            padding: const EdgeInsets.only(left: 24, right: 24),
-                          child: Observer(builder: (_) {
+                            child: Observer(builder: (_) {
-                            final value = receiveOptionViewModel.selectedReceiveOption;
+                              final value = receiveOptionViewModel.selectedReceiveOption;
 
-                            return Row(
+                              return Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
+                                children: [
-                                Text(option.toString(),
+                                  Text(option.toString(),
-                                    textAlign: TextAlign.left,
+                                      textAlign: TextAlign.left,
-                                    style: textSmall(
+                                      style: textSmall(
-                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
-                                    ).copyWith(
+                                      ).copyWith(
-                                      fontWeight:
+                                        fontWeight:
-                                          value == option ? FontWeight.w800 : FontWeight.w500,
+                                            value == option ? FontWeight.w800 : FontWeight.w500,
-                                    )),
+                                      )),
-                                RoundedCheckbox(
+                                  RoundedCheckbox(
-                                  value: value == option,
+                                    value: value == option,
-                                )
+                                  )
-                              ],
+                                ],
-                            );
+                              );
-                          }),
+                            }),
-                        ),
+                          ),
-                      );
+                        );
-                    },
+                      },
-                    separatorBuilder: (_, index) => SizedBox(height: 30),
+                      separatorBuilder: (_, index) => SizedBox(height: 30),
-                  )),
+                    )),
-                ),
-              ),
-              Spacer(),
-              Container(
-                margin: EdgeInsets.only(bottom: 40),
-                child: InkWell(
-                  onTap: () => Navigator.pop(popUpContext),
-                  child: CircleAvatar(
-                    child: Icon(
-                      Icons.close,
-                      color: Palette.darkBlueCraiola,
-                    ),
-                    backgroundColor: Colors.white,
                   ),
                 ),
-              )
+                Spacer()
-            ],
+              ],
+            ),
           ),
+            AlertCloseButton(onTap: () => Navigator.of(popUpContext).pop(), bottom: 40)
+          ],
         ),
       ),
       context: context,

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

@@ -416,37 +416,40 @@ class ExchangeCardState extends State<ExchangeCard> {
                                             width: 34,
                                             height: 34,
                                             padding: EdgeInsets.only(top: 0),
-                                            child: InkWell(
+                                            child: Semantics(
-                                              onTap: () async {
+                                              label: S.of(context).address_book,
-                                                final contact =
+                                              child: InkWell(
-                                                    await Navigator.of(context)
+                                                onTap: () async {
-                                                    .pushNamed(
+                                                  final contact =
-                                                  Routes.pickerAddressBook,
+                                                      await Navigator.of(context)
-                                                  arguments: widget.initialCurrency,
+                                                      .pushNamed(
-                                                );
+                                                    Routes.pickerAddressBook,
+                                                    arguments: widget.initialCurrency,
+                                                  );
 
-                                                if (contact is ContactBase &&
+                                                  if (contact is ContactBase &&
-                                                    contact.address != null) {
+                                                      contact.address != null) {
-                                                  setState(() =>
+                                                    setState(() =>
-                                                      addressController.text =
+                                                        addressController.text =
-                                                          contact.address);
+                                                            contact.address);
-                                                  widget.onPushAddressBookButton
+                                                    widget.onPushAddressBookButton
-                                                      ?.call(context);
+                                                        ?.call(context);
-                                                }
+                                                  }
-                                              },
+                                                },
-                                              child: Container(
+                                                child: Container(
-                                                  padding: EdgeInsets.all(8),
+                                                    padding: EdgeInsets.all(8),
-                                                  decoration: BoxDecoration(
+                                                    decoration: BoxDecoration(
-                                                      color: widget
+                                                        color: widget
-                                                          .addressButtonsColor,
+                                                            .addressButtonsColor,
-                                                      borderRadius:
+                                                        borderRadius:
-                                                          BorderRadius.all(
+                                                            BorderRadius.all(
-                                                              Radius.circular(
+                                                                Radius.circular(
-                                                                  6))),
+                                                                    6))),
-                                                  child: Image.asset(
+                                                    child: Image.asset(
-                                                    'assets/images/open_book.png',
+                                                      'assets/images/open_book.png',
-                                                    color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
+                                                      color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
-                                                  )),
+                                                    )),
+                                              ),
                                             )),
                                       ),
                                     Padding(
@@ -455,22 +458,25 @@ class ExchangeCardState extends State<ExchangeCard> {
                                             width: 34,
                                             height: 34,
                                             padding: EdgeInsets.only(top: 0),
-                                            child: InkWell(
+                                            child: Semantics(
-                                              onTap: () {
+                                              label: S.of(context).copy_address,
-                                                Clipboard.setData(ClipboardData(
+                                              child: InkWell(
-                                                    text: addressController
+                                                onTap: () {
-                                                        .text));
+                                                  Clipboard.setData(ClipboardData(
-                                                showBar<void>(
+                                                      text: addressController
-                                                    context,
+                                                          .text));
-                                                    S
+                                                  showBar<void>(
-                                                        .of(context)
+                                                      context,
-                                                        .copied_to_clipboard);
+                                                      S
-                                              },
+                                                          .of(context)
-                                              child: Container(
+                                                          .copied_to_clipboard);
-                                                  padding: EdgeInsets.fromLTRB(
+                                                },
-                                                      8, 8, 0, 8),
+                                                child: Container(
-                                                  color: Colors.transparent,
+                                                    padding: EdgeInsets.fromLTRB(
-                                                  child: copyImage),
+                                                        8, 8, 0, 8),
+                                                    color: Colors.transparent,
+                                                    child: copyImage),
+                                              ),
                                             )))
                                   ])))
                         ])),

lib/src/screens/exchange_trade/exchange_trade_page.dart

@@ -5,7 +5,6 @@ import 'package:cake_wallet/utils/request_review_handler.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/execution_state.dart';
@@ -26,16 +25,15 @@ import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 void showInformation(
     ExchangeTradeViewModel exchangeTradeViewModel, BuildContext context) {
-  final fetchingLabel = S.current.fetching;
   final trade = exchangeTradeViewModel.trade;
   final walletName = exchangeTradeViewModel.wallet.name;
 
   final information = exchangeTradeViewModel.isSendable
       ? S.current.exchange_result_confirm(
-          trade.amount ?? fetchingLabel, trade.from.toString(), walletName) +
+          trade.amount, trade.from.toString(), walletName) +
         exchangeTradeViewModel.extraInfo
       : S.current.exchange_result_description(
-          trade.amount ?? fetchingLabel, trade.from.toString()) +
+          trade.amount, trade.from.toString()) +
         exchangeTradeViewModel.extraInfo;
 
   showPopUp<void>(
@@ -177,7 +175,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                     ),
                     itemBuilder: (context, index) {
                       final item = widget.exchangeTradeViewModel.items[index];
-                      final value = item.data ?? fetchingLabel;
+                      final value = item.data;
 
                       final content = ListRow(
                         title: item.title,

lib/src/screens/nano/nano_change_rep_page.dart

@@ -6,7 +6,6 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_base.dart';
-import 'package:cw_nano/nano_wallet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -18,7 +17,7 @@ class NanoChangeRepPage extends BasePage {
   NanoChangeRepPage(WalletBase wallet)
       : _wallet = wallet,
         _addressController = TextEditingController() {
-    _addressController.text = (wallet as NanoWallet).representative;
+    _addressController.text = nano!.getRepresentative(wallet);
   }
 
   final TextEditingController _addressController;

lib/src/screens/restore/wallet_restore_from_keys_form.dart

@@ -124,9 +124,16 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
 
   Widget _restoreFromKeysFormFields() {
     if (widget.displayPrivateKeyField) {
+      // the term "private key" isn't actually what we're accepting here, and it's confusing to
+      // users of the nano community, what this form actually accepts (when importing for nano) is a nano seed in it's hex form, referred to in code as a "seed key"
+      // so we should change the placeholder text to reflect this
+      // supporting actual nano private keys is possible, but it's super niche in the nano community / they're not really used
+
+      bool nanoBased = widget.walletRestoreViewModel.type == WalletType.nano ||
+          widget.walletRestoreViewModel.type == WalletType.banano;
       return AddressTextField(
         controller: privateKeyController,
-        placeholder: S.of(context).private_key,
+        placeholder: nanoBased ? S.of(context).seed_key : S.of(context).private_key,
         options: [AddressTextFieldOption.paste],
         buttonColor: Theme.of(context).hintColor,
         onPushPasteButton: (_) {

lib/src/screens/seed/pre_seed_page.dart

@@ -73,6 +73,7 @@ class PreSeedPage extends BasePage {
       case WalletType.monero:
         return 25;
       case WalletType.ethereum:
+      case WalletType.bitcoinCash:
         return 12;
       default:
         return 24;

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

@@ -38,6 +38,11 @@ Future<String> extractAddressFromParsed(
       content = S.of(context).extracted_address_content('${parsedAddress.name} (Twitter)');
       address = parsedAddress.addresses.first;
       break;
+    case ParseFrom.mastodon:
+      title = S.of(context).address_detected;
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (Mastodon)');
+      address = parsedAddress.addresses.first;
+      break;
     case ParseFrom.yatRecord:
       if (parsedAddress.name.isEmpty) {
         title = S.of(context).yat_error;

lib/src/screens/settings/connection_sync_page.dart

@@ -23,7 +23,7 @@ class ConnectionSyncPage extends BasePage {
   @override
   String get title => S.current.connection_sync;
 
-  final Web3WalletService web3walletService;
+  final Web3WalletService? web3walletService;
   final DashboardViewModel dashboardViewModel;
 
   @override
@@ -85,13 +85,13 @@ class ConnectionSyncPage extends BasePage {
               );
             },
           ),
-          if (dashboardViewModel.wallet.type == WalletType.ethereum) ...[
+          if (dashboardViewModel.wallet.type == WalletType.ethereum && DeviceInfo.instance.isMobile) ...[
             WalletConnectTile(
               onTap: () async {
                 Navigator.of(context).push(
                   MaterialPageRoute(
                     builder: (context) {
-                      return WalletConnectConnectionsView(web3walletService: web3walletService);
+                      return WalletConnectConnectionsView(web3walletService: web3walletService!);
                     },
                   ),
                 );

lib/src/screens/unspent_coins/unspent_coins_list_page.dart

@@ -1,8 +1,10 @@
+import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_list_view_model.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -79,6 +81,9 @@ class UnspentCoinsListFormState extends State<UnspentCoinsListForm> {
                 itemBuilder: (_, int index) {
                   return Observer(builder: (_) {
                     final item = unspentCoinsListViewModel.items[index];
+                    final address = unspentCoinsListViewModel.wallet.type == WalletType.bitcoinCash
+                        ? bitcoinCash!.getCashAddrFormat(item.address)
+                        : item.address;
 
                     return GestureDetector(
                         onTap: () =>
@@ -88,7 +93,7 @@ class UnspentCoinsListFormState extends State<UnspentCoinsListForm> {
                         child: UnspentCoinsListItem(
                             note: item.note,
                             amount: item.amount,
-                            address: item.address,
+                            address: address,
                             isSending: item.isSending,
                             isFrozen: item.isFrozen,
                             onCheckBoxTap: item.isFrozen

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -14,7 +14,6 @@ import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -45,6 +44,10 @@ class WalletListBody extends StatefulWidget {
 
 class WalletListBodyState extends State<WalletListBody> {
   final nonWalletTypeIcon = Image.asset('assets/images/close.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 bitcoinCashIcon = Image.asset('assets/images/bch_icon.png', height: 24, width: 24);
+  final nanoIcon = Image.asset('assets/images/nano_icon.png', height: 24, width: 24);
   final scrollController = ScrollController();
   final double tileHeight = 60;
   Flushbar<void>? _progressBar;
@@ -60,175 +63,182 @@ class WalletListBodyState extends State<WalletListBody> {
 
     return Container(
       padding: EdgeInsets.only(top: 16),
-      child: ScrollableWithBottomSection(
+      child: Column(
-        contentPadding: EdgeInsets.only(bottom: 20),
+        children: [
-        content: Container(
+          Expanded(
-          child: Observer(
+            child: Container(
-            builder: (_) => ListView.separated(
+              child: Observer(
-              shrinkWrap: true,
+                builder: (_) => ListView.separated(
-              physics: const NeverScrollableScrollPhysics(),
+                  physics: const BouncingScrollPhysics(),
-              separatorBuilder: (_, index) =>
+                  separatorBuilder: (_, index) =>
-                  Divider(color: Theme.of(context).colorScheme.background, height: 32),
+                      Divider(color: Theme.of(context).colorScheme.background, height: 32),
-              itemCount: widget.walletListViewModel.wallets.length,
+                  itemCount: widget.walletListViewModel.wallets.length,
-              itemBuilder: (__, index) {
+                  itemBuilder: (__, index) {
-                final wallet = widget.walletListViewModel.wallets[index];
+                    final wallet = widget.walletListViewModel.wallets[index];
-                final currentColor = wallet.isCurrent
+                    final currentColor = wallet.isCurrent
-                    ? Theme.of(context)
+                        ? Theme.of(context)
-                        .extension<WalletListTheme>()!
+                            .extension<WalletListTheme>()!
-                        .createNewWalletButtonBackgroundColor
+                            .createNewWalletButtonBackgroundColor
-                    : Theme.of(context).colorScheme.background;
+                        : Theme.of(context).colorScheme.background;
-                final row = GestureDetector(
+                    final row = GestureDetector(
-                  onTap: () => wallet.isCurrent ? null : _loadWallet(wallet),
+                      onTap: () => wallet.isCurrent ? null : _loadWallet(wallet),
-                  child: Container(
+                      child: Container(
-                    height: tileHeight,
+                        height: tileHeight,
-                    width: double.infinity,
+                        width: double.infinity,
-                    child: Row(
+                        child: Row(
-                      children: <Widget>[
+                          children: <Widget>[
-                        Container(
+                            Container(
-                          height: tileHeight,
+                              height: tileHeight,
-                          width: 4,
+                              width: 4,
-                          decoration: BoxDecoration(
+                              decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(
+                                  borderRadius: BorderRadius.only(
-                                  topRight: Radius.circular(4), bottomRight: Radius.circular(4)),
+                                      topRight: Radius.circular(4),
-                              color: currentColor),
+                                      bottomRight: Radius.circular(4)),
-                        ),
+                                  color: currentColor),
-                        Expanded(
-                          child: Container(
-                            height: tileHeight,
-                            padding: EdgeInsets.only(left: 20, right: 20),
-                            color: Theme.of(context).colorScheme.background,
-                            alignment: Alignment.centerLeft,
-                            child: Row(
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: <Widget>[
-                                wallet.isEnabled
-                                    ? buildIconFromPath(currencyForWalletType(wallet.type).iconPath)
-                                    : nonWalletTypeIcon,
-                                SizedBox(width: 10),
-                                Flexible(
-                                  child: Text(
-                                    wallet.name,
-                                    maxLines: null,
-                                    softWrap: true,
-                                    style: TextStyle(
-                                      fontSize: 22,
-                                      fontWeight: FontWeight.w500,
-                                      color:
-                                          Theme.of(context).extension<CakeTextTheme>()!.titleColor,
-                                    ),
-                                  ),
-                                ),
-                              ],
                             ),
-                          ),
+                            Expanded(
-                        ),
+                              child: Container(
-                      ],
+                                height: tileHeight,
-                    ),
+                                padding: EdgeInsets.only(left: 20, right: 20),
-                  ),
+                                color: Theme.of(context).colorScheme.background,
-                );
+                                alignment: Alignment.centerLeft,
-
+                                child: Row(
-                return wallet.isCurrent
+                                  crossAxisAlignment: CrossAxisAlignment.center,
-                    ? row
+                                  children: <Widget>[
-                    : Row(
+                                    wallet.isEnabled
-                        children: [
+                                        ? buildIconFromPath(currencyForWalletType(wallet.type).iconPath)
-                          Expanded(child: row),
+                                        : nonWalletTypeIcon,
-                          GestureDetector(
+                                    SizedBox(width: 10),
-                            onTap: () => Navigator.of(context).pushNamed(Routes.walletEdit,
+                                    Flexible(
-                                arguments: [widget.walletListViewModel, wallet]),
+                                      child: Text(
-                            child: Container(
+                                        wallet.name,
-                              padding: EdgeInsets.only(right: 20),
+                                        maxLines: null,
-                              child: Center(
+                                        softWrap: true,
-                                child: Container(
+                                        style: TextStyle(
-                                  height: 40,
+                                          fontSize: 22,
-                                  width: 44,
+                                          fontWeight: FontWeight.w500,
-                                  padding: EdgeInsets.all(10),
+                                          color: Theme.of(context)
-                                  decoration: BoxDecoration(
+                                              .extension<CakeTextTheme>()!
-                                    shape: BoxShape.circle,
+                                              .titleColor,
-                                    color: Theme.of(context)
+                                        ),
-                                        .extension<ReceivePageTheme>()!
+                                      ),
-                                        .iconsBackgroundColor,
+                                    ),
-                                  ),
+                                  ],
-                                  child: Icon(
-                                    Icons.edit,
-                                    size: 14,
-                                    color:
-                                        Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
-                                  ),
                                 ),
                               ),
                             ),
-                          ),
+                          ],
-                        ],
+                        ),
-                      );
+                      ),
-              },
+                    );
+
+                    return wallet.isCurrent
+                        ? row
+                        : Row(
+                            children: [
+                              Expanded(child: row),
+                              GestureDetector(
+                                onTap: () => Navigator.of(context).pushNamed(Routes.walletEdit,
+                                    arguments: [widget.walletListViewModel, wallet]),
+                                child: Container(
+                                  padding: EdgeInsets.only(right: 20),
+                                  child: Center(
+                                    child: Container(
+                                      height: 40,
+                                      width: 44,
+                                      padding: EdgeInsets.all(10),
+                                      decoration: BoxDecoration(
+                                        shape: BoxShape.circle,
+                                        color: Theme.of(context)
+                                            .extension<ReceivePageTheme>()!
+                                            .iconsBackgroundColor,
+                                      ),
+                                      child: Icon(
+                                        Icons.edit,
+                                        size: 14,
+                                        color: Theme.of(context)
+                                            .extension<ReceivePageTheme>()!
+                                            .iconsColor,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ],
+                          );
+                  },
+                ),
+              ),
             ),
           ),
-        ),
+          Padding(
-        bottomSectionPadding: EdgeInsets.only(bottom: 24, right: 24, left: 24),
+            padding: const EdgeInsets.all(24),
-        bottomSection: Column(
+            child: Column(
-          children: <Widget>[
+              children: <Widget>[
-            PrimaryImageButton(
+                PrimaryImageButton(
-              onPressed: () {
+                  onPressed: () {
-                //TODO(David): Find a way to optimize this
+                    //TODO(David): Find a way to optimize this
-                if (isSingleCoin) {
+                    if (isSingleCoin) {
-                  if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                      if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
-                    widget.authService.authenticateAction(
+                        widget.authService.authenticateAction(
-                      context,
+                          context,
-                      route: Routes.newWallet,
+                          route: Routes.newWallet,
-                      arguments: widget.walletListViewModel.currentWalletType,
+                          arguments: widget.walletListViewModel.currentWalletType,
-                      conditionToDetermineIfToUse2FA:
+                          conditionToDetermineIfToUse2FA:
-                          widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                              widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
-                    );
+                        );
-                  } else {
+                      } else {
-                    Navigator.of(context).pushNamed(
+                        Navigator.of(context).pushNamed(
-                      Routes.newWallet,
+                          Routes.newWallet,
-                      arguments: widget.walletListViewModel.currentWalletType,
+                          arguments: widget.walletListViewModel.currentWalletType,
-                    );
+                        );
-                  }
+                      }
-                } else {
+                    } else {
-                  if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                      if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
-                    widget.authService.authenticateAction(
+                        widget.authService.authenticateAction(
-                      context,
+                          context,
-                      route: Routes.newWalletType,
+                          route: Routes.newWalletType,
-                      conditionToDetermineIfToUse2FA:
+                          conditionToDetermineIfToUse2FA:
-                          widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                              widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
-                    );
+                        );
-                  } else {
+                      } else {
-                    Navigator.of(context).pushNamed(Routes.newWalletType);
+                        Navigator.of(context).pushNamed(Routes.newWalletType);
-                  }
+                      }
-                }
+                    }
-              },
+                  },
-              image: newWalletImage,
+                  image: newWalletImage,
-              text: S.of(context).wallet_list_create_new_wallet,
+                  text: S.of(context).wallet_list_create_new_wallet,
-              color: Theme.of(context).primaryColor,
+                  color: Theme.of(context).primaryColor,
-              textColor: Colors.white,
+                  textColor: Colors.white,
+                ),
+                SizedBox(height: 10.0),
+                PrimaryImageButton(
+                  onPressed: () {
+                    if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                      widget.authService.authenticateAction(
+                        context,
+                        route: Routes.restoreOptions,
+                        arguments: false,
+                        conditionToDetermineIfToUse2FA:
+                            widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                      );
+                    } else {
+                      Navigator.of(context).pushNamed(Routes.restoreOptions, arguments: false);
+                    }
+                  },
+                  image: restoreWalletImage,
+                  text: S.of(context).wallet_list_restore_wallet,
+                  color: Theme.of(context).cardColor,
+                  textColor: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
+                )
+              ],
             ),
-            SizedBox(height: 10.0),
+          ),
-            PrimaryImageButton(
+        ],
-              onPressed: () {
-                if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
-                  widget.authService.authenticateAction(
-                    context,
-                    route: Routes.restoreOptions,
-                    arguments: false,
-                    conditionToDetermineIfToUse2FA:
-                        widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
-                  );
-                } else {
-                  Navigator.of(context).pushNamed(Routes.restoreOptions, arguments: false);
-                }
-              },
-              image: restoreWalletImage,
-              text: S.of(context).wallet_list_restore_wallet,
-              color: Theme.of(context).cardColor,
-              textColor: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
-            )
-          ],
-        ),
       ),
     );
   }
-
+  
   Widget buildIconFromPath(String? iconPath) {
     if (iconPath != null && iconPath.contains('svg')) {
       return SvgPicture.asset(

lib/src/widgets/alert_close_button.dart

@@ -1,8 +1,10 @@
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 
 class AlertCloseButton extends StatelessWidget {
   AlertCloseButton({this.image, this.bottom, this.onTap});
+
   final VoidCallback? onTap;
 
   final Image? image;
@@ -19,12 +21,17 @@ class AlertCloseButton extends StatelessWidget {
       bottom: bottom ?? 60,
       child: GestureDetector(
         onTap: onTap ?? () => Navigator.of(context).pop(),
-        child: Container(
+        child: Semantics(
-          height: 42,
+          label: S.of(context).close,
-          width: 42,
+          button: true,
-          decoration: BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+          enabled: true,
-          child: Center(
+          child: Container(
-            child: image ?? closeButton,
+            height: 42,
+            width: 42,
+            decoration: BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+            child: Center(
+              child: image ?? closeButton,
+            ),
           ),
         ),
       ),

lib/src/widgets/seed_widget.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/src/widgets/validable_annotated_editable_text.dart';
@@ -75,7 +76,7 @@ class SeedWidgetState extends State<SeedWidget> {
               Positioned(
                   top: 10,
                   left: 0,
-                  child: Text('Enter your seed',
+                  child: Text(S.of(context).enter_seed_phrase,
                       style: TextStyle(
                           fontSize: 16.0, color: Theme.of(context).hintColor))),
             Padding(

lib/store/app_store.dart

@@ -1,5 +1,8 @@
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
+import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -40,5 +43,9 @@ abstract class AppStoreBase with Store {
     this.wallet?.close();
     this.wallet = wallet;
     this.wallet!.setExceptionHandler(ExceptionHandler.onError);
+
+    if (wallet.type == WalletType.ethereum) {
+      getIt.get<Web3WalletService>().init();
+    }
   }
 }

lib/store/settings_store.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/buy_provider_types.dart';
 import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';
@@ -85,7 +86,8 @@ abstract class SettingsStoreBase with Store {
       TransactionPriority? initialMoneroTransactionPriority,
       TransactionPriority? initialHavenTransactionPriority,
       TransactionPriority? initialLitecoinTransactionPriority,
-      TransactionPriority? initialEthereumTransactionPriority})
+      TransactionPriority? initialEthereumTransactionPriority,
+      TransactionPriority? initialBitcoinCashTransactionPriority})
       : nodes = ObservableMap<WalletType, Node>.of(nodes),
         powNodes = ObservableMap<WalletType, Node>.of(powNodes),
         _sharedPreferences = sharedPreferences,
@@ -146,6 +148,10 @@ abstract class SettingsStoreBase with Store {
       priority[WalletType.ethereum] = initialEthereumTransactionPriority;
     }
 
+    if (initialBitcoinCashTransactionPriority != null) {
+      priority[WalletType.bitcoinCash] = initialBitcoinCashTransactionPriority;
+    }
+
     reaction(
         (_) => fiatCurrency,
         (FiatCurrency fiatCurrency) => sharedPreferences.setString(
@@ -174,6 +180,9 @@ abstract class SettingsStoreBase with Store {
         case WalletType.ethereum:
           key = PreferencesKey.ethereumTransactionPriority;
           break;
+        case WalletType.bitcoinCash:
+          key = PreferencesKey.bitcoinCashTransactionPriority;
+          break;
         default:
           key = null;
       }
@@ -526,12 +535,13 @@ abstract class SettingsStoreBase with Store {
     TransactionPriority? moneroTransactionPriority = monero?.deserializeMoneroTransactionPriority(
         raw: sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!);
     TransactionPriority? bitcoinTransactionPriority =
-        bitcoin?.deserializeBitcoinTransactionPriority(
+    bitcoin?.deserializeBitcoinTransactionPriority(
-            sharedPreferences.getInt(PreferencesKey.bitcoinTransactionPriority)!);
+        sharedPreferences.getInt(PreferencesKey.bitcoinTransactionPriority)!);
 
     TransactionPriority? havenTransactionPriority;
     TransactionPriority? litecoinTransactionPriority;
     TransactionPriority? ethereumTransactionPriority;
+    TransactionPriority? bitcoinCashTransactionPriority;
 
     if (sharedPreferences.getInt(PreferencesKey.havenTransactionPriority) != null) {
       havenTransactionPriority = monero?.deserializeMoneroTransactionPriority(
@@ -545,12 +555,17 @@ abstract class SettingsStoreBase with Store {
       ethereumTransactionPriority = bitcoin?.deserializeLitecoinTransactionPriority(
           sharedPreferences.getInt(PreferencesKey.ethereumTransactionPriority)!);
     }
+    if (sharedPreferences.getInt(PreferencesKey.bitcoinCashTransactionPriority) != null) {
+      bitcoinCashTransactionPriority = bitcoinCash?.deserializeBitcoinCashTransactionPriority(
+          sharedPreferences.getInt(PreferencesKey.bitcoinCashTransactionPriority)!);
+    }
 
     moneroTransactionPriority ??= monero?.getDefaultTransactionPriority();
     bitcoinTransactionPriority ??= bitcoin?.getMediumTransactionPriority();
     havenTransactionPriority ??= monero?.getDefaultTransactionPriority();
     litecoinTransactionPriority ??= bitcoin?.getLitecoinTransactionPriorityMedium();
     ethereumTransactionPriority ??= ethereum?.getDefaultTransactionPriority();
+    bitcoinCashTransactionPriority ??= bitcoinCash?.getDefaultTransactionPriority();
 
     final currentBalanceDisplayMode = BalanceDisplayMode.deserialize(
         raw: sharedPreferences.getInt(PreferencesKey.currentBalanceDisplayModeKey)!);
@@ -560,7 +575,8 @@ abstract class SettingsStoreBase with Store {
     final isAppSecure = sharedPreferences.getBool(PreferencesKey.isAppSecureKey) ?? false;
     final disableBuy = sharedPreferences.getBool(PreferencesKey.disableBuyKey) ?? false;
     final disableSell = sharedPreferences.getBool(PreferencesKey.disableSellKey) ?? false;
-    final defaultBuyProvider = BuyProviderType.values[sharedPreferences.getInt(PreferencesKey.defaultBuyProvider) ?? 0];
+    final defaultBuyProvider = BuyProviderType.values[sharedPreferences.getInt(
+        PreferencesKey.defaultBuyProvider) ?? 0];
     final currentFiatApiMode = FiatApiMode.deserialize(
         raw: sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey) ??
             FiatApiMode.enabled.raw);
@@ -579,7 +595,7 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets) ??
             false;
     final shouldRequireTOTP2FAForExchangesToInternalWallets = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
+        .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
         false;
     final shouldRequireTOTP2FAForAddingContacts =
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts) ?? false;
@@ -587,7 +603,7 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets) ??
             false;
     final shouldRequireTOTP2FAForAllSecurityAndBackupSettings = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings) ??
+        .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings) ??
         false;
     final useTOTP2FA = sharedPreferences.getBool(PreferencesKey.useTOTP2FA) ?? false;
     final totpSecretKey = sharedPreferences.getString(PreferencesKey.totpSecretKey) ?? '';
@@ -612,7 +628,7 @@ abstract class SettingsStoreBase with Store {
         ? PinCodeRequiredDuration.deserialize(raw: timeOutDuration)
         : defaultPinCodeTimeOutDuration;
     final sortBalanceBy =
-        SortBalanceBy.values[sharedPreferences.getInt(PreferencesKey.sortBalanceBy) ?? 0];
+    SortBalanceBy.values[sharedPreferences.getInt(PreferencesKey.sortBalanceBy) ?? 0];
     final pinNativeTokenAtTop =
         sharedPreferences.getBool(PreferencesKey.pinNativeTokenAtTop) ?? true;
     final useEtherscan = sharedPreferences.getBool(PreferencesKey.useEtherscan) ?? true;
@@ -626,9 +642,11 @@ abstract class SettingsStoreBase with Store {
         await LanguageService.localeDetection();
     final nodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
     final bitcoinElectrumServerId =
-        sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
+    sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
     final litecoinElectrumServerId =
-        sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
+    sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
+    final bitcoinCashElectrumServerId =
+    sharedPreferences.getInt(PreferencesKey.currentBitcoinCashNodeIdKey);
     final havenNodeId = sharedPreferences.getInt(PreferencesKey.currentHavenNodeIdKey);
     final ethereumNodeId = sharedPreferences.getInt(PreferencesKey.currentEthereumNodeIdKey);
     final nanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoNodeIdKey);
@@ -638,13 +656,14 @@ abstract class SettingsStoreBase with Store {
     final litecoinElectrumServer = nodeSource.get(litecoinElectrumServerId);
     final havenNode = nodeSource.get(havenNodeId);
     final ethereumNode = nodeSource.get(ethereumNodeId);
+    final bitcoinCashElectrumServer = nodeSource.get(bitcoinCashElectrumServerId);
     final nanoNode = nodeSource.get(nanoNodeId);
     final nanoPowNode = powNodeSource.get(nanoPowNodeId);
     final packageInfo = await PackageInfo.fromPlatform();
     final deviceName = await _getDeviceName() ?? '';
     final shouldShowYatPopup = sharedPreferences.getBool(PreferencesKey.shouldShowYatPopup) ?? true;
     final generateSubaddresses =
-        sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey);
+    sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey);
 
     final autoGenerateSubaddressStatus = generateSubaddresses != null
         ? AutoGenerateSubaddressStatus.deserialize(raw: generateSubaddresses)
@@ -672,70 +691,76 @@ abstract class SettingsStoreBase with Store {
       nodes[WalletType.ethereum] = ethereumNode;
     }
 
+    if (bitcoinCashElectrumServer != null) {
+      nodes[WalletType.bitcoinCash] = bitcoinCashElectrumServer;
+    }
+
     if (nanoNode != null) {
       nodes[WalletType.nano] = nanoNode;
     }
+
     if (nanoPowNode != null) {
       powNodes[WalletType.nano] = nanoPowNode;
     }
 
-    final savedSyncMode = SyncMode.all.firstWhere((element) {
+      final savedSyncMode = SyncMode.all.firstWhere((element) {
-      return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 1);
+        return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 1);
-    });
+      });
-    final savedSyncAll = sharedPreferences.getBool(PreferencesKey.syncAllKey) ?? true;
+      final savedSyncAll = sharedPreferences.getBool(PreferencesKey.syncAllKey) ?? true;
 
-    return SettingsStore(
+      return SettingsStore(
-        sharedPreferences: sharedPreferences,
+          sharedPreferences: sharedPreferences,
-        initialShouldShowMarketPlaceInDashboard: shouldShowMarketPlaceInDashboard,
+          initialShouldShowMarketPlaceInDashboard: shouldShowMarketPlaceInDashboard,
-        nodes: nodes,
+          nodes: nodes,
-        powNodes: powNodes,
+          powNodes: powNodes,
-        appVersion: packageInfo.version,
+          appVersion: packageInfo.version,
-        deviceName: deviceName,
+          deviceName: deviceName,
-        isBitcoinBuyEnabled: isBitcoinBuyEnabled,
+          isBitcoinBuyEnabled: isBitcoinBuyEnabled,
-        initialFiatCurrency: currentFiatCurrency,
+          initialFiatCurrency: currentFiatCurrency,
-        initialBalanceDisplayMode: currentBalanceDisplayMode,
+          initialBalanceDisplayMode: currentBalanceDisplayMode,
-        initialSaveRecipientAddress: shouldSaveRecipientAddress,
+          initialSaveRecipientAddress: shouldSaveRecipientAddress,
-        initialAutoGenerateSubaddressStatus: autoGenerateSubaddressStatus,
+          initialAutoGenerateSubaddressStatus: autoGenerateSubaddressStatus,
-        initialAppSecure: isAppSecure,
+          initialAppSecure: isAppSecure,
-        initialDisableBuy: disableBuy,
+          initialDisableBuy: disableBuy,
-        initialDisableSell: disableSell,
+          initialDisableSell: disableSell,
-        initialDefaultBuyProvider: defaultBuyProvider,
+          initialDefaultBuyProvider: defaultBuyProvider,
-        initialFiatMode: currentFiatApiMode,
+          initialFiatMode: currentFiatApiMode,
-        initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
+          initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
-        initialCake2FAPresetOptions: selectedCake2FAPreset,
+          initialCake2FAPresetOptions: selectedCake2FAPreset,
-        initialUseTOTP2FA: useTOTP2FA,
+          initialUseTOTP2FA: useTOTP2FA,
-        initialTotpSecretKey: totpSecretKey,
+          initialTotpSecretKey: totpSecretKey,
-        initialFailedTokenTrial: tokenTrialNumber,
+          initialFailedTokenTrial: tokenTrialNumber,
-        initialExchangeStatus: exchangeStatus,
+          initialExchangeStatus: exchangeStatus,
-        initialTheme: savedTheme,
+          initialTheme: savedTheme,
-        actionlistDisplayMode: actionListDisplayMode,
+          actionlistDisplayMode: actionListDisplayMode,
-        initialPinLength: pinLength,
+          initialPinLength: pinLength,
-        pinTimeOutDuration: pinCodeTimeOutDuration,
+          pinTimeOutDuration: pinCodeTimeOutDuration,
-        initialLanguageCode: savedLanguageCode,
+          initialLanguageCode: savedLanguageCode,
-        sortBalanceBy: sortBalanceBy,
+          sortBalanceBy: sortBalanceBy,
-        pinNativeTokenAtTop: pinNativeTokenAtTop,
+          pinNativeTokenAtTop: pinNativeTokenAtTop,
-        useEtherscan: useEtherscan,
+          useEtherscan: useEtherscan,
-        initialMoneroTransactionPriority: moneroTransactionPriority,
+          initialMoneroTransactionPriority: moneroTransactionPriority,
-        initialBitcoinTransactionPriority: bitcoinTransactionPriority,
+          initialBitcoinTransactionPriority: bitcoinTransactionPriority,
-        initialHavenTransactionPriority: havenTransactionPriority,
+          initialHavenTransactionPriority: havenTransactionPriority,
-        initialLitecoinTransactionPriority: litecoinTransactionPriority,
+          initialLitecoinTransactionPriority: litecoinTransactionPriority,
-        initialShouldRequireTOTP2FAForAccessingWallet: shouldRequireTOTP2FAForAccessingWallet,
+          initialBitcoinCashTransactionPriority: bitcoinCashTransactionPriority,
-        initialShouldRequireTOTP2FAForSendsToContact: shouldRequireTOTP2FAForSendsToContact,
+          initialShouldRequireTOTP2FAForAccessingWallet: shouldRequireTOTP2FAForAccessingWallet,
-        initialShouldRequireTOTP2FAForSendsToNonContact: shouldRequireTOTP2FAForSendsToNonContact,
+          initialShouldRequireTOTP2FAForSendsToContact: shouldRequireTOTP2FAForSendsToContact,
-        initialShouldRequireTOTP2FAForSendsToInternalWallets:
+          initialShouldRequireTOTP2FAForSendsToNonContact: shouldRequireTOTP2FAForSendsToNonContact,
-            shouldRequireTOTP2FAForSendsToInternalWallets,
+          initialShouldRequireTOTP2FAForSendsToInternalWallets:
-        initialShouldRequireTOTP2FAForExchangesToInternalWallets:
+          shouldRequireTOTP2FAForSendsToInternalWallets,
-            shouldRequireTOTP2FAForExchangesToInternalWallets,
+          initialShouldRequireTOTP2FAForExchangesToInternalWallets:
-        initialShouldRequireTOTP2FAForAddingContacts: shouldRequireTOTP2FAForAddingContacts,
+          shouldRequireTOTP2FAForExchangesToInternalWallets,
-        initialShouldRequireTOTP2FAForCreatingNewWallets: shouldRequireTOTP2FAForCreatingNewWallets,
+          initialShouldRequireTOTP2FAForAddingContacts: shouldRequireTOTP2FAForAddingContacts,
-        initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings:
+          initialShouldRequireTOTP2FAForCreatingNewWallets: shouldRequireTOTP2FAForCreatingNewWallets,
-            shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
+          initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings:
-        initialEthereumTransactionPriority: ethereumTransactionPriority,
+          shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
-        backgroundTasks: backgroundTasks,
+          initialEthereumTransactionPriority: ethereumTransactionPriority,
-        initialSyncMode: savedSyncMode,
+          backgroundTasks: backgroundTasks,
-        initialSyncAll: savedSyncAll,
+          initialSyncMode: savedSyncMode,
-        shouldShowYatPopup: shouldShowYatPopup);
+          initialSyncAll: savedSyncAll,
-  }
+          shouldShowYatPopup: shouldShowYatPopup);
+    }
 
   Future<void> reload({required Box<Node> nodeSource}) async {
     final sharedPreferences = await getIt.getAsync<SharedPreferences>();
@@ -744,30 +769,35 @@ abstract class SettingsStoreBase with Store {
         raw: sharedPreferences.getString(PreferencesKey.currentFiatCurrencyKey)!);
 
     priority[WalletType.monero] = monero?.deserializeMoneroTransactionPriority(
-            raw: sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!) ??
+        raw: sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!) ??
         priority[WalletType.monero]!;
     priority[WalletType.bitcoin] = bitcoin?.deserializeBitcoinTransactionPriority(
-            sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!) ??
+        sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!) ??
         priority[WalletType.bitcoin]!;
 
     if (sharedPreferences.getInt(PreferencesKey.havenTransactionPriority) != null) {
       priority[WalletType.haven] = monero?.deserializeMoneroTransactionPriority(
-              raw: sharedPreferences.getInt(PreferencesKey.havenTransactionPriority)!) ??
+          raw: sharedPreferences.getInt(PreferencesKey.havenTransactionPriority)!) ??
           priority[WalletType.haven]!;
     }
     if (sharedPreferences.getInt(PreferencesKey.litecoinTransactionPriority) != null) {
       priority[WalletType.litecoin] = bitcoin?.deserializeLitecoinTransactionPriority(
-              sharedPreferences.getInt(PreferencesKey.litecoinTransactionPriority)!) ??
+          sharedPreferences.getInt(PreferencesKey.litecoinTransactionPriority)!) ??
           priority[WalletType.litecoin]!;
     }
     if (sharedPreferences.getInt(PreferencesKey.ethereumTransactionPriority) != null) {
       priority[WalletType.ethereum] = ethereum?.deserializeEthereumTransactionPriority(
-              sharedPreferences.getInt(PreferencesKey.ethereumTransactionPriority)!) ??
+          sharedPreferences.getInt(PreferencesKey.ethereumTransactionPriority)!) ??
           priority[WalletType.ethereum]!;
     }
+    if (sharedPreferences.getInt(PreferencesKey.bitcoinCashTransactionPriority) != null) {
+      priority[WalletType.bitcoinCash] = bitcoinCash?.deserializeBitcoinCashTransactionPriority(
+          sharedPreferences.getInt(PreferencesKey.bitcoinCashTransactionPriority)!) ??
+          priority[WalletType.bitcoinCash]!;
+    }
 
     final generateSubaddresses =
-        sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey);
+    sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey);
 
     autoGenerateSubaddressStatus = generateSubaddresses != null
         ? AutoGenerateSubaddressStatus.deserialize(raw: generateSubaddresses)
@@ -785,7 +815,8 @@ abstract class SettingsStoreBase with Store {
     isAppSecure = sharedPreferences.getBool(PreferencesKey.isAppSecureKey) ?? isAppSecure;
     disableBuy = sharedPreferences.getBool(PreferencesKey.disableBuyKey) ?? disableBuy;
     disableSell = sharedPreferences.getBool(PreferencesKey.disableSellKey) ?? disableSell;
-    defaultBuyProvider = BuyProviderType.values[sharedPreferences.getInt(PreferencesKey.defaultBuyProvider) ?? 0];
+    defaultBuyProvider =
+    BuyProviderType.values[sharedPreferences.getInt(PreferencesKey.defaultBuyProvider) ?? 0];
     allowBiometricalAuthentication =
         sharedPreferences.getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
             allowBiometricalAuthentication;
@@ -802,7 +833,7 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForSendsToInternalWallets) ??
             false;
     shouldRequireTOTP2FAForExchangesToInternalWallets = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
+        .getBool(PreferencesKey.shouldRequireTOTP2FAForExchangesToInternalWallets) ??
         false;
     shouldRequireTOTP2FAForAddingContacts =
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForAddingContacts) ?? false;
@@ -810,7 +841,7 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets) ??
             false;
     shouldRequireTOTP2FAForAllSecurityAndBackupSettings = sharedPreferences
-            .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings) ??
+        .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings) ??
         false;
     shouldShowMarketPlaceInDashboard =
         sharedPreferences.getBool(PreferencesKey.shouldShowMarketPlaceInDashboard) ??
@@ -846,9 +877,11 @@ abstract class SettingsStoreBase with Store {
 
     final nodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
     final bitcoinElectrumServerId =
-        sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
+    sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
     final litecoinElectrumServerId =
-        sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
+    sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
+    final bitcoinCashElectrumServerId =
+    sharedPreferences.getInt(PreferencesKey.currentBitcoinCashNodeIdKey);
     final havenNodeId = sharedPreferences.getInt(PreferencesKey.currentHavenNodeIdKey);
     final ethereumNodeId = sharedPreferences.getInt(PreferencesKey.currentEthereumNodeIdKey);
     final nanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoNodeIdKey);
@@ -858,6 +891,7 @@ abstract class SettingsStoreBase with Store {
     final litecoinElectrumServer = nodeSource.get(litecoinElectrumServerId);
     final havenNode = nodeSource.get(havenNodeId);
     final ethereumNode = nodeSource.get(ethereumNodeId);
+    final bitcoinCashNode = nodeSource.get(bitcoinCashElectrumServerId);
     final nanoNode = nodeSource.get(nanoNodeId);
 
     if (moneroNode != null) {
@@ -880,6 +914,10 @@ abstract class SettingsStoreBase with Store {
       nodes[WalletType.ethereum] = ethereumNode;
     }
 
+    if (bitcoinCashNode != null) {
+      nodes[WalletType.bitcoinCash] = bitcoinCashNode;
+    }
+
     if (nanoNode != null) {
       nodes[WalletType.nano] = nanoNode;
     }
@@ -904,6 +942,9 @@ abstract class SettingsStoreBase with Store {
       case WalletType.ethereum:
         await _sharedPreferences.setInt(PreferencesKey.currentEthereumNodeIdKey, node.key as int);
         break;
+      case WalletType.bitcoinCash:
+        await _sharedPreferences.setInt(PreferencesKey.currentBitcoinCashNodeIdKey, node.key as int);
+        break;
       case WalletType.nano:
         await _sharedPreferences.setInt(PreferencesKey.currentNanoNodeIdKey, node.key as int);
         break;

lib/twitter/twitter_api.dart

@@ -1,7 +1,8 @@
 import 'dart:convert';
+
+import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/twitter/twitter_user.dart';
 import 'package:http/http.dart' as http;
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
 class TwitterApi {
   static const twitterBearerToken = secrets.twitterBearerToken;
@@ -10,28 +11,49 @@ class TwitterApi {
   static const userPath = '/2/users/by/username/';
 
   static Future<TwitterUser> lookupUserByName({required String userName}) async {
-    final queryParams = {'user.fields': 'description', 'expansions': 'pinned_tweet_id'};
+    final queryParams = {
-
+      'user.fields': 'description',
+      'expansions': 'pinned_tweet_id',
+      'tweet.fields': 'note_tweet'
+    };
     final headers = {'authorization': 'Bearer $twitterBearerToken'};
-
     final uri = Uri(
-      scheme: httpsScheme,
+        scheme: httpsScheme,
-      host: apiHost,
+        host: apiHost,
-      path: userPath + userName,
+        path: userPath + userName,
-      queryParameters: queryParams,
+        queryParameters: queryParams);
-    );
 
-    var response = await http.get(uri, headers: headers);
+    final response = await http.get(uri, headers: headers).catchError((error) {
+      throw Exception('HTTP request failed: $error');
+    });
 
     if (response.statusCode != 200) {
       throw Exception('Unexpected http status: ${response.statusCode}');
     }
-    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
 
+    final Map<String, dynamic> responseJSON = jsonDecode(response.body) as Map<String, dynamic>;
     if (responseJSON['errors'] != null) {
       throw Exception(responseJSON['errors'][0]['detail']);
     }
 
-    return TwitterUser.fromJson(responseJSON);
+    return TwitterUser.fromJson(responseJSON, _getPinnedTweet(responseJSON));
+  }
+
+  static Tweet? _getPinnedTweet(Map<String, dynamic> responseJSON) {
+    final tweetId = responseJSON['data']['pinned_tweet_id'] as String?;
+    if (tweetId == null || responseJSON['includes'] == null) return null;
+
+    final tweetIncludes = List.from(responseJSON['includes']['tweets'] as List);
+    final pinnedTweetData = tweetIncludes.firstWhere(
+      (tweet) => tweet['id'] == tweetId,
+      orElse: () => null,
+    ) as Map<String, dynamic>?;
+
+    if (pinnedTweetData == null) return null;
+
+    final pinnedTweetText =
+        (pinnedTweetData['note_tweet']?['text'] ?? pinnedTweetData['text']) as String;
+
+    return Tweet(id: tweetId, text: pinnedTweetText);
   }
 }

lib/twitter/twitter_user.dart

@@ -4,25 +4,21 @@ class TwitterUser {
       required this.username,
       required this.name,
       required this.description,
-      this.tweets});
+      this.pinnedTweet});
 
   final String id;
   final String username;
   final String name;
   final String description;
-  final List<Tweet>? tweets;
+  final Tweet? pinnedTweet;
 
-  factory TwitterUser.fromJson(Map<String, dynamic> json) {
+  factory TwitterUser.fromJson(Map<String, dynamic> json, [Tweet? pinnedTweet]) {
     return TwitterUser(
       id: json['data']['id'] as String,
       username: json['data']['username'] as String,
       name: json['data']['name'] as String,
       description: json['data']['description'] as String? ?? '',
-      tweets: json['includes'] != null
+      pinnedTweet: pinnedTweet,
-          ? List.from(json['includes']['tweets'] as List)
-              .map((e) => Tweet.fromJson(e as Map<String, dynamic>))
-              .toList()
-          : null,
     );
   }
 }

lib/utils/exception_handler.dart

@@ -161,7 +161,7 @@ class ExceptionHandler {
     "Handshake error in client",
     "Error while launching http",
     "OS Error: Network is unreachable",
-    "ClientException: Write failed, uri=https:",
+    "ClientException: Write failed, uri=http",
   ];
 
   static Future<void> _addDeviceInfo(File file) async {

lib/utils/feature_flag.dart

@@ -1,3 +1,4 @@
 class FeatureFlag {
   static const bool isCakePayEnabled = false;
+  static const bool isExolixEnabled = false;
 }