Merge branch 'v4.12.0_v1.9.0' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password

Conflicts: assets/text/Monerocom_Release_Notes.txt assets/text/Release_Notes.txt cw_bitcoin/pubspec.lock cw_core/lib/node.dart cw_core/pubspec.lock cw_core/pubspec.yaml cw_ethereum/lib/ethereum_wallet.dart cw_monero/example/pubspec.lock cw_monero/ios/Classes/monero_api.cpp cw_monero/pubspec.lock cw_polygon/lib/polygon_wallet.dart lib/di.dart lib/router.dart lib/src/screens/restore/wallet_restore_from_seed_form.dart lib/src/screens/wallet_list/wallet_list_page.dart lib/store/settings_store.dart scripts/android/app_env.sh scripts/android/pubspec_gen.sh scripts/ios/app_env.sh scripts/macos/app_env.sh
2025-01-22 02:34:59 +00:00 · 2023-12-19 00:25:15 +02:00 · 2023-12-19 00:25:15 +02:00 · f747773f3a
commit f747773f3a
parent ba249854b3 01e2a84809
123 changed files with 10611 additions and 711 deletions
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@ -3,6 +3,12 @@ name: PR Test Build
 on:
  pull_request:
    branches: [main]
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch name to build'
+        required: true
+        default: 'main'

 jobs:
  PR_test_build:
@ -12,6 +18,14 @@ jobs:
      KEY_PASS: test@cake_wallet

    steps:
+      - name: is pr
+        if: github.event_name == 'pull_request'
+        run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
+
+      - name: is not pr
+        if: github.event_name != 'pull_request'
+        run: echo "BRANCH_NAME=${{ github.event.inputs.branch }}" >> $GITHUB_ENV
+
      - name: Free Up GitHub Actions Ubuntu Runner Disk Space
        run: |
          sudo rm -rf /usr/share/dotnet
@ -40,7 +54,7 @@ jobs:
          cd /opt/android
          -y curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
          cargo install cargo-ndk
-          git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
+          git clone https://github.com/cake-tech/cake_wallet.git --branch ${{ env.BRANCH_NAME }}
          cd cake_wallet/scripts/android/
          ./install_ndk.sh
          source ./app_env.sh cakewallet
@ -105,6 +119,7 @@ jobs:
          cd /opt/android/cake_wallet
          touch lib/.secrets.g.dart
          touch cw_ethereum/lib/.secrets.g.dart
+          touch cw_polygon/lib/.secrets.g.dart
          echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
          echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
          echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
@ -132,16 +147,16 @@ jobs:
          echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const payfuraApiKey = '${{ secrets.PAYFURA_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart
-          echo "const polygonScanApiKey = '${{ secrets.POLYGON_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart
          echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
          echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
          echo "const robinhoodCIdApiSecret = '${{ secrets.ROBINHOOD_CID_CLIENT_SECRET }}';" >> lib/.secrets.g.dart
          echo "const walletConnectProjectId = '${{ secrets.WALLET_CONNECT_PROJECT_ID }}';" >> lib/.secrets.g.dart
          echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const polygonScanApiKey = '${{ secrets.POLYGON_SCAN_API_KEY }}';" >> cw_ethereum/lib/.secrets.g.dart

      - name: Rename app
-        run: echo -e "id=com.cakewallet.test\nname=$GITHUB_HEAD_REF" > /opt/android/cake_wallet/android/app.properties
+        run: echo -e "id=com.cakewallet.test\nname=${{ env.BRANCH_NAME }}" > /opt/android/cake_wallet/android/app.properties

      - name: Build
        run: |
@ -156,7 +171,7 @@ jobs:
 #                appcenter distribute release \
 #                    --group "Testers" \
 #                    --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
-#                    --release-notes ${GITHUB_HEAD_REF} \
+#                    --release-notes ${{ env.BRANCH_NAME }} \
 #                    --app Cake-Labs/Cake-Wallet \
 #                    --token ${{ secrets.APP_CENTER_TOKEN }} \
 #                    --quiet
@ -165,7 +180,7 @@ jobs:
        run: |
          cd /opt/android/cake_wallet/build/app/outputs/apk/release
          mkdir test-apk
-          cp app-release.apk test-apk/$GITHUB_HEAD_REF.apk
+          cp app-release.apk test-apk/${{env.BRANCH_NAME}}.apk

      - name: Upload Artifact
        uses: kittaakos/upload-artifact-as-is@v0
@ -179,6 +194,6 @@ jobs:
          token: ${{ secrets.SLACK_APP_TOKEN }}
          path: /opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk
          channel: ${{ secrets.SLACK_APK_CHANNEL }}
-          title: "${{github.head_ref}}.apk"
-          filename: ${{github.head_ref}}.apk
+          title: "${{ env.BRANCH_NAME }}.apk"
+          filename: ${{ env.BRANCH_NAME }}.apk
          initial_comment: ${{ github.event.head_commit.message }}
--- a/assets/images/dfx_dark.png
+++ b/assets/images/dfx_dark.png
--- a/assets/images/dfx_light.png
+++ b/assets/images/dfx_light.png
--- a/assets/polygon_node_list.yml
+++ b/assets/polygon_node_list.yml
@ -1,6 +1,6 @@
+-
+  uri: polygon-rpc.com
 -
  uri: polygon-bor.publicnode.com
 -
-  uri: polygon-rpc.com
- 
  uri: polygon.llamarpc.com
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@ -1,2 +1,4 @@
-Monero Polyseed support, create and restore from a 16 words phrase and without the need to remember the wallet creation date
-Bug fixes and enhancements
+Polyseed enhancements
+New on-ramp provider DFX
+Usability enhancements
+Bug fixes
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1,3 +1,6 @@
-Monero Polyseed support, create and restore from a 16 words phrase and without the need to remember the wallet creation date
-Add NFTs tab to see all of your purchased NFTs on Ethereum
-Bug fixes and enhancements
+Add Polygon (Matic) wallet
+Polyseed enhancements
+New on-ramp provider DFX
+Usability enhancements
+Bitcoin enhancements
+Bug fixes
--- a/assets/text/cakewallet_weak_bitcoin_seeds_hashed_sorted_version1.txt
+++ b/assets/text/cakewallet_weak_bitcoin_seeds_hashed_sorted_version1.txt
--- a/cw_bitcoin/lib/electrum_balance.dart
+++ b/cw_bitcoin/lib/electrum_balance.dart
@ -4,7 +4,10 @@ import 'package:cw_bitcoin/bitcoin_amount_format.dart';
 import 'package:cw_core/balance.dart';

 class ElectrumBalance extends Balance {
-  const ElectrumBalance({required this.confirmed, required this.unconfirmed, required this.frozen})
+  const ElectrumBalance(
+      {required this.confirmed,
+      required this.unconfirmed,
+      required this.frozen})
      : super(confirmed, unconfirmed);

  static ElectrumBalance? fromJSON(String? jsonSource) {
@ -25,16 +28,19 @@ class ElectrumBalance extends Balance {
  final int frozen;

  @override
-  String get formattedAvailableBalance => bitcoinAmountToString(amount: confirmed - frozen);
+  String get formattedAvailableBalance =>
+      bitcoinAmountToString(amount: confirmed - unconfirmed.abs() - frozen);

  @override
-  String get formattedAdditionalBalance => bitcoinAmountToString(amount: unconfirmed);
+  String get formattedAdditionalBalance =>
+      bitcoinAmountToString(amount: unconfirmed);

-  String get formattedFrozenBalance {
+  @override
+  String get formattedUnAvailableBalance {
    final frozenFormatted = bitcoinAmountToString(amount: frozen);
    return frozenFormatted == '0.0' ? '' : frozenFormatted;
  }

-  String toJSON() =>
-      json.encode({'confirmed': confirmed, 'unconfirmed': unconfirmed, 'frozen': frozen});
+  String toJSON() => json.encode(
+      {'confirmed': confirmed, 'unconfirmed': unconfirmed, 'frozen': frozen});
 }
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@ -88,7 +88,7 @@ abstract class ElectrumWalletBase
      bitcoin.HDWallet.fromSeed(seedBytes).derivePath("m/44'/145'/0'/0");

  static int estimatedTransactionSize(int inputsCount, int outputsCounts) =>
-      inputsCount * 146 + outputsCounts * 33 + 8;
+      inputsCount * 68 + outputsCounts * 34 + 10;

  final bitcoin.HDWallet hd;
  final String mnemonic;
@ -735,8 +735,7 @@ abstract class ElectrumWalletBase
    final index = address != null
        ? walletAddresses.addresses.firstWhere((element) => element.address == address).index
        : null;
-    return index == null
-        ? base64Encode(hd.sign(message))
-        : base64Encode(hd.derive(index).sign(message));
+    final HD = index == null ? hd : hd.derive(index);
+    return base64Encode(HD.signMessage(message));
  }
 }
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@ -79,11 +79,11 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: cake-update-v3
-      resolved-ref: df9204144011ed9419eff7d9ef3143102a40252d
+      ref: cake-update-v4
+      resolved-ref: e19ffb7e7977278a75b27e0479b3c6f4034223b3
      url: "https://github.com/cake-tech/bitcoin_flutter.git"
    source: git
-    version: "2.0.2"
+    version: "2.1.0"
  boolean_selector:
    dependency: transitive
    description:
@ -164,15 +164,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
-  cake_backup:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
-      url: "https://github.com/cake-tech/cake_backup.git"
-    source: git
-    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -237,14 +228,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.5"
-  cupertino_icons:
-    dependency: transitive
-    description:
-      name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -261,7 +244,7 @@ packages:
    source: hosted
    version: "2.2.4"
  encrypt:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: encrypt
      sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
@ -715,23 +698,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
-  tor:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5"
-      url: "https://github.com/cake-tech/tor.git"
-    source: git
-    version: "0.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@ -22,7 +22,7 @@ dependencies:
  bitcoin_flutter:
    git:
      url: https://github.com/cake-tech/bitcoin_flutter.git
-      ref: cake-update-v3
+      ref: cake-update-v4
  bitbox:
    git:
      url: https://github.com/cake-tech/bitbox-flutter.git
--- a/cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart
+++ b/cw_bitcoin_cash/lib/src/bitcoin_cash_wallet.dart
@ -309,10 +309,8 @@ abstract class BitcoinCashWalletBase extends ElectrumWallet with Store {
    final index = address != null
        ? walletAddresses.addresses
            .firstWhere((element) => element.address == AddressUtils.toLegacyAddress(address))
-            .index
-        : null;
-    return index == null
-        ? base64Encode(hd.sign(message))
-        : base64Encode(hd.derive(index).sign(message));
+            .index : null;
+    final HD = index == null ? hd : hd.derive(index);
+    return base64Encode(HD.signMessage(message));
  }
 }
--- a/cw_bitcoin_cash/pubspec.yaml
+++ b/cw_bitcoin_cash/pubspec.yaml
@ -24,7 +24,7 @@ dependencies:
  bitcoin_flutter:
    git:
      url: https://github.com/cake-tech/bitcoin_flutter.git
-      ref: cake-update-v3
+      ref: cake-update-v4
  bitbox:
    git:
      url: https://github.com/cake-tech/bitbox-flutter.git
--- a/cw_core/lib/crypto_currency.dart
+++ b/cw_core/lib/crypto_currency.dart
@ -93,6 +93,8 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
    CryptoCurrency.dydx,
    CryptoCurrency.steth,
    CryptoCurrency.banano,
+    CryptoCurrency.usdtPoly,
+    CryptoCurrency.usdcEPoly,
  ];

  static const havenCurrencies = [
@ -202,6 +204,8 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
  static const dydx = CryptoCurrency(title: 'DYDX', tag: 'ETH', fullName: 'dYdX', raw: 84, name: 'dydx', iconPath: 'assets/images/dydx_icon.png', decimals: 18);
  static const steth = CryptoCurrency(title: 'STETH', tag: 'ETH', fullName: 'Lido Staked Ethereum', raw: 85, name: 'steth', iconPath: 'assets/images/steth_icon.png', decimals: 18);
  static const banano = CryptoCurrency(title: 'BAN', fullName: 'Banano', raw: 86, name: 'banano', iconPath: 'assets/images/nano_icon.png', decimals: 29);
+  static const usdtPoly = CryptoCurrency(title: 'USDT', tag: 'POLY', fullName: 'Tether USD (PoS)', raw: 87, name: 'usdtpoly', iconPath: 'assets/images/usdt_icon.png', decimals: 6);
+  static const usdcEPoly = CryptoCurrency(title: 'USDC.E', tag: 'POLY', fullName: 'USD Coin (PoS)', raw: 88, name: 'usdcepoly', iconPath: 'assets/images/usdc_icon.png', decimals: 6);


  static final Map<int, CryptoCurrency> _rawCurrencyMap =
--- a/cw_core/lib/erc20_token.dart
+++ b/cw_core/lib/erc20_token.dart
@ -18,6 +18,8 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
  bool _enabled;
  @HiveField(5)
  final String? iconPath;
+  @HiveField(6)
+  final String? tag;

  bool get enabled => _enabled;

@ -30,30 +32,31 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
    required this.decimal,
    bool enabled = true,
    this.iconPath,
+    this.tag,
  })  : _enabled = enabled,
        super(
-          name: symbol.toLowerCase(),
-          title: symbol.toUpperCase(),
-          fullName: name,
-          tag: "ETH",
-          iconPath: iconPath,
-          decimals: decimal
-        );
+            name: symbol.toLowerCase(),
+            title: symbol.toUpperCase(),
+            fullName: name,
+            tag: tag,
+            iconPath: iconPath,
+            decimals: decimal);

-  Erc20Token.copyWith(Erc20Token other, String? icon)
+  Erc20Token.copyWith(Erc20Token other, String? icon, String? tag)
      : this.name = other.name,
        this.symbol = other.symbol,
        this.contractAddress = other.contractAddress,
        this.decimal = other.decimal,
        this._enabled = other.enabled,
+        this.tag = tag,
        this.iconPath = icon,
        super(
          name: other.name,
          title: other.symbol.toUpperCase(),
          fullName: other.name,
-          tag: "ETH",
+          tag: tag,
          iconPath: icon,
-          decimals: other.decimal
+          decimals: other.decimal,
        );

  static const typeId = ERC20_TOKEN_TYPE_ID;
@ -61,7 +64,8 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
  static const polygonBoxName = ' PolygonErc20Tokens';

  @override
-  bool operator ==(other) => (other is Erc20Token && other.contractAddress == contractAddress) ||
+  bool operator ==(other) =>
+      (other is Erc20Token && other.contractAddress == contractAddress) ||
      (other is CryptoCurrency && other.title == title);

  @override
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@ -214,7 +214,7 @@ class Node extends HiveObject with Keyable {
  }

  Future<bool> requestNodeWithProxy() async {
-    if (!isValidProxyAddress/* && !Tor.instance.enabled*/) {
+    if (!isValidProxyAddress /* && !Tor.instance.enabled*/) {
      return false;
    }

--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@ -113,15 +113,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
-  cake_backup:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
-      url: "https://github.com/cake-tech/cake_backup.git"
-    source: git
-    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -178,22 +169,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
-  cryptography:
-    dependency: transitive
-    description:
-      name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  cupertino_icons:
-    dependency: transitive
-    description:
-      name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
  dart_style:
    dependency: transitive
    description:
@ -641,23 +616,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
-  tor:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5"
-      url: "https://github.com/cake-tech/tor.git"
-    source: git
-    version: "0.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_ethereum/lib/default_ethereum_erc20_tokens.dart
+++ b/cw_ethereum/lib/default_ethereum_erc20_tokens.dart
@ -293,17 +293,13 @@ class DefaultErc20Tokens {
  ];

  List<Erc20Token> get initialErc20Tokens => _defaultTokens.map((token) {
-      String? iconPath;
-      try {
-        iconPath = CryptoCurrency.all
-            .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
-            .iconPath;
-      } catch (_) {}
+        String? iconPath;
+        try {
+          iconPath = CryptoCurrency.all
+              .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
+              .iconPath;
+        } catch (_) {}

-      if (iconPath != null) {
-        return Erc20Token.copyWith(token, iconPath);
-      }
-
-      return token;
-    }).toList();
+        return Erc20Token.copyWith(token, iconPath, 'ETH');
+      }).toList();
 }
--- a/cw_ethereum/lib/ethereum_client.dart
+++ b/cw_ethereum/lib/ethereum_client.dart
@ -78,19 +78,18 @@ class EthereumClient {
        currency == CryptoCurrency.maticpoly ||
        contractAddress != null);

-    bool _isEVMCompatibleChain = currency == CryptoCurrency.eth || currency == CryptoCurrency.maticpoly;
+    bool _isEVMCompatibleChain =
+        currency == CryptoCurrency.eth || currency == CryptoCurrency.maticpoly;

    final price = _client!.getGasPrice();

-    final Transaction transaction = Transaction(
+    final Transaction transaction = createTransaction(
      from: privateKey.address,
      to: EthereumAddress.fromHex(toAddress),
      maxPriorityFeePerGas: EtherAmount.fromInt(EtherUnit.gwei, priority.tip),
-      value: _isEVMCompatibleChain ? EtherAmount.inWei(BigInt.parse(amount)) : EtherAmount.zero(),
+      amount: _isEVMCompatibleChain ? EtherAmount.inWei(BigInt.parse(amount)) : EtherAmount.zero(),
    );

-    final chainId = _getChainIdForCurrency(currency);
-
    final signedTransaction =
        await _client!.signTransaction(privateKey, transaction, chainId: chainId);

@ -124,18 +123,27 @@ class EthereumClient {
    );
  }

-  int _getChainIdForCurrency(CryptoCurrency currency) {
-    switch (currency) {
-      case CryptoCurrency.maticpoly:
-        return 137;
-      case CryptoCurrency.eth:
-      default:
-        return 1;
-    }
+  int get chainId => 1;
+
+  Transaction createTransaction({
+    required EthereumAddress from,
+    required EthereumAddress to,
+    required EtherAmount amount,
+    EtherAmount? maxPriorityFeePerGas,
+  }) {
+    return Transaction(
+      from: from,
+      to: to,
+      maxPriorityFeePerGas: maxPriorityFeePerGas,
+      value: amount,
+    );
  }

  Future<String> sendTransaction(Uint8List signedTransaction) async =>
-      await _client!.sendRawTransaction(prependTransactionType(0x02, signedTransaction));
+      await _client!.sendRawTransaction(prepareSignedTransactionForSending(signedTransaction));
+
+  Uint8List prepareSignedTransactionForSending(Uint8List signedTransaction) =>
+      prependTransactionType(0x02, signedTransaction);

  Future getTransactionDetails(String transactionHash) async {
    // Wait for the transaction receipt to become available
--- a/cw_ethereum/lib/ethereum_wallet.dart
+++ b/cw_ethereum/lib/ethereum_wallet.dart
@ -14,6 +14,7 @@ import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/wallet_addresses.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
+import 'package:cw_ethereum/default_ethereum_erc20_tokens.dart';
 import 'package:cw_ethereum/default_erc20_tokens.dart';
 import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_ethereum/erc20_balance.dart';
@ -439,6 +440,7 @@ abstract class EthereumWalletBase
      contractAddress: token.contractAddress,
      decimal: token.decimal,
      enabled: token.enabled,
+      tag: token.tag ?? "ETH",
      iconPath: iconPath,
    );

@ -502,7 +504,7 @@ abstract class EthereumWalletBase
      _transactionsUpdateTimer!.cancel();
    }

-    _transactionsUpdateTimer = Timer.periodic(Duration(seconds: 10), (_) {
+    _transactionsUpdateTimer = Timer.periodic(const Duration(seconds: 10), (_) {
      _updateTransactions();
      _updateBalance();
    });
@ -521,7 +523,7 @@ abstract class EthereumWalletBase
  String get password => _password;

  @override
-  String signMessage(String message, {String? address = null}) =>
+  String signMessage(String message, {String? address}) =>
      bytesToHex(_ethPrivateKey.signPersonalMessageToUint8List(ascii.encode(message)));

  Web3Client? getWeb3Client() => _client.getWeb3Client();
--- a/cw_monero/example/pubspec.lock
+++ b/cw_monero/example/pubspec.lock
@ -33,15 +33,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.1"
-  cake_backup:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
-      url: "https://github.com/cake-tech/cake_backup.git"
-    source: git
-    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -82,14 +73,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
-  cryptography:
-    dependency: transitive
-    description:
-      name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -170,6 +153,22 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  hashlib:
+    dependency: transitive
+    description:
+      name: hashlib
+      sha256: "71bf102329ddb8e50c8a995ee4645ae7f1728bb65e575c17196b4d8262121a96"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.0"
+  hashlib_codecs:
+    dependency: transitive
+    description:
+      name: hashlib_codecs
+      sha256: "49e2a471f74b15f1854263e58c2ac11f2b631b5b12c836f9708a35397d36d626"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
  http:
    dependency: transitive
    description:
@ -325,12 +324,11 @@ packages:
  polyseed:
    dependency: transitive
    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "504d58a5b147fccd3bc85a25f2e72fb32771ddd7"
-      url: "https://github.com/cake-tech/polyseed_dart.git"
-    source: git
-    version: "0.0.1"
+      name: polyseed
+      sha256: "9b48ec535b10863f78f6354ec983b4cc0c88ca69ff48fee469d0fd1954b01d4f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.2"
  process:
    dependency: transitive
    description:
@ -400,23 +398,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.1"
-  tor:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5"
-      url: "https://github.com/cake-tech/tor.git"
-    source: git
-    version: "0.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_monero/ios/Classes/monero_api.cpp
+++ b/cw_monero/ios/Classes/monero_api.cpp
@ -988,6 +988,8 @@ extern "C"
        return m_wallet->trustedDaemon();
    }

+    // Coin Control //
+
    FUNCTION_VISABILITY_ATTRIBUTE
    CoinsInfoRow* coin(int index)
    {
@ -1085,6 +1087,13 @@ extern "C"
        m_coins->thaw(index);
    }

+    // Sign Messages //
+
+    char *sign_message(char *message, char *address = "")
+    {
+        return strdup(get_current_wallet()->signMessage(std::string(message), std::string(address)).c_str());
+    }
+
 #ifdef __cplusplus
 }
 #endif
--- a/cw_monero/ios/Classes/monero_api.h
+++ b/cw_monero/ios/Classes/monero_api.h
@ -32,7 +32,8 @@ void store(char *path);

 void set_trusted_daemon(bool arg);
 bool trusted_daemon();
+char *sign_message(char *message, char *address);

 #ifdef __cplusplus
 }
-#endif
+#endif
--- a/cw_monero/lib/api/signatures.dart
+++ b/cw_monero/lib/api/signatures.dart
@ -149,3 +149,5 @@ typedef coin = Pointer<CoinsInfoRow> Function(Int32 index);
 typedef freeze_coin = Void Function(Int32 index);

 typedef thaw_coin = Void Function(Int32 index);
+
+typedef sign_message = Pointer<Utf8> Function(Pointer<Utf8> message, Pointer<Utf8> address);
--- a/cw_monero/lib/api/types.dart
+++ b/cw_monero/lib/api/types.dart
@ -149,3 +149,5 @@ typedef GetCoin = Pointer<CoinsInfoRow> Function(int);
 typedef FreezeCoin = void Function(int);

 typedef ThawCoin = void Function(int);
+
+typedef SignMessage = Pointer<Utf8> Function(Pointer<Utf8>, Pointer<Utf8>);
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@ -8,7 +8,6 @@ import 'package:cw_monero/api/types.dart';
 import 'package:cw_monero/api/monero_api.dart';
 import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';

 int _boolToInt(bool value) => value ? 1 : 0;

@ -128,6 +127,10 @@ final trustedDaemonNative = moneroApi
    .lookup<NativeFunction<trusted_daemon>>('trusted_daemon')
    .asFunction<TrustedDaemon>();

+final signMessageNative = moneroApi
+    .lookup<NativeFunction<sign_message>>('sign_message')
+    .asFunction<SignMessage>();
+
 int getSyncingHeight() => getSyncingHeightNative();

 bool isNeededToRefresh() => isNeededToRefreshNative() != 0;
@ -296,7 +299,7 @@ class SyncListener {

      final bchHeight = await getNodeHeightOrUpdate(syncHeight);

-      if (_lastKnownBlockHeight == syncHeight || syncHeight == null) {
+      if (_lastKnownBlockHeight == syncHeight) {
        return;
      }

@ -311,7 +314,7 @@ class SyncListener {
      }

      // 1. Actual new height; 2. Blocks left to finish; 3. Progress in percents;
-      onNewBlock?.call(syncHeight, left, ptc);
+      onNewBlock.call(syncHeight, left, ptc);
    });
  }

@ -382,4 +385,15 @@ String getSubaddressLabel(int accountIndex, int addressIndex) {

 Future setTrustedDaemon(bool trusted) async => setTrustedDaemonNative(_boolToInt(trusted));

-Future<bool> trustedDaemon() async => trustedDaemonNative() != 0;
+Future<bool> trustedDaemon() async => trustedDaemonNative() != 0;
+
+String signMessage(String message, {String address = ""}) {
+  final messagePointer = message.toNativeUtf8();
+  final addressPointer = address.toNativeUtf8();
+
+  final signature = convertUTF8ToString(pointer: signMessageNative(messagePointer, addressPointer));
+  calloc.free(messagePointer);
+  calloc.free(addressPointer);
+
+  return signature;
+}
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@ -662,4 +662,10 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,

  @override
  void setExceptionHandler(void Function(FlutterErrorDetails) onError) => _onError = onError;
+
+  @override
+  String signMessage(String message, {String? address}) {
+    final useAddress = address ?? "";
+    return monero_wallet.signMessage(message, address: useAddress);
+  }
 }
--- a/cw_monero/lib/monero_wallet_service.dart
+++ b/cw_monero/lib/monero_wallet_service.dart
@ -13,7 +13,6 @@ import 'package:cw_monero/api/wallet_manager.dart' as monero_wallet_manager;
 import 'package:cw_monero/monero_wallet.dart';
 import 'package:hive/hive.dart';
 import 'package:polyseed/polyseed.dart';
-import 'package:polyseed/src/utils/key_utils.dart';

 class MoneroNewWalletCredentials extends WalletCredentials {
  MoneroNewWalletCredentials({required String name, required this.language, required this.isPolyseed, String? password})
@ -287,7 +286,7 @@ class MoneroWalletService extends WalletService<
      {PolyseedCoin coin = PolyseedCoin.POLYSEED_MONERO, int? overrideHeight}) async {
    final height = overrideHeight ?? getMoneroHeigthByDate(
        date: DateTime.fromMillisecondsSinceEpoch(polyseed.birthday * 1000));
-    final spendKey = keyToHexString(polyseed.generateKey(coin, 32));
+    final spendKey = polyseed.generateKey(coin, 32).toHexString();
    final seed = polyseed.encode(lang, coin);

    walletInfo.isRecovery = true;
--- a/cw_monero/macos/Classes/monero_api.cpp
+++ b/cw_monero/macos/Classes/monero_api.cpp
@ -1019,6 +1019,13 @@ extern "C"
        m_coins->thaw(index);
    }

+    // Sign Messages //
+
+    char *sign_message(char *message, char *address = "")
+    {
+        return strdup(get_current_wallet()->signMessage(std::string(message), std::string(address)).c_str());
+    }
+
 #ifdef __cplusplus
 }
 #endif
--- a/cw_monero/macos/Classes/monero_api.h
+++ b/cw_monero/macos/Classes/monero_api.h
@ -32,7 +32,8 @@ void store(char *path);

 void set_trusted_daemon(bool arg);
 bool trusted_daemon();
+char *sign_message(char *message, char *address);

 #ifdef __cplusplus
 }
-#endif
+#endif
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@ -113,15 +113,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "8.4.3"
-  cake_backup:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "3aba867dcab6737f6707782f5db15d71f303db38"
-      url: "https://github.com/cake-tech/cake_backup.git"
-    source: git
-    version: "1.0.0+1"
  characters:
    dependency: transitive
    description:
@ -178,22 +169,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.0.2"
-  cryptography:
-    dependency: transitive
-    description:
-      name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  cupertino_icons:
-    dependency: transitive
-    description:
-      name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
  cw_core:
    dependency: "direct main"
    description:
@ -291,6 +266,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.2.0"
+  hashlib:
+    dependency: transitive
+    description:
+      name: hashlib
+      sha256: "71bf102329ddb8e50c8a995ee4645ae7f1728bb65e575c17196b4d8262121a96"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.0"
+  hashlib_codecs:
+    dependency: transitive
+    description:
+      name: hashlib_codecs
+      sha256: "49e2a471f74b15f1854263e58c2ac11f2b631b5b12c836f9708a35397d36d626"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
  hive:
    dependency: transitive
    description:
@ -510,12 +501,11 @@ packages:
  polyseed:
    dependency: "direct main"
    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "504d58a5b147fccd3bc85a25f2e72fb32771ddd7"
-      url: "https://github.com/cake-tech/polyseed_dart.git"
-    source: git
-    version: "0.0.1"
+      name: polyseed
+      sha256: "9b48ec535b10863f78f6354ec983b4cc0c88ca69ff48fee469d0fd1954b01d4f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.2"
  pool:
    dependency: transitive
    description:
@ -657,23 +647,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
-  tor:
-    dependency: transitive
-    description:
-      path: "."
-      ref: main
-      resolved-ref: "09ba92cb11d4e3cacf97256e57863b805f79f2e5"
-      url: "https://github.com/cake-tech/tor.git"
-    source: git
-    version: "0.0.1"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
  typed_data:
    dependency: transitive
    description:
--- a/cw_monero/pubspec.yaml
+++ b/cw_monero/pubspec.yaml
@ -19,9 +19,7 @@ dependencies:
  flutter_mobx: ^2.0.6+1
  intl: ^0.18.0
  encrypt: ^5.0.1
-  polyseed:
-    git:
-      url: https://github.com/cake-tech/polyseed_dart.git
+  polyseed: ^0.0.2
  cw_core:
    path: ../cw_core

--- a/cw_polygon/lib/default_polygon_erc20_tokens.dart
+++ b/cw_polygon/lib/default_polygon_erc20_tokens.dart
@ -29,7 +29,7 @@ class DefaultPolygonErc20Tokens {
      symbol: "USDC.e",
      contractAddress: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
      decimal: 6,
-      enabled: false,
+      enabled: true,
    ),
    Erc20Token(
      name: "Avalanche Token",
@ -73,14 +73,10 @@ class DefaultPolygonErc20Tokens {
        try {
          iconPath = CryptoCurrency.all
              .firstWhere((element) =>
-                  element.title.toUpperCase() == token.symbol.toUpperCase())
+                  element.title.toUpperCase() == token.symbol.split(".").first.toUpperCase())
              .iconPath;
        } catch (_) {}

-        if (iconPath != null) {
-          return Erc20Token.copyWith(token, iconPath);
-        }
-
-        return token;
+        return Erc20Token.copyWith(token, iconPath, 'POLY');
      }).toList();
 }
--- a/cw_polygon/lib/polygon_client.dart
+++ b/cw_polygon/lib/polygon_client.dart
@ -3,8 +3,30 @@ import 'dart:convert';
 import 'package:cw_ethereum/ethereum_client.dart';
 import 'package:cw_polygon/polygon_transaction_model.dart';
 import 'package:cw_ethereum/.secrets.g.dart' as secrets;
+import 'package:flutter/foundation.dart';
+import 'package:web3dart/web3dart.dart';

 class PolygonClient extends EthereumClient {
+  @override
+  Transaction createTransaction({
+    required EthereumAddress from,
+    required EthereumAddress to,
+    required EtherAmount amount,
+    EtherAmount? maxPriorityFeePerGas,
+  }) {
+    return Transaction(
+      from: from,
+      to: to,
+      value: amount,
+    );
+  }
+
+  @override
+  Uint8List prepareSignedTransactionForSending(Uint8List signedTransaction) => signedTransaction;
+
+  @override
+  int get chainId => 137;
+
  @override
  Future<List<PolygonTransactionModel>> fetchTransactions(String address,
      {String? contractAddress}) async {
@ -27,7 +49,6 @@ class PolygonClient extends EthereumClient {

      return [];
    } catch (e) {
-      print(e);
      return [];
    }
  }
--- a/cw_polygon/lib/polygon_wallet.dart
+++ b/cw_polygon/lib/polygon_wallet.dart
@ -17,9 +17,9 @@ import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_ethereum/erc20_balance.dart';
 import 'package:cw_ethereum/ethereum_formatter.dart';
-import 'package:cw_ethereum/ethereum_transaction_model.dart';
+import 'package:cw_ethereum/file.dart';
 import 'package:cw_core/erc20_token.dart';
-import 'package:cw_polygon/default_erc20_tokens.dart';
+import 'package:cw_polygon/default_polygon_erc20_tokens.dart';
 import 'package:cw_polygon/polygon_client.dart';
 import 'package:cw_polygon/polygon_exceptions.dart';
 import 'package:cw_polygon/polygon_formatter.dart';
@ -42,28 +42,26 @@ part 'polygon_wallet.g.dart';

 class PolygonWallet = PolygonWalletBase with _$PolygonWallet;

-abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
-    PolygonTransactionHistory, PolygonTransactionInfo> with Store {
+abstract class PolygonWalletBase
+    extends WalletBase<ERC20Balance, PolygonTransactionHistory, PolygonTransactionInfo> with Store {
  PolygonWalletBase({
    required WalletInfo walletInfo,
    String? mnemonic,
    String? privateKey,
    required String password,
    ERC20Balance? initialBalance,
-  })  : syncStatus = NotConnectedSyncStatus(),
+  })  : syncStatus = const NotConnectedSyncStatus(),
        _password = password,
        _mnemonic = mnemonic,
        _hexPrivateKey = privateKey,
        _isTransactionUpdating = false,
        _client = PolygonClient(),
        walletAddresses = PolygonWalletAddresses(walletInfo),
-        balance = ObservableMap<CryptoCurrency, ERC20Balance>.of({
-          CryptoCurrency.maticpoly: initialBalance ?? ERC20Balance(BigInt.zero)
-        }),
+        balance = ObservableMap<CryptoCurrency, ERC20Balance>.of(
+            {CryptoCurrency.maticpoly: initialBalance ?? ERC20Balance(BigInt.zero)}),
        super(walletInfo) {
    this.walletInfo = walletInfo;
-    transactionHistory =
-        PolygonTransactionHistory(walletInfo: walletInfo, password: password);
+    transactionHistory = PolygonTransactionHistory(walletInfo: walletInfo, password: password);

    if (!CakeHive.isAdapterRegistered(Erc20Token.typeId)) {
      CakeHive.registerAdapter(Erc20TokenAdapter());
@ -80,9 +78,9 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,

  late final EthPrivateKey _polygonPrivateKey;

-  EthPrivateKey get polygonPrivateKey => _polygonPrivateKey;
+  late final PolygonClient _client;

-  late PolygonClient _client;
+  EthPrivateKey get polygonPrivateKey => _polygonPrivateKey;

  int? _gasPrice;
  int? _estimatedGas;
@ -102,11 +100,11 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
  @observable
  late ObservableMap<CryptoCurrency, ERC20Balance> balance;

-  Completer<SharedPreferences> _sharedPrefs = Completer();
+  final Completer<SharedPreferences> _sharedPrefs = Completer();

  Future<void> init() async {
-    polygonErc20TokensBox =
-        await CakeHive.openBox<Erc20Token>(Erc20Token.polygonBoxName);
+    polygonErc20TokensBox = await CakeHive.openBox<Erc20Token>(
+        "${walletInfo.name.replaceAll(" ", "_")}_${Erc20Token.polygonBoxName}");
    await walletAddresses.init();
    await transactionHistory.init();
    _polygonPrivateKey = await getPrivateKey(
@ -122,8 +120,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
  int calculateEstimatedFee(TransactionPriority priority, int? amount) {
    try {
      if (priority is PolygonTransactionPriority) {
-        final priorityFee =
-            EtherAmount.fromInt(EtherUnit.gwei, priority.tip).getInWei.toInt();
+        final priorityFee = EtherAmount.fromInt(EtherUnit.gwei, priority.tip).getInWei.toInt();
        return (_gasPrice! + priorityFee) * (_estimatedGas ?? 0);
      }

@ -168,33 +165,29 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,

  @override
  Future<PendingTransaction> createTransaction(Object credentials) async {
-    final _credentials = credentials as PolygonTransactionCredentials;
-    final outputs = _credentials.outputs;
+    final credentials0 = credentials as PolygonTransactionCredentials;
+    final outputs = credentials0.outputs;
    final hasMultiDestination = outputs.length > 1;

-    final CryptoCurrency transactionCurrency = balance.keys
-        .firstWhere((element) => element.title == _credentials.currency.title);
+    final CryptoCurrency transactionCurrency =
+        balance.keys.firstWhere((element) => element.title == credentials0.currency.title);

-    final _erc20Balance = balance[transactionCurrency]!;
+    final erc20Balance = balance[transactionCurrency]!;
    BigInt totalAmount = BigInt.zero;
-    int exponent =
-        transactionCurrency is Erc20Token ? transactionCurrency.decimal : 18;
+    int exponent = transactionCurrency is Erc20Token ? transactionCurrency.decimal : 18;
    num amountToPolygonMultiplier = pow(10, exponent);

    // so far this can not be made with Polygon as Polygon does not support multiple recipients
    if (hasMultiDestination) {
-      if (outputs.any(
-          (item) => item.sendAll || (item.formattedCryptoAmount ?? 0) <= 0)) {
+      if (outputs.any((item) => item.sendAll || (item.formattedCryptoAmount ?? 0) <= 0)) {
        throw PolygonTransactionCreationException(transactionCurrency);
      }

      final totalOriginalAmount = PolygonFormatter.parsePolygonAmountToDouble(
-          outputs.fold(
-              0, (acc, value) => acc + (value.formattedCryptoAmount ?? 0)));
-      totalAmount =
-          BigInt.from(totalOriginalAmount * amountToPolygonMultiplier);
+          outputs.fold(0, (acc, value) => acc + (value.formattedCryptoAmount ?? 0)));
+      totalAmount = BigInt.from(totalOriginalAmount * amountToPolygonMultiplier);

-      if (_erc20Balance.balance < totalAmount) {
+      if (erc20Balance.balance < totalAmount) {
        throw PolygonTransactionCreationException(transactionCurrency);
      }
    } else {
@ -203,35 +196,33 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
      // then no need to subtract the fees from the amount if send all
      final BigInt allAmount;
      if (transactionCurrency is Erc20Token) {
-        allAmount = _erc20Balance.balance;
+        allAmount = erc20Balance.balance;
      } else {
-        allAmount = _erc20Balance.balance -
-            BigInt.from(calculateEstimatedFee(_credentials.priority!, null));
+        allAmount =
+            erc20Balance.balance - BigInt.from(calculateEstimatedFee(credentials0.priority!, null));
      }
-      final totalOriginalAmount = EthereumFormatter.parseEthereumAmountToDouble(
-          output.formattedCryptoAmount ?? 0);
-      totalAmount = output.sendAll
-          ? allAmount
-          : BigInt.from(totalOriginalAmount * amountToPolygonMultiplier);
+      final totalOriginalAmount =
+          EthereumFormatter.parseEthereumAmountToDouble(output.formattedCryptoAmount ?? 0);
+      totalAmount =
+          output.sendAll ? allAmount : BigInt.from(totalOriginalAmount * amountToPolygonMultiplier);

-      if (_erc20Balance.balance < totalAmount) {
+      if (erc20Balance.balance < totalAmount) {
        throw PolygonTransactionCreationException(transactionCurrency);
      }
    }

    final pendingPolygonTransaction = await _client.signTransaction(
      privateKey: _polygonPrivateKey,
-      toAddress: _credentials.outputs.first.isParsedAddress
-          ? _credentials.outputs.first.extractedAddress!
-          : _credentials.outputs.first.address,
+      toAddress: credentials0.outputs.first.isParsedAddress
+          ? credentials0.outputs.first.extractedAddress!
+          : credentials0.outputs.first.address,
      amount: totalAmount.toString(),
      gas: _estimatedGas!,
-      priority: _credentials.priority!,
+      priority: credentials0.priority!,
      currency: transactionCurrency,
      exponent: exponent,
-      contractAddress: transactionCurrency is Erc20Token
-          ? transactionCurrency.contractAddress
-          : null,
+      contractAddress:
+          transactionCurrency is Erc20Token ? transactionCurrency.contractAddress : null,
    );

    return pendingPolygonTransaction;
@ -262,15 +253,16 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
    final address = _polygonPrivateKey.address.hex;
    final transactions = await _client.fetchTransactions(address);

-    final List<Future<List<PolygonTransactionModel>>> polygonErc20TokensTransactions =
-        [];
+    final List<Future<List<PolygonTransactionModel>>> polygonErc20TokensTransactions = [];

    for (var token in balance.keys) {
      if (token is Erc20Token) {
-        polygonErc20TokensTransactions.add(_client.fetchTransactions(
-          address,
-          contractAddress: token.contractAddress,
-        ) as Future<List<PolygonTransactionModel>>);
+        polygonErc20TokensTransactions.add(
+          _client.fetchTransactions(
+            address,
+            contractAddress: token.contractAddress,
+          ),
+        );
      }
    }

@ -294,8 +286,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
        isPending: false,
        date: transactionModel.date,
        confirmations: transactionModel.confirmations,
-        ethFee:
-            BigInt.from(transactionModel.gasUsed) * transactionModel.gasPrice,
+        ethFee: BigInt.from(transactionModel.gasUsed) * transactionModel.gasPrice,
        exponent: transactionModel.tokenDecimal ?? 18,
        tokenSymbol: transactionModel.tokenSymbol ?? "MATIC",
        to: transactionModel.to,
@ -337,8 +328,8 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
      _gasPrice = await _client.getGasUnitPrice();
      _estimatedGas = await _client.getEstimatedGas();

-      Timer.periodic(const Duration(minutes: 1),
-          (timer) async => _gasPrice = await _client.getGasUnitPrice());
+      Timer.periodic(
+          const Duration(minutes: 1), (timer) async => _gasPrice = await _client.getGasUnitPrice());
      Timer.periodic(const Duration(seconds: 10),
          (timer) async => _estimatedGas = await _client.getEstimatedGas());

@ -348,8 +339,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
    }
  }

-  Future<String> makePath() async =>
-      pathForWallet(name: walletInfo.name, type: walletInfo.type);
+  Future<String> makePath() async => pathForWallet(name: walletInfo.name, type: walletInfo.type);

  String toJSON() => json.encode({
        'mnemonic': _mnemonic,
@ -367,8 +357,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
    final data = json.decode(jsonSource) as Map;
    final mnemonic = data['mnemonic'] as String?;
    final privateKey = data['private_key'] as String?;
-    final balance = ERC20Balance.fromJSON(data['balance'] as String) ??
-        ERC20Balance(BigInt.zero);
+    final balance = ERC20Balance.fromJSON(data['balance'] as String) ?? ERC20Balance(BigInt.zero);

    return PolygonWallet(
      walletInfo: walletInfo,
@ -418,14 +407,14 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,

    final root = bip32.BIP32.fromSeed(seed);

-    const _hdPathPolygon = "m/44'/60'/0'/0";
+    const hdPathPolygon = "m/44'/60'/0'/0";
    const index = 0;
-    final addressAtIndex = root.derivePath("$_hdPathPolygon/$index");
+    final addressAtIndex = root.derivePath("$hdPathPolygon/$index");

-    return EthPrivateKey.fromHex(
-        HEX.encode(addressAtIndex.privateKey as List<int>));
+    return EthPrivateKey.fromHex(HEX.encode(addressAtIndex.privateKey as List<int>));
  }

+  @override
  Future<void>? updateBalance() async => await _updateBalance();

  List<Erc20Token> get erc20Currencies => polygonErc20TokensBox.values.toList();
@ -434,29 +423,29 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
    String? iconPath;
    try {
      iconPath = CryptoCurrency.all
-          .firstWhere((element) =>
-              element.title.toUpperCase() == token.symbol.toUpperCase())
+          .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
          .iconPath;
    } catch (_) {}

-    final _token = Erc20Token(
+    final token0 = Erc20Token(
      name: token.name,
      symbol: token.symbol,
      contractAddress: token.contractAddress,
      decimal: token.decimal,
      enabled: token.enabled,
+      tag: token.tag ?? "POLY",
      iconPath: iconPath,
    );

-    await polygonErc20TokensBox.put(_token.contractAddress, _token);
+    await polygonErc20TokensBox.put(token0.contractAddress, token0);

-    if (_token.enabled) {
-      balance[_token] = await _client.fetchERC20Balances(
+    if (token0.enabled) {
+      balance[token0] = await _client.fetchERC20Balances(
        _polygonPrivateKey.address,
-        _token.contractAddress,
+        token0.contractAddress,
      );
    } else {
-      balance.remove(_token);
+      balance.remove(token0);
    }
  }

@ -476,8 +465,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
  }

  void addInitialTokens() {
-    final initialErc20Tokens =
-        DefaultPolygonErc20Tokens().initialPolygonErc20Tokens;
+    final initialErc20Tokens = DefaultPolygonErc20Tokens().initialPolygonErc20Tokens;

    for (var token in initialErc20Tokens) {
      polygonErc20TokensBox.put(token.contractAddress, token);
@ -486,26 +474,20 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,

  @override
  Future<void> renameWalletFiles(String newWalletName) async {
-    final currentWalletPath =
-        await pathForWallet(name: walletInfo.name, type: type);
+    final currentWalletPath = await pathForWallet(name: walletInfo.name, type: type);
    final currentWalletFile = File(currentWalletPath);

-    final currentDirPath =
-        await pathForWalletDir(name: walletInfo.name, type: type);
-    final currentTransactionsFile =
-        File('$currentDirPath/$transactionsHistoryFileName');
+    final currentDirPath = await pathForWalletDir(name: walletInfo.name, type: type);
+    final currentTransactionsFile = File('$currentDirPath/$transactionsHistoryFileName');

    // Copies current wallet files into new wallet name's dir and files
    if (currentWalletFile.existsSync()) {
-      final newWalletPath =
-          await pathForWallet(name: newWalletName, type: type);
+      final newWalletPath = await pathForWallet(name: newWalletName, type: type);
      await currentWalletFile.copy(newWalletPath);
    }
    if (currentTransactionsFile.existsSync()) {
-      final newDirPath =
-          await pathForWalletDir(name: newWalletName, type: type);
-      await currentTransactionsFile
-          .copy('$newDirPath/$transactionsHistoryFileName');
+      final newDirPath = await pathForWalletDir(name: newWalletName, type: type);
+      await currentTransactionsFile.copy('$newDirPath/$transactionsHistoryFileName');
    }

    // Delete old name's dir and files
@ -517,7 +499,7 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
      _transactionsUpdateTimer!.cancel();
    }

-    _transactionsUpdateTimer = Timer.periodic(Duration(seconds: 10), (_) {
+    _transactionsUpdateTimer = Timer.periodic(const Duration(seconds: 10), (_) {
      _updateTransactions();
      _updateBalance();
    });
@ -536,8 +518,8 @@ abstract class PolygonWalletBase extends WalletBase<ERC20Balance,
  String get password => _password;

  @override
-  String signMessage(String message, {String? address = null}) => bytesToHex(
-      _polygonPrivateKey.signPersonalMessageToUint8List(ascii.encode(message)));
+  String signMessage(String message, {String? address}) =>
+      bytesToHex(_polygonPrivateKey.signPersonalMessageToUint8List(ascii.encode(message)));

  Web3Client? getWeb3Client() => _client.getWeb3Client();
 }
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -122,6 +122,8 @@ PODS:
    - Flutter
  - MTBBarcodeScanner (5.0.11)
  - OrderedSet (5.0.0)
+  - package_info (0.0.1):
+    - Flutter
  - package_info_plus (0.4.5):
    - Flutter
  - path_provider_foundation (0.0.1):
@ -143,8 +145,6 @@ PODS:
  - SwiftProtobuf (1.22.0)
  - SwiftyGif (5.4.4)
  - Toast (4.0.0)
-  - tor (0.0.1):
-    - Flutter
  - uni_links (0.0.1):
    - Flutter
  - UnstoppableDomainsResolution (4.0.0):
@ -175,13 +175,13 @@ DEPENDENCIES:
  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
  - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
+  - package_info (from `.symlinks/plugins/package_info/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
  - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - tor (from `.symlinks/plugins/tor/ios`)
  - uni_links (from `.symlinks/plugins/uni_links/ios`)
  - UnstoppableDomainsResolution (~> 4.0.0)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@ -236,6 +236,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/in_app_review/ios"
  local_auth_ios:
    :path: ".symlinks/plugins/local_auth_ios/ios"
+  package_info:
+    :path: ".symlinks/plugins/package_info/ios"
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  path_provider_foundation:
@ -248,8 +250,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  tor:
-    :path: ".symlinks/plugins/tor/ios"
  uni_links:
    :path: ".symlinks/plugins/uni_links/ios"
  url_launcher_ios:
@ -282,6 +282,7 @@ SPEC CHECKSUMS:
  local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
+  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
@ -293,7 +294,6 @@ SPEC CHECKSUMS:
  SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  tor: 662a9f5b980b5c86decb8ba611de9bcd4c8286eb
  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
  UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841
  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
--- a/lib/buy/dfx/dfx_buy_provider.dart
+++ b/lib/buy/dfx/dfx_buy_provider.dart
@ -0,0 +1,179 @@
+import 'dart:convert';
+
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
+import 'package:url_launcher/url_launcher.dart';
+
+class DFXBuyProvider {
+  DFXBuyProvider({required WalletBase wallet}) : this._wallet = wallet;
+
+  final WalletBase _wallet;
+
+  static const _baseUrl = 'api.dfx.swiss';
+  static const _authPath = '/v1/auth/signMessage';
+  static const _signUpPath = '/v1/auth/signUp';
+  static const _signInPath = '/v1/auth/signIn';
+  static const walletName = 'CakeWallet';
+
+  String get assetOut {
+    switch (_wallet.type) {
+      case WalletType.bitcoin:
+        return 'BTC';
+      case WalletType.bitcoinCash:
+        return 'BCH';
+      case WalletType.litecoin:
+        return 'LTC';
+      case WalletType.monero:
+        return 'XMR';
+      case WalletType.ethereum:
+        return 'ETH';
+      default:
+        throw Exception("WalletType is not available for DFX ${_wallet.type}");
+    }
+  }
+
+  String get blockchain {
+    switch (_wallet.type) {
+      case WalletType.bitcoin:
+      case WalletType.bitcoinCash:
+      case WalletType.litecoin:
+        return 'Bitcoin';
+      case WalletType.monero:
+        return 'Monero';
+      case WalletType.ethereum:
+        return 'Ethereum';
+      default:
+        throw Exception("WalletType is not available for DFX ${_wallet.type}");
+    }
+  }
+
+  Future<String> getSignMessage() async {
+    final walletAddress = _wallet.walletAddresses.address;
+    final uri = Uri.https(_baseUrl, _authPath, {'address': walletAddress});
+
+    var response = await http.get(uri, headers: {'accept': 'application/json'});
+
+    if (response.statusCode == 200) {
+      final responseBody = jsonDecode(response.body);
+      return responseBody['message'] as String;
+    } else {
+      throw Exception(
+          'Failed to get sign message. Status: ${response.statusCode} ${response.body}');
+    }
+  }
+
+  Future<String> signUp() async {
+    final signMessage = getSignature(await getSignMessage());
+    final walletAddress = _wallet.walletAddresses.address;
+
+    final requestBody = jsonEncode({
+      'wallet': walletName,
+      'address': walletAddress,
+      'signature': signMessage,
+    });
+
+    final uri = Uri.https(_baseUrl, _signUpPath);
+    var response = await http.post(uri,
+        headers: {'Content-Type': 'application/json'}, body: requestBody);
+
+    if (response.statusCode == 201) {
+      final responseBody = jsonDecode(response.body);
+      return responseBody['accessToken'] as String;
+    } else {
+      throw Exception(
+          'Failed to sign up. Status: ${response.statusCode} ${response.body}');
+    }
+  }
+
+  Future<String> signIn() async {
+    final signMessage = getSignature(await getSignMessage());
+    final walletAddress = _wallet.walletAddresses.address;
+
+    final requestBody = jsonEncode({
+      'address': walletAddress,
+      'signature': signMessage,
+    });
+
+    final uri = Uri.https(_baseUrl, _signInPath);
+    var response = await http.post(uri,
+        headers: {'Content-Type': 'application/json'}, body: requestBody);
+
+    if (response.statusCode == 201) {
+      final responseBody = jsonDecode(response.body);
+      return responseBody['accessToken'] as String;
+    } else {
+      throw Exception(
+          'Failed to sign in. Status: ${response.statusCode} ${response.body}');
+    }
+  }
+
+  String getSignature(String message) {
+    switch (_wallet.type) {
+      case WalletType.ethereum:
+        return _wallet.signMessage(message);
+      case WalletType.monero:
+      case WalletType.litecoin:
+      case WalletType.bitcoin:
+      case WalletType.bitcoinCash:
+        return _wallet.signMessage(message,
+            address: _wallet.walletAddresses.address);
+      default:
+        throw Exception("WalletType is not available for DFX ${_wallet.type}");
+    }
+  }
+
+  Future<void> launchProvider(BuildContext context) async {
+    try {
+      final assetOut = this.assetOut;
+      final blockchain = this.blockchain;
+
+      String accessToken;
+
+      try {
+        accessToken = await signUp();
+      } on Exception catch (e) {
+        if (e.toString().contains('409')) {
+          accessToken = await signIn();
+        } else {
+          rethrow;
+        }
+      }
+
+      final uri = Uri.https('services.dfx.swiss', '/buy', {
+        'session': accessToken,
+        'lang': 'en',
+        'asset-out': assetOut,
+        'blockchain': blockchain,
+        'asset-in': 'EUR',
+      });
+
+      if (await canLaunchUrl(uri)) {
+        if (DeviceInfo.instance.isMobile) {
+          Navigator.of(context).pushNamed(Routes.webViewPage,
+              arguments: [S.of(context).buy, uri]);
+        } else {
+          await launchUrl(uri, mode: LaunchMode.externalApplication);
+        }
+      } else {
+        throw Exception('Could not launch URL');
+      }
+    } catch (e) {
+      await showPopUp<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertWithOneAction(
+                alertTitle: "DFX Connect",
+                alertContent: S.of(context).buy_provider_unavailable + ': $e',
+                buttonText: S.of(context).ok,
+                buttonAction: () => Navigator.of(context).pop());
+          });
+    }
+  }
+}
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@ -32,6 +32,8 @@ class AddressValidator extends TextValidator {
        return '[0-9a-zA-Z_]';
      case CryptoCurrency.usdc:
      case CryptoCurrency.usdcpoly:
+      case CryptoCurrency.usdtPoly:
+      case CryptoCurrency.usdcEPoly:
      case CryptoCurrency.ape:
      case CryptoCurrency.avaxc:
      case CryptoCurrency.eth:
@ -141,6 +143,8 @@ class AddressValidator extends TextValidator {
        return [42];
      case CryptoCurrency.eth:
      case CryptoCurrency.usdcpoly:
+      case CryptoCurrency.usdtPoly:
+      case CryptoCurrency.usdcEPoly:
      case CryptoCurrency.mana:
      case CryptoCurrency.matic:
      case CryptoCurrency.maticpoly:
--- a/lib/core/wallet_connect/evm_chain_service.dart
+++ b/lib/core/wallet_connect/evm_chain_service.dart
@ -285,10 +285,12 @@ class EvmChainServiceImpl implements ChainService {
  }

  String _convertToReadable(Map<String, dynamic> data) {
+    final tokenName = getTokenNameBasedOnWalletType(appStore.wallet!.type);
    String gas = int.parse((data['gas'] as String).substring(2), radix: 16).toString();
    String value = data['value'] != null
-        ? (int.parse((data['value'] as String).substring(2), radix: 16) / 1e18).toString() + ' ETH'
-        : '0 ETH';
+        ? (int.parse((data['value'] as String).substring(2), radix: 16) / 1e18).toString() +
+            ' $tokenName'
+        : '0 $tokenName';
    String from = data['from'] as String;
    String to = data['to'] as String;

--- a/lib/di.dart
+++ b/lib/di.dart
@ -22,7 +22,6 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
 import 'package:cake_wallet/ionia/ionia_gift_card.dart';
 import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/anonpay_details/anonpay_details_page.dart';
 import 'package:cake_wallet/src/screens/buy/buy_options_page.dart';
@ -100,6 +99,7 @@ import 'package:cake_wallet/view_model/ionia/ionia_purchase_merch_view_model.dar
 import 'package:cake_wallet/view_model/nano_account_list/nano_account_edit_or_create_view_model.dart';
 import 'package:cake_wallet/view_model/nano_account_list/nano_account_list_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/pow_node_list_view_model.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cake_wallet/view_model/set_up_2fa_viewmodel.dart';
 import 'package:cake_wallet/view_model/restore/restore_from_qr_vm.dart';
 import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart';
@ -243,6 +243,7 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_page.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';

+import 'buy/dfx/dfx_buy_provider.dart';
 import 'core/totp_request_details.dart';
 import 'src/screens/settings/desktop_settings/desktop_settings_page.dart';

@ -386,7 +387,8 @@ Future<void> setup({
      settingsStore: settingsStore,
      yatStore: getIt.get<YatStore>(),
      ordersStore: getIt.get<OrdersStore>(),
-      anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>()));
+      anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>(),
+      keyService: getIt.get<KeyService>()));

  getIt.registerFactory<AuthService>(
    () => AuthService(
@ -731,6 +733,8 @@ Future<void> setup({

  getIt.registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet!));

+  getIt.registerFactory<SeedTypeViewModel>(() => SeedTypeViewModel(getIt.get<AppStore>()));
+
  getIt.registerFactoryParam<WalletSeedPage, bool, void>((bool isWalletCreated, _) =>
      WalletSeedPage(getIt.get<WalletSeedViewModel>(), isNewWalletCreated: isWalletCreated));

@ -761,13 +765,7 @@ Future<void> setup({
    return PowNodeListViewModel(_powNodeSource, appStore);
  });

-  getIt.registerFactory(() {
-    final wallet = getIt.get<AppStore>().wallet;
-    return ConnectionSyncPage(
-      getIt.get<DashboardViewModel>(),
-      isEVMCompatibleChain(wallet!.type) ? getIt.get<Web3WalletService>() : null,
-    );
-  });
+  getIt.registerFactory(() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));

  getIt.registerFactory(
      () => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
@ -808,6 +806,9 @@ Future<void> setup({
  getIt.registerFactory<RobinhoodBuyProvider>(
      () => RobinhoodBuyProvider(wallet: getIt.get<AppStore>().wallet!));

+  getIt
+      .registerFactory<DFXBuyProvider>(() => DFXBuyProvider(wallet: getIt.get<AppStore>().wallet!));
+
  getIt.registerFactory<OnRamperBuyProvider>(() => OnRamperBuyProvider(
        settingsStore: getIt.get<AppStore>().settingsStore,
        wallet: getIt.get<AppStore>().wallet!,
@ -893,8 +894,8 @@ Future<void> setup({
          getIt.get<AppStore>(), getIt.get<WalletCreationService>(param1: type), _walletInfoSource,
          type: type));

-  getIt.registerFactoryParam<WalletRestorePage, WalletType, void>(
-      (type, _) => WalletRestorePage(getIt.get<WalletRestoreViewModel>(param1: type)));
+  getIt.registerFactoryParam<WalletRestorePage, WalletType, void>((type, _) => WalletRestorePage(
+      getIt.get<WalletRestoreViewModel>(param1: type), getIt.get<SeedTypeViewModel>()));

  getIt.registerFactoryParam<WalletRestoreChooseDerivationViewModel, List<DerivationInfo>, void>(
      (derivations, _) => WalletRestoreChooseDerivationViewModel(derivationInfos: derivations));
@ -925,7 +926,7 @@ Future<void> setup({

  getIt.registerFactoryParam<PreSeedPage, WalletType, AdvancedPrivacySettingsViewModel>(
      (WalletType type, AdvancedPrivacySettingsViewModel advancedPrivacySettingsViewModel) =>
-          PreSeedPage(type, advancedPrivacySettingsViewModel));
+          PreSeedPage(type, advancedPrivacySettingsViewModel, getIt.get<SeedTypeViewModel>()));

  getIt.registerFactoryParam<TradeDetailsViewModel, Trade, void>((trade, _) =>
      TradeDetailsViewModel(
@ -958,7 +959,7 @@ Future<void> setup({

  getIt.registerFactory(() => BuyAmountViewModel());

-  getIt.registerFactory(() => BuyOptionsPage());
+  getIt.registerFactory(() => BuyOptionsPage(getIt.get<DashboardViewModel>()));

  getIt.registerFactory(() {
    final wallet = getIt.get<AppStore>().wallet;
--- a/lib/entities/buy_provider_types.dart
+++ b/lib/entities/buy_provider_types.dart
@ -1,9 +1,11 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cw_core/wallet_type.dart';

 enum BuyProviderType {
  AskEachTime,
  Robinhood,
-  Onramper;
+  Onramper,
+  DFX;

  @override
  String toString() {
@ -14,6 +16,42 @@ enum BuyProviderType {
        return "Robinhood";
      case BuyProviderType.Onramper:
        return "Onramper";
+      case BuyProviderType.DFX:
+        return "DFX";
+    }
+  }
+
+  static List<BuyProviderType> getAvailableProviders(WalletType walletType) {
+    switch (walletType) {
+      case WalletType.nano:
+      case WalletType.banano:
+        return [
+          BuyProviderType.AskEachTime,
+          BuyProviderType.Onramper
+        ];
+      case WalletType.monero:
+        return [
+          BuyProviderType.AskEachTime,
+          BuyProviderType.Onramper,
+          BuyProviderType.DFX
+        ];
+      case WalletType.bitcoin:
+      case WalletType.ethereum:
+        return [
+          BuyProviderType.AskEachTime,
+          BuyProviderType.Onramper,
+          BuyProviderType.DFX,
+          BuyProviderType.Robinhood
+        ];
+      case WalletType.litecoin:
+      case WalletType.bitcoinCash:
+      return [
+        BuyProviderType.AskEachTime,
+        BuyProviderType.Onramper,
+        BuyProviderType.Robinhood
+      ];
+      default:
+        return [];
    }
  }
 }
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@ -185,7 +185,6 @@ Future<void> defaultSettingsMigration(
        case 25:
          await rewriteSecureStoragePin(secureStorage: secureStorage);
          break;
-
        default:
          break;
      }
--- a/lib/entities/list_order_mode.dart
+++ b/lib/entities/list_order_mode.dart
@ -0,0 +1,34 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cw_core/enumerable_item.dart';
+
+class ListOrderMode extends EnumerableItem<int> with Serializable<int> {
+  const ListOrderMode({required String title, required int raw}) : super(title: title, raw: raw);
+
+  static const all = [ListOrderMode.ascending, ListOrderMode.descending];
+
+  static const ascending = ListOrderMode(raw: 0, title: 'Ascending');
+  static const descending = ListOrderMode(raw: 1, title: 'Descending');
+
+  static ListOrderMode deserialize({required int raw}) {
+    switch (raw) {
+      case 0:
+        return ascending;
+      case 1:
+        return descending;
+      default:
+        throw Exception('Unexpected token: $raw for ListOrderMode deserialize');
+    }
+  }
+
+  @override
+  String toString() {
+    switch (this) {
+      case ListOrderMode.ascending:
+        return S.current.ascending;
+      case ListOrderMode.descending:
+        return S.current.descending;
+      default:
+        return '';
+    }
+  }
+}
--- a/lib/entities/main_actions.dart
+++ b/lib/entities/main_actions.dart
@ -1,3 +1,4 @@
+import 'package:cake_wallet/buy/dfx/dfx_buy_provider.dart';
 import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
@ -44,48 +45,54 @@ class MainActions {
    isEnabled: (viewModel) => viewModel.isEnabledBuyAction,
    canShow: (viewModel) => viewModel.hasBuyAction,
    onTap: (BuildContext context, DashboardViewModel viewModel) async {
+      if (!viewModel.isEnabledBuyAction) {
+        await _showErrorDialog(context, S.of(context).unsupported_asset);
+        return;
+      }
+
      final defaultBuyProvider = viewModel.defaultBuyProvider;
-      final walletType = viewModel.type;
-
-      if (!viewModel.isEnabledBuyAction) return;
-
-      switch (walletType) {
-        case WalletType.bitcoin:
-        case WalletType.litecoin:
-        case WalletType.ethereum:
-        case WalletType.polygon:
-        case WalletType.bitcoinCash:
-          switch (defaultBuyProvider) {
-            case BuyProviderType.AskEachTime:
-              Navigator.pushNamed(context, Routes.buy);
-              break;
-            case BuyProviderType.Onramper:
-              await getIt.get<OnRamperBuyProvider>().launchProvider(context);
-              break;
-            case BuyProviderType.Robinhood:
-              await getIt.get<RobinhoodBuyProvider>().launchProvider(context);
-              break;
-          }
-          break;
-        case WalletType.nano:
-        case WalletType.banano:
-        case WalletType.monero:
-          await getIt.get<OnRamperBuyProvider>().launchProvider(context);
-          break;
-        default:
-          await showPopUp<void>(
-              context: context,
-              builder: (BuildContext context) {
-                return AlertWithOneAction(
-                    alertTitle: S.of(context).buy,
-                    alertContent: S.of(context).unsupported_asset,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop());
-              });
+      try {
+        await _launchProviderByType(context, defaultBuyProvider);
+      } catch (e) {
+        await _showErrorDialog(context, e.toString());
      }
    },
  );

+  static Future<void> _launchProviderByType(BuildContext context, BuyProviderType providerType) async {
+    switch (providerType) {
+      case BuyProviderType.AskEachTime:
+        Navigator.pushNamed(context, Routes.buy);
+        break;
+      case BuyProviderType.Onramper:
+        await getIt.get<OnRamperBuyProvider>().launchProvider(context);
+        break;
+      case BuyProviderType.Robinhood:
+        await getIt.get<RobinhoodBuyProvider>().launchProvider(context);
+        break;
+      case BuyProviderType.DFX:
+        await getIt.get<DFXBuyProvider>().launchProvider(context);
+        break;
+      default:
+        throw UnsupportedError('Unsupported buy provider type');
+    }
+  }
+
+
+  static Future<void> _showErrorDialog(BuildContext context, String errorMessage) async {
+    await showPopUp<void>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertWithOneAction(
+          alertTitle: S.of(context).buy,
+          alertContent: errorMessage,
+          buttonText: S.of(context).ok,
+          buttonAction: () => Navigator.of(context).pop(),
+        );
+      },
+    );
+  }
+
  static MainActions receiveAction = MainActions._(
    name: (context) => S.of(context).receive,
    image: 'assets/images/received.png',
--- a/lib/entities/node_list.dart
+++ b/lib/entities/node_list.dart
@ -85,8 +85,7 @@ Future<List<Node>> loadDefaultEthereumNodes() async {
 }

 Future<List<Node>> loadBitcoinCashElectrumServerList() async {
-  final serverListRaw =
-  await rootBundle.loadString('assets/bitcoin_cash_electrum_server_list.yml');
+  final serverListRaw = await rootBundle.loadString('assets/bitcoin_cash_electrum_server_list.yml');
  final loadedServerList = loadYaml(serverListRaw) as YamlList;
  final serverList = <Node>[];

@ -141,6 +140,7 @@ Future<List<Node>> loadDefaultPolygonNodes() async {
  for (final raw in loadedNodes) {
    if (raw is Map) {
      final node = Node.fromMap(Map<String, Object>.from(raw));
+
      node.type = WalletType.polygon;
      nodes.add(node);
    }
@ -159,7 +159,6 @@ Future<void> resetToDefault(Box<Node> nodeSource) async {
  final nanoNodes = await loadDefaultNanoNodes();
  final polygonNodes = await loadDefaultPolygonNodes();

-
  final nodes = moneroNodes +
      bitcoinElectrumServerList +
      litecoinElectrumServerList +
@ -178,4 +177,4 @@ Future<void> resetPowToDefault(Box<Node> powNodeSource) async {
  final nodes = nanoPowNodes;
  await powNodeSource.clear();
  await powNodeSource.addAll(nodes);
-}
+}
--- a/lib/entities/preferences_key.dart
+++ b/lib/entities/preferences_key.dart
@ -20,6 +20,8 @@ class PreferencesKey {
  static const disableBuyKey = 'disable_buy';
  static const disableSellKey = 'disable_sell';
  static const defaultBuyProvider = 'default_buy_provider';
+  static const walletListOrder = 'wallet_list_order';
+  static const walletListAscending = 'wallet_list_ascending';
  static const currentFiatApiModeKey = 'current_fiat_api_mode';
  static const allowBiometricalAuthenticationKey = 'allow_biometrical_authentication';
  static const useTOTP2FA = 'use_totp_2fa';
--- a/lib/entities/seed_type.dart
+++ b/lib/entities/seed_type.dart
@ -6,7 +6,7 @@ class SeedType extends EnumerableItem<int> with Serializable<int> {

  static const all = [SeedType.legacy, SeedType.polyseed];

-  static const defaultSeedType = legacy;
+  static const defaultSeedType = polyseed;

  static const legacy = SeedType(raw: 0, title: 'Legacy (25 words)');
  static const polyseed = SeedType(raw: 1, title: 'Polyseed (16 words)');
--- a/lib/entities/wallet_list_order_types.dart
+++ b/lib/entities/wallet_list_order_types.dart
@ -0,0 +1,22 @@
+import 'package:cake_wallet/generated/i18n.dart';
+
+enum WalletListOrderType {
+  CreationDate,
+  Alphabetical,
+  GroupByType,
+  Custom;
+
+  @override
+  String toString() {
+    switch (this) {
+      case WalletListOrderType.CreationDate:
+        return S.current.creation_date;
+      case WalletListOrderType.Alphabetical:
+        return S.current.alphabetical;
+      case WalletListOrderType.GroupByType:
+        return S.current.group_by_type;
+      case WalletListOrderType.Custom:
+        return S.current.custom_drag;
+    }
+  }
+}
--- a/lib/exchange/provider/sideshift_exchange_provider.dart
+++ b/lib/exchange/provider/sideshift_exchange_provider.dart
@ -159,8 +159,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
      url = apiBaseUrl + orderPath + '/fixed';
    } else {
      url = apiBaseUrl + orderPath + '/variable';
-      body["depositCoin"] = request.fromCurrency.title.toLowerCase();
-      body["settleCoin"] = request.toCurrency.title.toLowerCase();
+      body["depositCoin"] = _normalizeCurrency(request.fromCurrency);
+      body["settleCoin"] = _normalizeCurrency(request.toCurrency);
      body["settleNetwork"] = _networkFor(request.toCurrency);
      body["depositNetwork"] = _networkFor(request.fromCurrency);
    }
@ -248,8 +248,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
    final url = apiBaseUrl + quotePath;
    final headers = {'Content-Type': 'application/json'};
    final body = {
-      'depositCoin': request.fromCurrency.title.toLowerCase(),
-      'settleCoin': request.toCurrency.title.toLowerCase(),
+      'depositCoin': _normalizeCurrency(request.fromCurrency),
+      'settleCoin': _normalizeCurrency(request.toCurrency),
      'affiliateId': affiliateId,
      'settleAmount': request.toAmount,
      'settleNetwork': _networkFor(request.toCurrency),
@ -274,6 +274,15 @@ class SideShiftExchangeProvider extends ExchangeProvider {
    return responseJSON['id'] as String;
  }

+  String _normalizeCurrency(CryptoCurrency currency) {
+    switch (currency) {
+      case CryptoCurrency.usdcEPoly:
+        return 'usdc';
+      default:
+        return currency.title.toLowerCase();
+    }
+  }
+
  String _networkFor(CryptoCurrency currency) =>
      currency.tag != null ? _normalizeTag(currency.tag!) : 'mainnet';

--- a/lib/exchange/provider/simpleswap_exchange_provider.dart
+++ b/lib/exchange/provider/simpleswap_exchange_provider.dart
@ -222,6 +222,10 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
        return 'usdttrc20';
      case CryptoCurrency.usdcpoly:
        return 'usdcpoly';
+      case CryptoCurrency.usdtPoly:
+        return 'usdtpoly';
+      case CryptoCurrency.usdcEPoly:
+        return 'usdcepoly';
      case CryptoCurrency.usdcsol:
        return 'usdcspl';
      case CryptoCurrency.matic:
--- a/lib/exchange/provider/trocador_exchange_provider.dart
+++ b/lib/exchange/provider/trocador_exchange_provider.dart
@ -271,6 +271,8 @@ class TrocadorExchangeProvider extends ExchangeProvider {
      case CryptoCurrency.maticpoly:
        return 'Mainnet';
      case CryptoCurrency.usdcpoly:
+      case CryptoCurrency.usdtPoly:
+      case CryptoCurrency.usdcEPoly:
        return 'MATIC';
      case CryptoCurrency.zec:
        return 'Mainnet';
@ -283,6 +285,8 @@ class TrocadorExchangeProvider extends ExchangeProvider {
    switch (currency) {
      case CryptoCurrency.zec:
        return 'zec';
+      case CryptoCurrency.usdcEPoly:
+        return 'usdce';
      default:
        return currency.title.toLowerCase();
    }
--- a/lib/reactions/wallet_connect.dart
+++ b/lib/reactions/wallet_connect.dart
@ -44,3 +44,14 @@ String getChainNameBasedOnWalletType(WalletType walletType) {
      return '';
  }
 }
+
+String getTokenNameBasedOnWalletType(WalletType walletType) {
+  switch (walletType) {
+    case WalletType.ethereum:
+      return 'ETH';
+    case WalletType.polygon:
+      return 'MATIC';
+    default:
+      return '';
+  }
+}
--- a/lib/router.dart
+++ b/lib/router.dart
@ -65,6 +65,7 @@ import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cw_core/nano_account.dart';
 import 'package:cw_core/wallet_info.dart';
@ -158,9 +159,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
    case Routes.newWallet:
      final type = settings.arguments as WalletType;
      final walletNewVM = getIt.get<WalletNewVM>(param1: type);
-      final settingsStore = getIt.get<SettingsStore>();
+      final seedTypeViewModel = getIt.get<SeedTypeViewModel>();

-      return CupertinoPageRoute<void>(builder: (_) => NewWalletPage(walletNewVM, settingsStore));
+      return CupertinoPageRoute<void>(builder: (_) => NewWalletPage(walletNewVM, seedTypeViewModel));

    case Routes.setupPin:
      Function(PinCodeState<PinCodeWidget>, String)? callback;
@ -579,9 +580,9 @@ Route<dynamic> createRoute(RouteSettings settings) {

      return CupertinoPageRoute<void>(
          builder: (_) => AdvancedPrivacySettingsPage(
-                getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
-                getIt.get<NodeCreateOrEditViewModel>(param1: type, param2: false),
-              ));
+              getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
+              getIt.get<NodeCreateOrEditViewModel>(param1: type, param2: false),
+              getIt.get<SeedTypeViewModel>()));

    case Routes.anonPayInvoicePage:
      final args = settings.arguments as List;
--- a/lib/src/screens/buy/buy_options_page.dart
+++ b/lib/src/screens/buy/buy_options_page.dart
@ -1,18 +1,26 @@
+import 'package:cake_wallet/buy/dfx/dfx_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/buy_provider_types.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/option_tile.dart';
 import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';

 class BuyOptionsPage extends BasePage {
+  BuyOptionsPage(this.dashboardViewModel);
+
+  final DashboardViewModel dashboardViewModel;
  final iconDarkRobinhood = 'assets/images/robinhood_dark.png';
  final iconLightRobinhood = 'assets/images/robinhood_light.png';
  final iconDarkOnramper = 'assets/images/onramper_dark.png';
  final iconLightOnramper = 'assets/images/onramper_light.png';
+  final iconDarkDFX = 'assets/images/dfx_dark.png';
+  final iconLightDFX = 'assets/images/dfx_light.png';

  @override
  String get title => S.current.buy;
@ -22,11 +30,19 @@ class BuyOptionsPage extends BasePage {

  @override
  Widget body(BuildContext context) {
-    final isLightMode = Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
-    final iconRobinhood =
-        Image.asset(isLightMode ? iconLightRobinhood : iconDarkRobinhood, height: 40, width: 40);
-    final iconOnramper =
-        Image.asset(isLightMode ? iconLightOnramper : iconDarkOnramper, height: 40, width: 40);
+    final isLightMode =
+        Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
+    final iconRobinhood = Image.asset(
+        isLightMode ? iconLightRobinhood : iconDarkRobinhood,
+        height: 40,
+        width: 40);
+    final iconOnramper = Image.asset(
+        isLightMode ? iconLightOnramper : iconDarkOnramper,
+        height: 40,
+        width: 40);
+    final iconDFX = Image.asset(isLightMode ? iconLightDFX : iconDarkDFX,
+        height: 40, width: 40);
+    final availableProviders = dashboardViewModel.availableProviders;

    return Container(
      child: Center(
@ -34,26 +50,42 @@ class BuyOptionsPage extends BasePage {
          constraints: BoxConstraints(maxWidth: 330),
          child: Column(
            children: [
-              Padding(
-                padding: EdgeInsets.only(top: 24),
-                child: OptionTile(
-                  image: iconOnramper,
-                  title: "Onramper",
-                  description: S.of(context).onramper_option_description,
-                  onPressed: () async =>
-                      await getIt.get<OnRamperBuyProvider>().launchProvider(context),
+              if (availableProviders.contains(BuyProviderType.Onramper))
+                Padding(
+                  padding: EdgeInsets.only(top: 24),
+                  child: OptionTile(
+                    image: iconOnramper,
+                    title: "Onramper",
+                    description: S.of(context).onramper_option_description,
+                    onPressed: () async => await getIt
+                        .get<OnRamperBuyProvider>()
+                        .launchProvider(context),
+                  ),
                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(top: 24),
-                child: OptionTile(
-                  image: iconRobinhood,
-                  title: "Robinhood Connect",
-                  description: S.of(context).robinhood_option_description,
-                  onPressed: () async =>
-                  await getIt.get<RobinhoodBuyProvider>().launchProvider(context),
+              if (availableProviders.contains(BuyProviderType.Robinhood))
+                Padding(
+                  padding: EdgeInsets.only(top: 24),
+                  child: OptionTile(
+                    image: iconRobinhood,
+                    title: "Robinhood Connect",
+                    description: S.of(context).robinhood_option_description,
+                    onPressed: () async => await getIt
+                        .get<RobinhoodBuyProvider>()
+                        .launchProvider(context),
+                  ),
+                ),
+              if (availableProviders.contains(BuyProviderType.DFX))
+                Padding(
+                  padding: EdgeInsets.only(top: 24),
+                  child: OptionTile(
+                    image: iconDFX,
+                    title: "DFX Connect",
+                    description: S.of(context).dfx_option_description,
+                    onPressed: () async => await getIt
+                        .get<DFXBuyProvider>()
+                        .launchProvider(context),
+                  ),
                ),
-              ),
              Spacer(),
              Padding(
                padding: EdgeInsets.fromLTRB(24, 24, 24, 32),
@ -63,7 +95,9 @@ class BuyOptionsPage extends BasePage {
                  style: TextStyle(
                    fontSize: 14,
                    fontWeight: FontWeight.normal,
-                    color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+                    color: Theme.of(context)
+                        .extension<TransactionTradeTheme>()!
+                        .detailsTitlesColor,
                  ),
                ),
              ),
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@ -135,6 +135,7 @@ class ContactListPage extends BasePage {
          await showBar<void>(context, S.of(context).copied_to_clipboard);
        }
      },
+      behavior: HitTestBehavior.opaque,
      child: Container(
        padding: const EdgeInsets.only(top: 16, bottom: 16, right: 24),
        child: Row(
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@ -7,6 +7,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sideba
 import 'package:cake_wallet/src/screens/dashboard/pages/market_place_page.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
+import 'package:cake_wallet/src/widgets/vulnerable_seeds_popup.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/version_comparator.dart';
@ -60,7 +61,8 @@ class DashboardPage extends StatelessWidget {
          );

          if (DeviceInfo.instance.isDesktop) {
-            if (responsiveLayoutUtil.screenWidth > ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) {
+            if (responsiveLayoutUtil.screenWidth >
+                ResponsiveLayoutUtilBase.kDesktopMaxDashBoardWidthConstraint) {
              return getIt.get<DesktopSidebarWrapper>();
            } else {
              return dashboardPageView;
@ -191,7 +193,10 @@ class _DashboardPageView extends BasePage {
                        radius: 6.0,
                        dotWidth: 6.0,
                        dotHeight: 6.0,
-                        dotColor: Theme.of(context).indicatorColor,
+                        dotColor: Theme.of(context)
+                            .extension<DashboardPageTheme>()!
+                            .indicatorDotTheme
+                            .indicatorColor,
                        activeDotColor: Theme.of(context)
                            .extension<DashboardPageTheme>()!
                            .indicatorDotTheme
@ -292,6 +297,8 @@ class _DashboardPageView extends BasePage {

    _showReleaseNotesPopup(context);

+    _showVulnerableSeedsPopup(context);
+
    var needToPresentYat = false;
    var isInactive = false;

@ -351,4 +358,22 @@ class _DashboardPageView extends BasePage {
      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
    }
  }
+
+  void _showVulnerableSeedsPopup(BuildContext context) async {
+    final List<String> affectedWalletNames = await dashboardViewModel.checkAffectedWallets();
+
+    if (affectedWalletNames.isNotEmpty) {
+      Future<void>.delayed(
+        Duration(seconds: 1),
+        () {
+          showPopUp<void>(
+            context: context,
+            builder: (BuildContext context) {
+              return VulnerableSeedsPopup(affectedWalletNames);
+            },
+          );
+        },
+      );
+    }
+  }
 }
--- a/lib/src/screens/dashboard/desktop_dashboard_page.dart
+++ b/lib/src/screens/dashboard/desktop_dashboard_page.dart
@ -3,6 +3,7 @@ import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/release_notes/release_notes_screen.dart';
 import 'package:cake_wallet/src/screens/yat_emoji_id.dart';
+import 'package:cake_wallet/src/widgets/vulnerable_seeds_popup.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/utils/version_comparator.dart';
 import 'package:flutter/material.dart';
@ -110,5 +111,25 @@ class DesktopDashboardPage extends StatelessWidget {
    } else if (isNewInstall!) {
      sharedPrefs.setInt(PreferencesKey.lastSeenAppVersion, currentAppVersion);
    }
+
+    _showVulnerableSeedsPopup(context);
+  }
+
+  void _showVulnerableSeedsPopup(BuildContext context) async {
+    final List<String> affectedWalletNames = await dashboardViewModel.checkAffectedWallets();
+
+    if (affectedWalletNames.isNotEmpty) {
+      Future<void>.delayed(
+        Duration(seconds: 1),
+            () {
+          showPopUp<void>(
+            context: context,
+            builder: (BuildContext context) {
+              return VulnerableSeedsPopup(affectedWalletNames);
+            },
+          );
+        },
+      );
+    }
  }
 }
--- a/lib/src/screens/dashboard/home_settings_page.dart
+++ b/lib/src/screens/dashboard/home_settings_page.dart
@ -8,6 +8,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
 import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
@ -91,7 +92,7 @@ class HomeSettingsPage extends BasePage {
                fillColor: Theme.of(context).cardColor,
                child: Icon(
                  Icons.add,
-                  color: Theme.of(context).dialogTheme.backgroundColor,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                  size: 22.0,
                ),
                padding: EdgeInsets.all(12),
--- a/lib/src/screens/dashboard/pages/balance_page.dart
+++ b/lib/src/screens/dashboard/pages/balance_page.dart
@ -54,6 +54,24 @@ class BalancePage extends StatelessWidget {
                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                        height: 1,
                      ),
+                      unselectedLabelStyle: TextStyle(
+                        fontSize: 18,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w600,
+                        color:
+                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                        height: 1,
+                      ),
+                      labelColor:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                      dividerColor:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                      indicatorColor:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                      unselectedLabelColor: Theme.of(context)
+                          .extension<DashboardPageTheme>()!
+                          .pageTitleTextColor
+                          .withOpacity(0.5),
                      tabs: [
                        Tab(text: 'My Crypto'),
                        Tab(text: 'My NFTs'),
--- a/lib/src/screens/dashboard/widgets/filter_list_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_list_widget.dart
@ -0,0 +1,158 @@
+import 'package:cake_wallet/entities/list_order_mode.dart';
+import 'package:cake_wallet/entities/wallet_list_order_types.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/src/widgets/section_divider.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+
+class FilterListWidget extends StatefulWidget {
+  FilterListWidget({
+    required this.initalType,
+    required this.initalAscending,
+    required this.onClose,
+  });
+
+  final WalletListOrderType? initalType;
+  final bool initalAscending;
+  final Function(bool, WalletListOrderType) onClose;
+
+  @override
+  FilterListWidgetState createState() => FilterListWidgetState();
+}
+
+class FilterListWidgetState extends State<FilterListWidget> {
+  late bool ascending;
+  late WalletListOrderType? type;
+
+  @override
+  void initState() {
+    super.initState();
+    ascending = widget.initalAscending;
+    type = widget.initalType;
+  }
+
+  void setSelectedOrderType(WalletListOrderType? orderType) {
+    setState(() {
+      type = orderType;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    const sectionDivider = const HorizontalSectionDivider();
+    return PickerWrapperWidget(
+      onClose: () {
+        widget.onClose(ascending, type!);
+        Navigator.of(context).pop();
+      },
+      children: [
+        Padding(
+          padding: EdgeInsets.only(left: 24, right: 24, top: 24),
+          child: ClipRRect(
+            borderRadius: BorderRadius.all(Radius.circular(24)),
+            child: Container(
+              color: Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor,
+              child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+                Padding(
+                  padding: EdgeInsets.all(24.0),
+                  child: Text(
+                    S.of(context).order_by,
+                    style: TextStyle(
+                      color:
+                          Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+                      fontSize: 16,
+                      fontFamily: 'Lato',
+                      decoration: TextDecoration.none,
+                    ),
+                  ),
+                ),
+                if (type != WalletListOrderType.Custom) ...[
+                  sectionDivider,
+                  SettingsChoicesCell(
+                    ChoicesListItem<ListOrderMode>(
+                      title: "",
+                      items: ListOrderMode.all,
+                      selectedItem: ascending ? ListOrderMode.ascending : ListOrderMode.descending,
+                      onItemSelected: (ListOrderMode listOrderMode) {
+                        setState(() {
+                          ascending = listOrderMode == ListOrderMode.ascending;
+                        });
+                      },
+                    ),
+                  ),
+                ],
+                sectionDivider,
+                RadioListTile(
+                  value: WalletListOrderType.CreationDate,
+                  groupValue: type,
+                  title: Text(
+                    WalletListOrderType.CreationDate.toString(),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
+                  ),
+                  onChanged: setSelectedOrderType,
+                  activeColor: Theme.of(context).primaryColor,
+                ),
+                RadioListTile(
+                  value: WalletListOrderType.Alphabetical,
+                  groupValue: type,
+                  title: Text(
+                    WalletListOrderType.Alphabetical.toString(),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
+                  ),
+                  onChanged: setSelectedOrderType,
+                  activeColor: Theme.of(context).primaryColor,
+                ),
+                RadioListTile(
+                  value: WalletListOrderType.GroupByType,
+                  groupValue: type,
+                  title: Text(
+                    WalletListOrderType.GroupByType.toString(),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
+                  ),
+                  onChanged: setSelectedOrderType,
+                  activeColor: Theme.of(context).primaryColor,
+                ),
+                RadioListTile(
+                  value: WalletListOrderType.Custom,
+                  groupValue: type,
+                  title: Text(
+                    WalletListOrderType.Custom.toString(),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
+                  ),
+                  onChanged: setSelectedOrderType,
+                  activeColor: Theme.of(context).primaryColor,
+                ),
+              ]),
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}
--- a/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart
+++ b/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart
@ -18,6 +18,7 @@ class HomeScreenAccountWidget extends StatelessWidget {
    context: context,
    builder: (_) => getIt.get<MoneroAccountListPage>());
    },
+      behavior: HitTestBehavior.opaque,
      child: Container(
        height: 100.0,
        child: Row(
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@ -411,10 +411,6 @@ class ExchangePage extends BasePage {
      }
    });

-    reaction((_) => exchangeViewModel.isReceiveAddressEnabled, (bool isEnabled) {
-      receiveKey.currentState!.isAddressEditable(isEditable: isEnabled);
-    });
-
    reaction((_) => exchangeViewModel.isReceiveAmountEditable, (bool isReceiveAmountEditable) {
      receiveKey.currentState!.isAmountEditable(isEditable: isReceiveAmountEditable);
    });
@ -670,7 +666,6 @@ class ExchangePage extends BasePage {
                  ? exchangeViewModel.wallet.walletAddresses.address
                  : exchangeViewModel.receiveAddress,
              initialIsAmountEditable: exchangeViewModel.isReceiveAmountEditable,
-              initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled,
              isAmountEstimated: true,
              isMoneroWallet: exchangeViewModel.isMoneroWallet,
              currencies: exchangeViewModel.receiveCurrencies,
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@ -174,8 +174,6 @@ class ExchangeTemplatePage extends BasePage {
                                  ? exchangeViewModel.wallet.walletAddresses.address
                                  : exchangeViewModel.receiveAddress,
                              initialIsAmountEditable: false,
-                              initialIsAddressEditable:
-                              exchangeViewModel.isReceiveAddressEnabled,
                              isAmountEstimated: true,
                              isMoneroWallet: exchangeViewModel.isMoneroWallet,
                              currencies: exchangeViewModel.receiveCurrencies,
@ -328,11 +326,6 @@ class ExchangeTemplatePage extends BasePage {
      }
    });

-    reaction((_) => exchangeViewModel.isReceiveAddressEnabled,
-            (bool isEnabled) {
-          receiveKey.currentState!.isAddressEditable(isEditable: isEnabled);
-        });
-
    reaction((_) => exchangeViewModel.provider, (ExchangeProvider? provider) {
      receiveKey.currentState!.isAmountEditable(isEditable: false);
    });
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@ -23,7 +23,6 @@ class ExchangeCard extends StatefulWidget {
      required this.initialAddress,
      required this.initialWalletName,
      required this.initialIsAmountEditable,
-      required this.initialIsAddressEditable,
      required this.isAmountEstimated,
      required this.currencies,
      required this.onCurrencySelected,
@ -31,6 +30,7 @@ class ExchangeCard extends StatefulWidget {
      this.currencyValueValidator,
      this.addressTextFieldValidator,
      this.title = '',
+      this.initialIsAddressEditable = true,
      this.hasRefundAddress = false,
      this.isMoneroWallet = false,
      this.currencyButtonColor = Colors.transparent,
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@ -9,6 +9,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.
 import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
@ -18,25 +19,30 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';

 class AdvancedPrivacySettingsPage extends BasePage {
-  AdvancedPrivacySettingsPage(this.advancedPrivacySettingsViewModel, this.nodeViewModel);
+  AdvancedPrivacySettingsPage(
+      this.advancedPrivacySettingsViewModel, this.nodeViewModel, this.seedTypeViewModel);

  final AdvancedPrivacySettingsViewModel advancedPrivacySettingsViewModel;
  final NodeCreateOrEditViewModel nodeViewModel;
+  final SeedTypeViewModel seedTypeViewModel;

  @override
  String get title => S.current.privacy_settings;

  @override
-  Widget body(BuildContext context) =>
-      AdvancedPrivacySettingsBody(advancedPrivacySettingsViewModel, nodeViewModel);
+  Widget body(BuildContext context) => AdvancedPrivacySettingsBody(
+      advancedPrivacySettingsViewModel, nodeViewModel, seedTypeViewModel);
 }

 class AdvancedPrivacySettingsBody extends StatefulWidget {
-  const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key? key})
+  const AdvancedPrivacySettingsBody(
+      this.privacySettingsViewModel, this.nodeViewModel, this.seedTypeViewModel,
+      {Key? key})
      : super(key: key);

  final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
  final NodeCreateOrEditViewModel nodeViewModel;
+  final SeedTypeViewModel seedTypeViewModel;

  @override
  _AdvancedPrivacySettingsBodyState createState() => _AdvancedPrivacySettingsBodyState();
@ -59,7 +65,7 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
            Observer(builder: (_) {
              return SettingsChoicesCell(
                ChoicesListItem<FiatApiMode>(
-                  title: S.current.disable_fiat,
+                  title: S.current.fiat_api,
                  items: FiatApiMode.all,
                  selectedItem: widget.privacySettingsViewModel.fiatApiMode,
                  onItemSelected: (FiatApiMode mode) =>
@ -114,8 +120,8 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
                  ChoicesListItem<SeedType>(
                    title: S.current.seedtype,
                    items: SeedType.all,
-                    selectedItem: widget.privacySettingsViewModel.seedType,
-                    onItemSelected: widget.privacySettingsViewModel.setSeedType,
+                    selectedItem: widget.seedTypeViewModel.moneroSeedType,
+                    onItemSelected: widget.seedTypeViewModel.setMoneroSeedType,
                  ),
                );
              }),
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@ -7,6 +7,7 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
@ -23,13 +24,12 @@ import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/entities/seed_type.dart';
-import 'package:cake_wallet/store/settings_store.dart';

 class NewWalletPage extends BasePage {
-  NewWalletPage(this._walletNewVM, this._settingsStore);
+  NewWalletPage(this._walletNewVM, this._seedTypeViewModel);

  final WalletNewVM _walletNewVM;
-  final SettingsStore _settingsStore;
+  final SeedTypeViewModel _seedTypeViewModel;

  final walletNameImage = Image.asset('assets/images/wallet_name.png');

@ -40,15 +40,15 @@ class NewWalletPage extends BasePage {

  @override
  Widget body(BuildContext context) => WalletNameForm(
-      _walletNewVM, currentTheme.type == ThemeType.dark ? walletNameImage : walletNameLightImage, _settingsStore);
+      _walletNewVM, currentTheme.type == ThemeType.dark ? walletNameImage : walletNameLightImage, _seedTypeViewModel);
 }

 class WalletNameForm extends StatefulWidget {
-  WalletNameForm(this._walletNewVM, this.walletImage, this._settingsStore);
+  WalletNameForm(this._walletNewVM, this.walletImage, this._seedTypeViewModel);

  final WalletNewVM _walletNewVM;
  final Image walletImage;
-  final SettingsStore _settingsStore;
+  final SeedTypeViewModel _seedTypeViewModel;

  @override
  _WalletNameFormState createState() => _WalletNameFormState(_walletNewVM);
@ -272,7 +272,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                        builder: (BuildContext build) => Padding(
                          padding: EdgeInsets.only(top: 24),
                          child: SelectButton(
-                            text: widget._settingsStore.moneroSeedType.title,
+                            text: widget._seedTypeViewModel.moneroSeedType.title,
                            onTap: () async {
                              await showPopUp<void>(
                                context: context,
@ -295,7 +295,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                          key: _languageSelectorKey,
                          initialSelected: defaultSeedLanguage,
                          seedType: _walletNewVM.hasSeedType
-                              ? widget._settingsStore.moneroSeedType
+                              ? widget._seedTypeViewModel.moneroSeedType
                              : SeedType.legacy,
                        ),
                      ),
@ -355,10 +355,10 @@ class _WalletNameFormState extends State<WalletNameForm> {
    }
  }

-  bool get isPolyseed => widget._settingsStore.moneroSeedType == SeedType.polyseed;
+  bool get isPolyseed => widget._seedTypeViewModel.moneroSeedType == SeedType.polyseed;

  void _setSeedType(SeedType item) {
-    widget._settingsStore.moneroSeedType = item;
+    widget._seedTypeViewModel.setMoneroSeedType(item);
    _languageSelectorKey.currentState?.selected = defaultSeedLanguage; // Reset Seed language
  }
 }
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@ -9,8 +9,10 @@ import 'package:cake_wallet/src/widgets/seed_language_picker.dart';
 import 'package:cake_wallet/src/widgets/seed_widget.dart';
 import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:mobx/mobx.dart';
 import 'package:polyseed/polyseed.dart';

 class WalletRestoreFromSeedForm extends StatefulWidget {
@ -20,6 +22,7 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
      required this.displayBlockHeightSelector,
      required this.type,
      required this.displayWalletPassword,
+      required this.seedTypeViewModel,
      this.blockHeightFocusNode,
      this.onHeightOrDateEntered,
      this.onSeedChange,
@ -32,6 +35,7 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
  final bool displayLanguageSelector;
  final bool displayBlockHeightSelector;
  final bool displayWalletPassword;
+  final SeedTypeViewModel seedTypeViewModel;
  final FocusNode? blockHeightFocusNode;
  final Function(bool)? onHeightOrDateEntered;
  final void Function(String)? onSeedChange;
@ -63,15 +67,15 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
  final TextEditingController? repeatedPasswordTextEditingController;
  final TextEditingController seedTypeController;
  final GlobalKey<FormState> formKey;
+  late ReactionDisposer moneroSeedTypeReaction;
  String language;
  void Function()? passwordListener;
  void Function()? repeatedPasswordListener;
-  bool isPolyseed = false;

  @override
  void initState() {
+    _setSeedType(widget.seedTypeViewModel.moneroSeedType);
    _setLanguageLabel(language);
-    _setSeedType(SeedType.defaultSeedType);

    if (passwordTextEditingController != null) {
      passwordListener = () => widget.onPasswordChange?.call(passwordTextEditingController!.text);
@ -82,9 +86,21 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
      repeatedPasswordListener = () => widget.onRepeatedPasswordChange?.call(repeatedPasswordTextEditingController!.text);
      repeatedPasswordTextEditingController?.addListener(repeatedPasswordListener!);
    }
+    moneroSeedTypeReaction =
+        reaction((_) => widget.seedTypeViewModel.moneroSeedType, (SeedType item) {
+      _setSeedType(item);
+      _changeLanguage('English');
+    });
+
    super.initState();
  }

+  @override
+  void dispose() {
+    super.dispose();
+    moneroSeedTypeReaction();
+  }
+
  void onSeedChange(String seed) {
    if (widget.type == WalletType.monero && Polyseed.isValidSeed(seed)) {
      final lang = PolyseedLang.getByPhrase(seed);
@ -225,6 +241,8 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
        ]));
  }

+  bool get isPolyseed => widget.seedTypeViewModel.moneroSeedType == SeedType.polyseed;
+
  Widget get expandIcon => Container(
        padding: EdgeInsets.all(18),
        width: 24,
@ -252,10 +270,10 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
  void _changeSeedType(SeedType item) {
    _setSeedType(item);
    _changeLanguage('English');
+    widget.seedTypeViewModel.setMoneroSeedType(item);
  }

  void _setSeedType(SeedType item) {
-    setState(() => isPolyseed = item == SeedType.polyseed);
    seedTypeController.text = item.toString();
  }
 }
--- a/lib/src/screens/restore/wallet_restore_page.dart
+++ b/lib/src/screens/restore/wallet_restore_page.dart
@ -15,6 +15,7 @@ import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/restore/restore_mode.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
 import 'package:cw_core/nano_account_info_response.dart';
 import 'package:cw_core/wallet_info.dart';
@ -27,7 +28,7 @@ import 'package:polyseed/polyseed.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';

 class WalletRestorePage extends BasePage {
-  WalletRestorePage(this.walletRestoreViewModel)
+  WalletRestorePage(this.walletRestoreViewModel, this.seedTypeViewModel)
      : walletRestoreFromSeedFormKey = GlobalKey<WalletRestoreFromSeedFormState>(),
        walletRestoreFromKeysFormKey = GlobalKey<WalletRestoreFromKeysFromState>(),
        _pages = [],
@ -37,6 +38,7 @@ class WalletRestorePage extends BasePage {
      switch (mode) {
        case WalletRestoreMode.seed:
          _pages.add(WalletRestoreFromSeedForm(
+              seedTypeViewModel: seedTypeViewModel,
              displayBlockHeightSelector:
                  walletRestoreViewModel.hasBlockchainHeightLanguageSelector,
              displayLanguageSelector: walletRestoreViewModel.hasSeedLanguageSelector,
@ -97,6 +99,7 @@ class WalletRestorePage extends BasePage {
          ));

  final WalletRestoreViewModel walletRestoreViewModel;
+  final SeedTypeViewModel seedTypeViewModel;
  final PageController _controller;
  final List<Widget> _pages;
  final GlobalKey<WalletRestoreFromSeedFormState> walletRestoreFromSeedFormKey;
--- a/lib/src/screens/root/root.dart
+++ b/lib/src/screens/root/root.dart
@ -177,7 +177,7 @@ class RootState extends State<Root> with WidgetsBindingObserver {
        );
        launchUri = null;
      } else {
-        _nonETHWalletErrorToast(S.current.switchToETHWallet);
+        _nonETHWalletErrorToast(S.current.switchToEVMCompatibleWallet);
      }
    }

@ -207,7 +207,7 @@ class RootState extends State<Root> with WidgetsBindingObserver {
  String? _getRouteToGo() {
    if (isWalletConnectLink) {
      if (isEVMCompatibleChain(widget.appStore.wallet!.type)) {
-        _nonETHWalletErrorToast(S.current.switchToETHWallet);
+        _nonETHWalletErrorToast(S.current.switchToEVMCompatibleWallet);
        return null;
      }
      return Routes.walletConnectConnectionsListing;
--- a/lib/src/screens/seed/pre_seed_page.dart
+++ b/lib/src/screens/seed/pre_seed_page.dart
@ -1,6 +1,8 @@
+import 'package:cake_wallet/entities/seed_type.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/seed_type_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
@ -10,19 +12,21 @@ import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';

 class PreSeedPage extends BasePage {
-  PreSeedPage(this.type, this.advancedPrivacySettingsViewModel)
+  PreSeedPage(this.type, this.advancedPrivacySettingsViewModel, this.seedTypeViewModel)
      : imageLight = Image.asset('assets/images/pre_seed_light.png'),
        imageDark = Image.asset('assets/images/pre_seed_dark.png'),
-        seedPhraseLength =
-            advancedPrivacySettingsViewModel.seedPhraseLength.value {
-    wordsCount = _wordsCount(type, seedPhraseLength);
+        seedPhraseLength = advancedPrivacySettingsViewModel.seedPhraseLength.value,
+        moneroSeedType = seedTypeViewModel.moneroSeedType {
+    wordsCount = _wordsCount(type, seedPhraseLength, moneroSeedType);
  }

  final Image imageDark;
  final Image imageLight;
  final WalletType type;
  final AdvancedPrivacySettingsViewModel advancedPrivacySettingsViewModel;
+  final SeedTypeViewModel seedTypeViewModel;
  final int seedPhraseLength;
+  final SeedType moneroSeedType;
  late final int wordsCount;

  @override
@ -76,9 +80,11 @@ class PreSeedPage extends BasePage {
        ));
  }

-  static int _wordsCount(WalletType type, int seedPhraseLength) {
+  static int _wordsCount(WalletType type, int seedPhraseLength, SeedType moneroSeedType) {
    switch (type) {
      case WalletType.monero:
+        if (moneroSeedType == SeedType.polyseed)
+          return 16;
        return 25;
      case WalletType.ethereum:
      case WalletType.bitcoinCash:
--- a/lib/src/screens/settings/connection_sync_page.dart
+++ b/lib/src/screens/settings/connection_sync_page.dart
@ -1,4 +1,3 @@
-import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
@ -18,12 +17,11 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';

 class ConnectionSyncPage extends BasePage {
-  ConnectionSyncPage(this.dashboardViewModel, this.web3walletService);
+  ConnectionSyncPage(this.dashboardViewModel);

  @override
  String get title => S.current.connection_sync;

-  final Web3WalletService? web3walletService;
  final DashboardViewModel dashboardViewModel;

  @override
--- a/lib/src/screens/settings/display_settings_page.dart
+++ b/lib/src/screens/settings/display_settings_page.dart
@ -76,7 +76,7 @@ class DisplaySettingsPage extends BasePage {
                },
              ),
              if (responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile)
-                SettingsThemeChoicesCell(_displaySettingsViewModel),
+                Semantics(label: S.current.color_theme, child: SettingsThemeChoicesCell(_displaySettingsViewModel)),
            ],
          ),
        );
--- a/lib/src/screens/settings/other_settings_page.dart
+++ b/lib/src/screens/settings/other_settings_page.dart
@ -1,5 +1,3 @@
-import 'package:cake_wallet/buy/buy_provider.dart';
-import 'package:cake_wallet/entities/buy_provider_types.dart';
 import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
@ -42,9 +40,10 @@ class OtherSettingsPage extends BasePage {
                  handler: (BuildContext context) =>
                      Navigator.of(context).pushNamed(Routes.changeRep),
                ),
+              if(_otherSettingsViewModel.isEnabledBuyAction)
              SettingsPickerCell(
                title: S.current.default_buy_provider,
-                items: BuyProviderType.values,
+                items: _otherSettingsViewModel.availableBuyProviders,
                displayItem: _otherSettingsViewModel.getBuyProviderType,
                selectedItem: _otherSettingsViewModel.buyProviderType,
                onItemSelected: _otherSettingsViewModel.onBuyProviderTypeSelected,
--- a/lib/src/screens/settings/widgets/settings_choices_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_choices_cell.dart
@ -17,56 +17,57 @@ class SettingsChoicesCell extends StatelessWidget {
        mainAxisSize: MainAxisSize.min,
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          Row(
-            children: [
-              Text(
-                choicesListItem.title,
-                style: TextStyle(
-                  fontSize: 14,
-                  fontWeight: FontWeight.normal,
-                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+          if (choicesListItem.title.isNotEmpty) ...[
+            Row(
+              children: [
+                Text(
+                  choicesListItem.title,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                  ),
                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 24),
+              ],
+            ),
+            const SizedBox(height: 24),
+          ],
          Center(
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Container(
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(30),
-                  color: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: choicesListItem.items.map((dynamic e) {
-                    final isSelected = choicesListItem.selectedItem == e;
-                    return GestureDetector(
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(30),
+                color: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: choicesListItem.items.map((dynamic e) {
+                  final isSelected = choicesListItem.selectedItem == e;
+                  return Expanded(
+                    child: GestureDetector(
                      onTap: () {
                        choicesListItem.onItemSelected.call(e);
                      },
                      child: Container(
-                        padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8),
+                        padding: EdgeInsets.symmetric(vertical: 8),
                        decoration: BoxDecoration(
                          borderRadius: BorderRadius.circular(30),
-                          color: isSelected
-                              ? Theme.of(context).primaryColor
-                              : null,
+                          color: isSelected ? Theme.of(context).primaryColor : null,
                        ),
-                        child: Text(
-                          choicesListItem.displayItem.call(e),
-                          style: TextStyle(
-                            color: isSelected
-                                ? Colors.white
-                                : Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
-                            fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal,
+                        child: Center(
+                          child: Text(
+                            choicesListItem.displayItem.call(e),
+                            style: TextStyle(
+                              color: isSelected
+                                  ? Colors.white
+                                  : Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                              fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal,
+                            ),
                          ),
                        ),
                      ),
-                    );
-                  }).toList(),
-                ),
+                    ),
+                  );
+                }).toList(),
              ),
            ),
          ),
--- a/lib/src/screens/settings/widgets/settings_theme_choice.dart
+++ b/lib/src/screens/settings/widgets/settings_theme_choice.dart
@ -54,57 +54,61 @@ class SettingsThemeChoicesCell extends StatelessWidget {

                return Padding(
                  padding: EdgeInsets.all(5),
-                  child: GestureDetector(
-                    onTap: () {
-                      _displaySettingsViewModel.setTheme(e);
-                    },
-                    child: Container(
-                      padding: EdgeInsets.all(5),
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(cellRadius),
-                        border: isSelected
-                            ? Border.all(
-                                color: Theme.of(context).primaryColor)
-                            : null,
-                        color: Theme.of(context)
-                            .extension<CakeTextTheme>()!
-                            .secondaryTextColor
-                            .withOpacity(
-                                currentTheme.brightness == Brightness.light
-                                    ? 0.1
-                                    : 0.3),
-                      ),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Container(
-                            padding: EdgeInsets.symmetric(
-                                horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(
-                                  topLeft: Radius.circular(cellRadius),
-                                  bottomLeft: Radius.circular(cellRadius)),
-                              color: e.themeData.primaryColor,
+                  child: Semantics(
+                    label: e.toString(),
+                    selected: isSelected,
+                    child: GestureDetector(
+                      onTap: () {
+                        _displaySettingsViewModel.setTheme(e);
+                      },
+                      child: Container(
+                        padding: EdgeInsets.all(5),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(cellRadius),
+                          border: isSelected
+                              ? Border.all(
+                                  color: Theme.of(context).primaryColor)
+                              : null,
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .secondaryTextColor
+                              .withOpacity(
+                                  currentTheme.brightness == Brightness.light
+                                      ? 0.1
+                                      : 0.3),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.only(
+                                    topLeft: Radius.circular(cellRadius),
+                                    bottomLeft: Radius.circular(cellRadius)),
+                                color: e.themeData.primaryColor,
+                              ),
                            ),
-                          ),
-                          Container(
-                            padding: EdgeInsets.symmetric(
-                                horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(
-                              color: e.themeData.colorScheme.background,
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                color: e.themeData.colorScheme.background,
+                              ),
                            ),
-                          ),
-                          Container(
-                            padding: EdgeInsets.symmetric(
-                                horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(
-                                  topRight: Radius.circular(cellRadius),
-                                  bottomRight: Radius.circular(cellRadius)),
-                              color: e.themeData.cardColor,
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.only(
+                                    topRight: Radius.circular(cellRadius),
+                                    bottomRight: Radius.circular(cellRadius)),
+                                color: e.themeData.cardColor,
+                              ),
                            ),
-                          ),
-                        ],
+                          ],
+                        ),
                      ),
                    ),
                  ),
--- a/lib/src/screens/wallet_list/filtered_list.dart
+++ b/lib/src/screens/wallet_list/filtered_list.dart
@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:mobx/mobx.dart';
+
+class FilteredList extends StatefulWidget {
+  FilteredList({
+    required this.list,
+    required this.itemBuilder,
+    required this.updateFunction,
+  });
+
+  final ObservableList<dynamic> list;
+  final Widget Function(BuildContext, int) itemBuilder;
+  final Function updateFunction;
+
+  @override
+  FilteredListState createState() => FilteredListState();
+}
+
+class FilteredListState extends State<FilteredList> {
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (_) => ReorderableListView.builder(
+        physics: const BouncingScrollPhysics(),
+        itemBuilder: widget.itemBuilder,
+        itemCount: widget.list.length,
+        onReorder: (int oldIndex, int newIndex) {
+          if (oldIndex < newIndex) {
+            newIndex -= 1;
+          }
+          final dynamic item = widget.list.removeAt(oldIndex);
+          widget.list.insert(newIndex, item);
+          widget.updateFunction();
+        },
+      ),
+    );
+  }
+}
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@ -1,13 +1,16 @@
+import 'package:cake_wallet/entities/wallet_list_order_types.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/filter_list_widget.dart';
+import 'package:cake_wallet/src/screens/dashboard/widgets/filter_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_list/filtered_list.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/main.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/core/auth_service.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
-import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:another_flushbar/flushbar.dart';
 import 'package:flutter/material.dart';
@ -33,6 +36,53 @@ class WalletListPage extends BasePage {
  @override
  Widget body(BuildContext context) =>
      WalletListBody(walletListViewModel: walletListViewModel, authService: authService);
+
+  @override
+  Widget trailing(BuildContext context) {
+    final filterIcon = Image.asset('assets/images/filter_icon.png',
+        color: Theme.of(context).extension<FilterTheme>()!.iconColor);
+    return MergeSemantics(
+      child: SizedBox(
+        height: 37,
+        width: 37,
+        child: ButtonTheme(
+          minWidth: double.minPositive,
+          child: Semantics(
+            container: true,
+            child: GestureDetector(
+              onTap: () async {
+                await showPopUp<void>(
+                  context: context,
+                  builder: (context) => FilterListWidget(
+                    initalType: walletListViewModel.orderType,
+                    initalAscending: walletListViewModel.ascending,
+                    onClose: (bool ascending, WalletListOrderType type) async {
+                      walletListViewModel.setAscending(ascending);
+                      await walletListViewModel.setOrderType(type);
+                    },
+                  ),
+                );
+              },
+              child: Semantics(
+                label: 'Transaction Filter',
+                button: true,
+                enabled: true,
+                child: Container(
+                  height: 36,
+                  width: 36,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Theme.of(context).extension<FilterTheme>()!.buttonColor,
+                  ),
+                  child: filterIcon,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
 }

 class WalletListBody extends StatefulWidget {
@ -75,11 +125,9 @@ class WalletListBodyState extends State<WalletListBody> {
          Expanded(
            child: Container(
              child: Observer(
-                builder: (_) => ListView.separated(
-                  physics: const BouncingScrollPhysics(),
-                  separatorBuilder: (_, index) =>
-                      Divider(color: Theme.of(context).colorScheme.background, height: 32),
-                  itemCount: widget.walletListViewModel.wallets.length,
+                builder: (_) => FilteredList(
+                  list: widget.walletListViewModel.wallets,
+                  updateFunction: widget.walletListViewModel.reorderAccordingToWalletList,
                  itemBuilder: (__, index) {
                    final wallet = widget.walletListViewModel.wallets[index];
                    final currentColor = wallet.isCurrent
@ -88,6 +136,7 @@ class WalletListBodyState extends State<WalletListBody> {
                            .createNewWalletButtonBackgroundColor
                        : Theme.of(context).colorScheme.background;
                    final row = GestureDetector(
+                      key: ValueKey(wallet.name),
                      onTap: () => wallet.isCurrent ? null : _loadWallet(wallet),
                      child: Container(
                        height: tileHeight,
@ -122,7 +171,7 @@ class WalletListBodyState extends State<WalletListBody> {
                                        maxLines: null,
                                        softWrap: true,
                                        style: TextStyle(
-                                          fontSize: 22,
+                                          fontSize: 20,
                                          fontWeight: FontWeight.w500,
                                          color: Theme.of(context)
                                              .extension<CakeTextTheme>()!
@ -142,13 +191,15 @@ class WalletListBodyState extends State<WalletListBody> {
                    return wallet.isCurrent
                        ? row
                        : Row(
+                            key: ValueKey(wallet.name),
                            children: [
                              Expanded(child: row),
                              GestureDetector(
                                onTap: () => Navigator.of(context).pushNamed(Routes.walletEdit,
                                    arguments: [widget.walletListViewModel, wallet]),
                                child: Container(
-                                  padding: EdgeInsets.only(right: 20),
+                                  padding: EdgeInsets.only(
+                                      right: DeviceInfo.instance.isMobile ? 20 : 40),
                                  child: Center(
                                    child: Container(
                                      height: 40,
--- a/lib/src/widgets/picker_wrapper_widget.dart
+++ b/lib/src/widgets/picker_wrapper_widget.dart
@ -4,10 +4,11 @@ import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';

 class PickerWrapperWidget extends StatelessWidget {
-  PickerWrapperWidget({required this.children, this.hasTitle = false});
+  PickerWrapperWidget({required this.children, this.hasTitle = false, this.onClose});

  final List<Widget> children;
  final bool hasTitle;
+  final Function()? onClose;

  @override
  Widget build(BuildContext context) {
@ -45,7 +46,7 @@ class PickerWrapperWidget extends StatelessWidget {
                  children: children,
                ),
                SizedBox(height: ResponsiveLayoutUtilBase.kPopupSpaceHeight),
-                AlertCloseButton(bottom: closeButtonBottom),
+                AlertCloseButton(bottom: closeButtonBottom, onTap: onClose),
              ],
            ),
          ),
--- a/lib/src/widgets/standard_switch.dart
+++ b/lib/src/widgets/standard_switch.dart
@ -14,25 +14,29 @@ class StandardSwitch extends StatefulWidget {
 class StandardSwitchState extends State<StandardSwitch> {
  @override
  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: widget.onTaped,
-      child: AnimatedContainer(
-        padding: EdgeInsets.only(left: 2.0, right: 2.0),
-        alignment: widget.value ? Alignment.centerRight : Alignment.centerLeft,
-        duration: Duration(milliseconds: 250),
-        width: 50,
-        height: 28,
-        decoration: BoxDecoration(
-            color: widget.value
-                ? Theme.of(context).primaryColor
-                : Theme.of(context).disabledColor,
-            borderRadius: BorderRadius.all(Radius.circular(14.0))),
-        child: Container(
-          width: 24.0,
-          height: 24.0,
+
+    return Semantics(
+      toggled: widget.value,
+      child: GestureDetector(
+        onTap: widget.onTaped,
+        child: AnimatedContainer(
+          padding: EdgeInsets.only(left: 2.0, right: 2.0),
+          alignment: widget.value ? Alignment.centerRight : Alignment.centerLeft,
+          duration: Duration(milliseconds: 250),
+          width: 50,
+          height: 28,
          decoration: BoxDecoration(
-              color: Colors.white,
-              shape: BoxShape.circle),
+              color: widget.value
+                  ? Theme.of(context).primaryColor
+                  : Theme.of(context).disabledColor,
+              borderRadius: BorderRadius.all(Radius.circular(14.0))),
+          child: Container(
+            width: 24.0,
+            height: 24.0,
+            decoration: BoxDecoration(
+                color: Colors.white,
+                shape: BoxShape.circle),
+          ),
        ),
      ),
    );
--- a/lib/src/widgets/vulnerable_seeds_popup.dart
+++ b/lib/src/widgets/vulnerable_seeds_popup.dart
@ -0,0 +1,91 @@
+import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:flutter/material.dart';
+
+class VulnerableSeedsPopup extends StatelessWidget {
+  final List<String> affectedWalletNames;
+
+  const VulnerableSeedsPopup(this.affectedWalletNames, {Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      alignment: Alignment.center,
+      children: [
+        AlertBackground(
+          child: AlertDialog(
+            insetPadding: EdgeInsets.only(left: 16, right: 16, bottom: 48),
+            elevation: 0.0,
+            contentPadding: EdgeInsets.zero,
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(30))),
+            content: Container(
+              decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(30.0),
+                  gradient: LinearGradient(colors: [
+                    Theme.of(context).extension<DashboardPageTheme>()!.firstGradientBackgroundColor,
+                    Theme.of(context)
+                        .extension<DashboardPageTheme>()!
+                        .secondGradientBackgroundColor,
+                  ], begin: Alignment.centerLeft, end: Alignment.centerRight)),
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                child: Stack(
+                  children: [
+                    SingleChildScrollView(
+                      child: Padding(
+                        padding: const EdgeInsets.only(top: 16.0),
+                        child: Container(
+                          alignment: Alignment.bottomCenter,
+                          child: DefaultTextStyle(
+                            style: TextStyle(
+                              decoration: TextDecoration.none,
+                              fontSize: 24.0,
+                              fontWeight: FontWeight.bold,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                            ),
+                            child: Text("Emergency Notice"),
+                          ),
+                        ),
+                      ),
+                    ),
+                    SingleChildScrollView(
+                      child: Padding(
+                        padding: EdgeInsets.only(top: 48, bottom: 16),
+                        child: Container(
+                          width: double.maxFinite,
+                          child: Column(
+                            children: <Widget>[
+                              ConstrainedBox(
+                                constraints: BoxConstraints(
+                                  maxHeight: MediaQuery.of(context).size.height * 0.7,
+                                ),
+                                child: Text(
+                                  "Your Bitcoin wallet(s) below use a legacy seed format that is vulnerable, which MAY result in you losing money from these wallet(s) if no action is taken.\nWe recommend that you IMMEDIATELY create wallet(s) in Cake Wallet and immediately transfer the funds to these wallet(s).\nVulnerable wallet name(s):\n\n[${affectedWalletNames.join(", ")}]\n\nFor assistance, please use the in-app support or email support@cakewallet.com",
+                                  style: TextStyle(
+                                    decoration: TextDecoration.none,
+                                    fontSize: 16.0,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context)
+                                        .extension<DashboardPageTheme>()!
+                                        .textColor,
+                                  ),
+                                ),
+                              )
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+        AlertCloseButton(bottom: 30)
+      ],
+    );
+  }
+}
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@ -12,6 +12,7 @@ import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/seed_phrase_length.dart';
 import 'package:cake_wallet/entities/seed_type.dart';
 import 'package:cake_wallet/entities/sort_balance_types.dart';
+import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
 import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
@ -36,8 +37,6 @@ import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/entities/action_list_display_mode.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cw_core/set_app_secure_native.dart';
-import 'package:cake_wallet/utils/device_info.dart';
-
 part 'settings_store.g.dart';

 class SettingsStore = SettingsStoreBase with _$SettingsStore;
@ -55,7 +54,8 @@ abstract class SettingsStoreBase with Store {
      required bool initialAppSecure,
      required bool initialDisableBuy,
      required bool initialDisableSell,
-      required BuyProviderType initialDefaultBuyProvider,
+      required WalletListOrderType initialWalletListOrder,
+      required bool initialWalletListAscending,
      required FiatApiMode initialFiatMode,
      required bool initialAllowBiometricalAuthentication,
      required String initialTotpSecretKey,
@ -124,7 +124,8 @@ abstract class SettingsStoreBase with Store {
        isAppSecure = initialAppSecure,
        disableBuy = initialDisableBuy,
        disableSell = initialDisableSell,
-        defaultBuyProvider = initialDefaultBuyProvider,
+        walletListOrder = initialWalletListOrder,
+        walletListAscending = initialWalletListAscending,
        shouldShowMarketPlaceInDashboard = initialShouldShowMarketPlaceInDashboard,
        exchangeStatus = initialExchangeStatus,
        currentTheme = initialTheme,
@ -179,6 +180,12 @@ abstract class SettingsStoreBase with Store {

    initializeTrocadorProviderStates();

+    WalletType.values.forEach((walletType) {
+      final key = 'defaultBuyProvider_${walletType.toString()}';
+      final providerIndex = sharedPreferences.getInt(key);
+      defaultBuyProviders[walletType] = providerIndex != null ? BuyProviderType.values[providerIndex] : BuyProviderType.AskEachTime;
+    });
+
    reaction(
        (_) => fiatCurrency,
        (FiatCurrency fiatCurrency) => sharedPreferences.setString(
@ -245,9 +252,24 @@ abstract class SettingsStoreBase with Store {
            sharedPreferences.setBool(PreferencesKey.disableSellKey, disableSell));

    reaction(
-        (_) => defaultBuyProvider,
-        (BuyProviderType defaultBuyProvider) =>
-            sharedPreferences.setInt(PreferencesKey.defaultBuyProvider, defaultBuyProvider.index));
+            (_) => defaultBuyProviders.asObservable(),
+            (ObservableMap<WalletType, BuyProviderType> providers) {
+          providers.forEach((walletType, provider) {
+            final key = 'defaultBuyProvider_${walletType.toString()}';
+            sharedPreferences.setInt(key, provider.index);
+          });
+        }
+    );
+
+    reaction(
+        (_) => walletListOrder,
+        (WalletListOrderType walletListOrder) =>
+            sharedPreferences.setInt(PreferencesKey.walletListOrder, walletListOrder.index));
+
+    reaction(
+        (_) => walletListAscending,
+        (bool walletListAscending) =>
+            sharedPreferences.setBool(PreferencesKey.walletListAscending, walletListAscending));

    reaction(
        (_) => autoGenerateSubaddressStatus,
@ -334,6 +356,7 @@ abstract class SettingsStoreBase with Store {

    reaction((_) => totpSecretKey,
        (String totpKey) => sharedPreferences.setString(PreferencesKey.totpSecretKey, totpKey));
+
    reaction(
        (_) => numberOfFailedTokenTrials,
        (int failedTokenTrail) =>
@ -497,7 +520,10 @@ abstract class SettingsStoreBase with Store {
  bool disableSell;

  @observable
-  BuyProviderType defaultBuyProvider;
+  WalletListOrderType walletListOrder;
+
+  @observable
+  bool walletListAscending;

  @observable
  bool allowBiometricalAuthentication;
@ -568,6 +594,9 @@ abstract class SettingsStoreBase with Store {
  @observable
  ObservableMap<String, bool> trocadorProviderStates = ObservableMap<String, bool>();

+  @observable
+  ObservableMap<WalletType, BuyProviderType> defaultBuyProviders = ObservableMap<WalletType, BuyProviderType>();
+
  @observable
  SortBalanceBy sortBalanceBy;

@ -709,8 +738,10 @@ 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 walletListOrder =
+        WalletListOrderType.values[sharedPreferences.getInt(PreferencesKey.walletListOrder) ?? 0];
+    final walletListAscending =
+        sharedPreferences.getBool(PreferencesKey.walletListAscending) ?? true;
    final currentFiatApiMode = FiatApiMode.deserialize(
        raw: sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey) ??
            FiatApiMode.enabled.raw);
@ -869,7 +900,7 @@ abstract class SettingsStoreBase with Store {
    }

    final savedSyncMode = SyncMode.all.firstWhere((element) {
-      return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 1);
+      return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 0);
    });
    final savedSyncAll = sharedPreferences.getBool(PreferencesKey.syncAllKey) ?? true;

@ -889,7 +920,8 @@ abstract class SettingsStoreBase with Store {
        initialAppSecure: isAppSecure,
        initialDisableBuy: disableBuy,
        initialDisableSell: disableSell,
-        initialDefaultBuyProvider: defaultBuyProvider,
+        initialWalletListOrder: walletListOrder,
+        initialWalletListAscending: walletListAscending,
        initialFiatMode: currentFiatApiMode,
        initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
        initialCake2FAPresetOptions: selectedCake2FAPreset,
@ -1005,8 +1037,9 @@ 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];
+    walletListOrder =
+        WalletListOrderType.values[sharedPreferences.getInt(PreferencesKey.walletListOrder) ?? 0];
+    walletListAscending = sharedPreferences.getBool(PreferencesKey.walletListAscending) ?? true;
    allowBiometricalAuthentication =
        sharedPreferences.getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
            allowBiometricalAuthentication;
--- a/lib/themes/bright_theme.dart
+++ b/lib/themes/bright_theme.dart
@ -78,7 +78,7 @@ class BrightTheme extends LightTheme {
  FilterTheme get filterTheme => super.filterTheme.copyWith(
      checkboxSecondGradientColor: Palette.pinkFlamingo,
      checkboxBackgroundColor: Colors.white,
-      buttonColor: Colors.white.withOpacity(0.2),
+      buttonColor: Palette.darkGray.withOpacity(0.2),
      iconColor: Colors.white);

  @override
--- a/lib/view_model/advanced_privacy_settings_view_model.dart
+++ b/lib/view_model/advanced_privacy_settings_view_model.dart
@ -1,7 +1,6 @@
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/seed_phrase_length.dart';
-import 'package:cake_wallet/entities/seed_type.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
@ -20,9 +19,6 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
  @computed
  FiatApiMode get fiatApiMode => _settingsStore.fiatApiMode;

-  @computed
-  SeedType get seedType => _settingsStore.moneroSeedType;
-
  @observable
  bool _addCustomNode = false;

@ -44,9 +40,6 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
  @action
  void setFiatApiMode(FiatApiMode fiatApiMode) => _settingsStore.fiatApiMode = fiatApiMode;

-  @action
-  void setSeedType(SeedType seedType) => _settingsStore.moneroSeedType = seedType;
-
  @action
  void setExchangeApiMode(ExchangeApiMode value) => _settingsStore.exchangeStatus = value;

--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@ -91,6 +91,9 @@ abstract class ContactListViewModelBase with Store {
      walletContacts.where((element) => _isValidForCurrency(element)).toList();

  bool _isValidForCurrency(ContactBase element) {
-    return _currency == null || element.type == _currency || element.type.title == _currency!.tag;
+    return _currency == null ||
+        element.type == _currency ||
+        element.type.title == _currency!.tag ||
+        element.type.tag == _currency!.tag;
  }
 }
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@ -1,3 +1,6 @@
+import 'dart:convert';
+
+import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/buy_provider_types.dart';
@ -24,12 +27,19 @@ import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:cryptography/cryptography.dart';
 import 'package:cw_core/balance.dart';
+import 'package:cw_core/cake_hive.dart';
+import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/utils/file.dart';
 import 'package:cw_core/wallet_base.dart';
+import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:eth_sig_util/util/utils.dart';
+import 'package:flutter/services.dart';
 import 'package:mobx/mobx.dart';

 part 'dashboard_view_model.g.dart';
@ -46,7 +56,8 @@ abstract class DashboardViewModelBase with Store {
      required this.settingsStore,
      required this.yatStore,
      required this.ordersStore,
-      required this.anonpayTransactionsStore})
+      required this.anonpayTransactionsStore,
+      required this.keyService})
      : hasSellAction = false,
        hasBuyAction = false,
        hasExchangeAction = false,
@ -262,6 +273,8 @@ abstract class DashboardViewModelBase with Store {

  bool get hasRescan => wallet.type == WalletType.monero || wallet.type == WalletType.haven;

+  final KeyService keyService;
+
  BalanceViewModel balanceViewModel;

  AppStore appStore;
@ -282,10 +295,14 @@ abstract class DashboardViewModelBase with Store {

  Map<String, List<FilterItem>> filterItems;

-  BuyProviderType get defaultBuyProvider => settingsStore.defaultBuyProvider;
+  BuyProviderType get defaultBuyProvider =>
+      settingsStore.defaultBuyProviders[wallet.type] ?? BuyProviderType.AskEachTime;

  bool get isBuyEnabled => settingsStore.isBitcoinBuyEnabled;

+  List<BuyProviderType> get availableProviders =>
+      BuyProviderType.getAvailableProviders(wallet.type);
+
  bool get shouldShowYatPopup => settingsStore.shouldShowYatPopup;

  @action
@ -429,4 +446,32 @@ abstract class DashboardViewModelBase with Store {

  @action
  void setSyncAll(bool value) => settingsStore.currentSyncAll = value;
+
+  Future<List<String>> checkAffectedWallets() async {
+    // await load file
+    final vulnerableSeedsString = await rootBundle.loadString('assets/text/cakewallet_weak_bitcoin_seeds_hashed_sorted_version1.txt');
+    final vulnerableSeeds = vulnerableSeedsString.split("\n");
+
+    final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
+
+    List<String> affectedWallets = [];
+    for (var walletInfo in walletInfoSource.values) {
+      if (walletInfo.type == WalletType.bitcoin) {
+        final password = await keyService.getWalletPassword(walletName: walletInfo.name);
+        final path = await pathForWallet(name: walletInfo.name, type: walletInfo.type);
+        final jsonSource = await read(path: path, password: password);
+        final data = json.decode(jsonSource) as Map;
+        final mnemonic = data['mnemonic'] as String;
+
+        final hash = await Cryptography.instance.sha256().hash(utf8.encode(mnemonic));
+        final seedSha = bytesToHex(hash.bytes);
+
+        if (vulnerableSeeds.contains(seedSha)) {
+          affectedWallets.add(walletInfo.name);
+        }
+      }
+    }
+
+    return affectedWallets;
+  }
 }
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@ -66,7 +66,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
        receiveAddress = '',
        depositAddress = '',
        isDepositAddressEnabled = false,
-        isReceiveAddressEnabled = false,
        isReceiveAmountEditable = false,
        _useTorOnly = false,
        receiveCurrencies = <CryptoCurrency>[],
@ -108,7 +107,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
    bestRateSync = Timer.periodic(Duration(seconds: 10), (timer) => _calculateBestRate());

    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
-    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
    depositAmount = '';
    receiveAmount = '';
    receiveAddress = '';
@ -201,9 +199,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
  @observable
  bool isDepositAddressEnabled;

-  @observable
-  bool isReceiveAddressEnabled;
-
  @observable
  bool isReceiveAmountEntered;

@ -315,7 +310,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
    isFixedRateMode = false;
    _onPairChange();
    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
-    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
  }

  @action
@ -324,7 +318,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
    isFixedRateMode = false;
    _onPairChange();
    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
-    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
  }

  @action
@ -535,7 +528,6 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
    depositAddress = depositCurrency == wallet.currency ? wallet.walletAddresses.address : '';
    receiveAddress = receiveCurrency == wallet.currency ? wallet.walletAddresses.address : '';
    isDepositAddressEnabled = !(depositCurrency == wallet.currency);
-    isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
    isFixedRateMode = false;
    _onPairChange();
  }
--- a/lib/view_model/seed_type_view_model.dart
+++ b/lib/view_model/seed_type_view_model.dart
@ -0,0 +1,19 @@
+import 'package:cake_wallet/entities/seed_type.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:mobx/mobx.dart';
+
+part 'seed_type_view_model.g.dart';
+
+class SeedTypeViewModel = SeedTypeViewModelBase with _$SeedTypeViewModel;
+
+abstract class SeedTypeViewModelBase with Store {
+  SeedTypeViewModelBase(this._appStore);
+
+  @computed
+  SeedType get moneroSeedType => _appStore.settingsStore.moneroSeedType;
+
+  @action
+  void setMoneroSeedType(SeedType seedType) => _appStore.settingsStore.moneroSeedType = seedType;
+
+  final AppStore _appStore;
+}
--- a/lib/view_model/settings/other_settings_view_model.dart
+++ b/lib/view_model/settings/other_settings_view_model.dart
@ -13,14 +13,15 @@ import 'package:package_info_plus/package_info_plus.dart';

 part 'other_settings_view_model.g.dart';

-class OtherSettingsViewModel = OtherSettingsViewModelBase with _$OtherSettingsViewModel;
+class OtherSettingsViewModel = OtherSettingsViewModelBase
+    with _$OtherSettingsViewModel;

 abstract class OtherSettingsViewModelBase with Store {
  OtherSettingsViewModelBase(this._settingsStore, this._wallet)
      : walletType = _wallet.type,
        currentVersion = '' {
-    PackageInfo.fromPlatform()
-        .then((PackageInfo packageInfo) => currentVersion = packageInfo.version);
+    PackageInfo.fromPlatform().then(
+        (PackageInfo packageInfo) => currentVersion = packageInfo.version);

    final priority = _settingsStore.priority[_wallet.type];
    final priorities = priorityForWalletType(_wallet.type);
@ -31,7 +32,8 @@ abstract class OtherSettingsViewModelBase with Store {
  }

  final WalletType walletType;
-  final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> _wallet;
+  final WalletBase<Balance, TransactionHistoryBase<TransactionInfo>,
+      TransactionInfo> _wallet;

  @observable
  String currentVersion;
@ -50,15 +52,19 @@ abstract class OtherSettingsViewModelBase with Store {
  }

  @computed
-  bool get changeRepresentativeEnabled {
-    if (_wallet.type == WalletType.nano || _wallet.type == WalletType.banano) {
-      return true;
-    }
+  bool get changeRepresentativeEnabled =>
+      _wallet.type == WalletType.nano || _wallet.type == WalletType.banano;

-    return false;
-  }
-  
-  BuyProviderType get buyProviderType { return _settingsStore.defaultBuyProvider; }
+  @computed
+  bool get isEnabledBuyAction =>
+      !_settingsStore.disableBuy && _wallet.type != WalletType.haven;
+
+  List<BuyProviderType> get availableBuyProviders =>
+      BuyProviderType.getAvailableProviders(walletType);
+
+  BuyProviderType get buyProviderType =>
+      _settingsStore.defaultBuyProviders[walletType] ??
+      BuyProviderType.AskEachTime;

  String getDisplayPriority(dynamic priority) {
    final _priority = priority as TransactionPriority;
@ -73,7 +79,7 @@ abstract class OtherSettingsViewModelBase with Store {
    return priority.toString();
  }

-  String getBuyProviderType (dynamic buyProviderType) {
+  String getBuyProviderType(dynamic buyProviderType) {
    final _buyProviderType = buyProviderType as BuyProviderType;

    return _buyProviderType.toString();
@ -83,6 +89,5 @@ abstract class OtherSettingsViewModelBase with Store {
      _settingsStore.priority[_wallet.type] = priority;

  void onBuyProviderTypeSelected(BuyProviderType buyProviderType) =>
-      _settingsStore.defaultBuyProvider = buyProviderType;
-
+      _settingsStore.defaultBuyProviders[walletType] = buyProviderType;
 }
--- a/lib/view_model/wallet_keys_view_model.dart
+++ b/lib/view_model/wallet_keys_view_model.dart
@ -10,6 +10,7 @@ import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.d
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/haven/haven.dart';
 import 'package:cw_monero/api/wallet.dart' as monero_wallet;
+import 'package:polyseed/polyseed.dart';

 part 'wallet_keys_view_model.g.dart';

@ -74,6 +75,15 @@ abstract class WalletKeysViewModelBase with Store {
          StandartListItem(title: S.current.view_key_private, value: keys['privateViewKey']!),
        StandartListItem(title: S.current.wallet_seed, value: _appStore.wallet!.seed!),
      ]);
+
+      if (_appStore.wallet?.seed != null && Polyseed.isValidSeed(_appStore.wallet!.seed!)) {
+        final lang = PolyseedLang.getByPhrase(_appStore.wallet!.seed!);
+        final legacyLang = _getLegacySeedLang(lang);
+        final legacySeed =
+            Polyseed.decode(_appStore.wallet!.seed!, lang, PolyseedCoin.POLYSEED_MONERO)
+                .toLegacySeed(legacyLang);
+        items.add(StandartListItem(title: S.current.wallet_seed_legacy, value: legacySeed));
+      }
    }

    if (_appStore.wallet!.type == WalletType.haven) {
@ -207,4 +217,23 @@ abstract class WalletKeysViewModelBase with Store {
  }

  String getRoundedRestoreHeight(int height) => ((height / 1000).floor() * 1000).toString();
+
+  LegacySeedLang _getLegacySeedLang(PolyseedLang lang) {
+    switch (lang.nameEnglish) {
+      case "Spanish":
+        return LegacySeedLang.getByEnglishName("Spanish");
+      case "French":
+        return LegacySeedLang.getByEnglishName("French");
+      case "Italian":
+        return LegacySeedLang.getByEnglishName("Italian");
+      case "Japanese":
+        return LegacySeedLang.getByEnglishName("Japanese");
+      case "Portuguese":
+        return LegacySeedLang.getByEnglishName("Portuguese");
+      case "Chinese (Simplified)":
+        return LegacySeedLang.getByEnglishName("Chinese (simplified)");
+      default:
+        return LegacySeedLang.getByEnglishName("English");
+    }
+  }
 }
--- a/lib/view_model/wallet_list/wallet_list_view_model.dart
+++ b/lib/view_model/wallet_list/wallet_list_view_model.dart
@ -1,5 +1,6 @@
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
+import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/store/app_store.dart';
@ -19,7 +20,7 @@ abstract class WalletListViewModelBase with Store {
    this._walletLoadingService,
    this._authService,
  ) : wallets = ObservableList<WalletListItem>() {
-    updateList();
+    setOrderType(_appStore.settingsStore.walletListOrder);
    reaction((_) => _appStore.wallet, (_) => updateList());
  }

@ -43,11 +44,14 @@ abstract class WalletListViewModelBase with Store {

  @action
  Future<void> loadWallet(WalletListItem walletItem) async {
-    final wallet =
-        await _walletLoadingService.load(walletItem.type, walletItem.name);
+    final wallet = await _walletLoadingService.load(walletItem.type, walletItem.name);
    _appStore.changeCurrentWallet(wallet);
  }

+  WalletListOrderType? get orderType => _appStore.settingsStore.walletListOrder;
+
+  bool get ascending => _appStore.settingsStore.walletListAscending;
+
  @action
  void updateList() {
    wallets.clear();
@ -57,14 +61,105 @@ abstract class WalletListViewModelBase with Store {
          name: info.name,
          type: info.type,
          key: info.key,
-          isCurrent: info.name == _appStore.wallet?.name &&
-              info.type == _appStore.wallet?.type,
+          isCurrent: info.name == _appStore.wallet?.name && info.type == _appStore.wallet?.type,
          isEnabled: availableWalletTypes.contains(info.type),
        ),
      ),
    );
  }

+  Future<void> reorderAccordingToWalletList() async {
+    if (wallets.isEmpty) {
+      updateList();
+      return;
+    }
+
+    _appStore.settingsStore.walletListOrder = WalletListOrderType.Custom;
+
+    // make a copy of the walletInfoSource:
+    List<WalletInfo> walletInfoSourceCopy = _walletInfoSource.values.toList();
+    // delete all wallets from walletInfoSource:
+    await _walletInfoSource.clear();
+
+    // add wallets from wallets list in order of wallets list, by name:
+    for (WalletListItem wallet in wallets) {
+      for (int i = 0; i < walletInfoSourceCopy.length; i++) {
+        if (walletInfoSourceCopy[i].name == wallet.name) {
+          await _walletInfoSource.add(walletInfoSourceCopy[i]);
+          walletInfoSourceCopy.removeAt(i);
+          break;
+        }
+      }
+    }
+
+    updateList();
+  }
+
+  Future<void> sortGroupByType() async {
+    // sort the wallets by type:
+    List<WalletInfo> walletInfoSourceCopy = _walletInfoSource.values.toList();
+    await _walletInfoSource.clear();
+    if (ascending) {
+      walletInfoSourceCopy.sort((a, b) => a.type.toString().compareTo(b.type.toString()));
+    } else {
+      walletInfoSourceCopy.sort((a, b) => b.type.toString().compareTo(a.type.toString()));
+    }
+    await _walletInfoSource.addAll(walletInfoSourceCopy);
+    updateList();
+  }
+
+  Future<void> sortAlphabetically() async {
+    // sort the wallets alphabetically:
+    List<WalletInfo> walletInfoSourceCopy = _walletInfoSource.values.toList();
+    await _walletInfoSource.clear();
+    if (ascending) {
+      walletInfoSourceCopy.sort((a, b) => a.name.compareTo(b.name));
+    } else {
+      walletInfoSourceCopy.sort((a, b) => b.name.compareTo(a.name));
+    }
+    await _walletInfoSource.addAll(walletInfoSourceCopy);
+    updateList();
+  }
+
+  Future<void> sortByCreationDate() async {
+    // sort the wallets by creation date:
+    List<WalletInfo> walletInfoSourceCopy = _walletInfoSource.values.toList();
+    await _walletInfoSource.clear();
+    if (ascending) {
+      walletInfoSourceCopy.sort((a, b) => a.date.compareTo(b.date));
+    } else {
+      walletInfoSourceCopy.sort((a, b) => b.date.compareTo(a.date));
+    }
+    await _walletInfoSource.addAll(walletInfoSourceCopy);
+    updateList();
+  }
+
+  void setAscending(bool ascending) {
+    _appStore.settingsStore.walletListAscending = ascending;
+  }
+
+  Future<void> setOrderType(WalletListOrderType? type) async {
+    if (type == null) return;
+
+    _appStore.settingsStore.walletListOrder = type;
+
+    switch (type) {
+      case WalletListOrderType.CreationDate:
+        await sortByCreationDate();
+        break;
+      case WalletListOrderType.Alphabetical:
+        await sortAlphabetically();
+        break;
+      case WalletListOrderType.GroupByType:
+        await sortGroupByType();
+        break;
+      case WalletListOrderType.Custom:
+      default:
+        await reorderAccordingToWalletList();
+        break;
+    }
+  }
+
  bool checkIfAuthRequired() {
    return _authService.requireAuth();
  }
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@ -89,7 +89,7 @@ dependencies:
  bitcoin_flutter:
    git:
      url: https://github.com/cake-tech/bitcoin_flutter.git
-      ref: cake-update-v3
+      ref: cake-update-v4
  fluttertoast: 8.1.4
 #  tor:
 #    git:
@ -97,9 +97,7 @@ dependencies:
 #      ref: main
  socks5_proxy: ^1.0.4
  flutter_svg: ^2.0.9
-  polyseed:
-    git:
-      url: https://github.com/cake-tech/polyseed_dart.git
+  polyseed: ^0.0.2

 dev_dependencies:
  flutter_test:
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@ -733,6 +733,9 @@
  "require_for_exchanges_to_external_wallets": "ﺔﻴﺟﺭﺎﺧ ﻆﻓﺎﺤﻣ ﻰﻟﺇ ﺕﻻﺩﺎﺒﺘﻟﺍ ﺐﻠﻄﺘﺗ",
  "camera_permission_is_required": ".ﺍﺮﻴﻣﺎﻜﻟﺍ ﻥﺫﺇ ﺏﻮﻠﻄﻣ",
  "switchToETHWallet": "ﻯﺮﺧﺃ ﺓﺮﻣ ﺔﻟﻭﺎﺤﻤﻟﺍﻭ Ethereum ﺔﻈﻔﺤﻣ ﻰﻟﺇ ﻞﻳﺪﺒﺘﻟﺍ ﻰﺟﺮﻳ",
+  "order_by": "ترتيب حسب",
+  "creation_date": "تاريخ الإنشاء",
+  "group_by_type": "مجموعة حسب النوع",
  "importNFTs": "NFTs ﺩﺍﺮﻴﺘﺳﺍ",
  "noNFTYet": "ﻥﻵﺍ ﻰﺘﺣ NFTs ﺪﺟﻮﻳ ﻻ",
  "address": " ﻥﺍﻮﻨﻋ",
@ -752,5 +755,11 @@
  "seed_language_czech": "التشيكية",
  "seed_language_korean": "الكورية",
  "seed_language_chinese_traditional": "تقاليد صينية)",
-  "polygonscan_history": "ﻥﺎﻜﺴﻧﻮﺠﻴﻟﻮﺑ ﺦﻳﺭﺎﺗ"
+  "ascending": "تصاعدي",
+  "descending": "النزول",
+  "dfx_option_description": "ﺎﺑﻭﺭﻭﺃ ﻲﻓ ﺕﺎﻛﺮﺸﻟﺍﻭ ﺔﺋﺰﺠﺘﻟﺍ ءﻼﻤﻌﻟ .ﻲﻓﺎﺿﺇ KYC ﻥﻭﺪﺑ ﻭﺭﻮﻳ 990 ﻰﻟﺇ ﻞﺼﻳ ﺎﻣ .ﻱﺮﺴﻳﻮﺴﻟﺍ",
+  "polygonscan_history": "ﻥﺎﻜﺴﻧﻮﺠﻴﻟﻮﺑ ﺦﻳﺭﺎﺗ",
+  "wallet_seed_legacy": "بذرة محفظة قديمة",
+  "custom_drag": "مخصص (عقد وسحب)",
+  "switchToEVMCompatibleWallet": "  (Ethereum، Polygon) ﻯﺮﺧﺃ ﺓﺮﻣ ﺔﻟﻭﺎﺤﻤﻟﺍﻭ EVM ﻊﻣ ﺔﻘﻓﺍﻮﺘﻣ ﺔﻈﻔﺤﻣ ﻰﻟﺇ ﻞﻳﺪﺒﺘﻟﺍ ﻰﺟﺮﻳ"
 }
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@ -729,6 +729,9 @@
  "require_for_exchanges_to_external_wallets": "Изискване за обмен към външни портфейли",
  "camera_permission_is_required": "Изисква се разрешение за камерата.\nМоля, активирайте го от настройките на приложението.",
  "switchToETHWallet": "Моля, преминете към портфейл Ethereum и опитайте отново",
+  "order_by": "Подредени по",
+  "creation_date": "Дата на създаване",
+  "group_by_type": "Група по вид",
  "importNFTs": "Импортирайте NFT",
  "noNFTYet": "Все още няма NFT",
  "address": "Адрес",
@ -748,5 +751,11 @@
  "seed_language_czech": "Чех",
  "seed_language_korean": "Корейски",
  "seed_language_chinese_traditional": "Традиционен китайски)",
-  "polygonscan_history": "История на PolygonScan"
+  "ascending": "Възходящ",
+  "descending": "Низходящ",
+  "dfx_option_description": "Купете крипто с EUR и CHF. До 990 € без допълнителен KYC. За клиенти на дребно и корпоративни клиенти в Европа",
+  "polygonscan_history": "История на PolygonScan",
+  "wallet_seed_legacy": "Наследено портфейл семе",
+  "custom_drag": "Персонализиране (задръжте и плъзнете)",
+  "switchToEVMCompatibleWallet": "Моля, превключете към портфейл, съвместим с EVM, и опитайте отново (Ethereum, Polygon)"
 }
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@ -729,6 +729,9 @@
  "require_for_exchanges_to_external_wallets": "Vyžadovat pro výměny do externích peněženek",
  "camera_permission_is_required": "Vyžaduje se povolení fotoaparátu.\nPovolte jej v nastavení aplikace.",
  "switchToETHWallet": "Přejděte na peněženku Ethereum a zkuste to znovu",
+  "order_by": "Seřadit podle",
+  "creation_date": "Datum vzniku",
+  "group_by_type": "Skupina podle typu",
  "importNFTs": "Importujte NFT",
  "noNFTYet": "Zatím žádné NFT",
  "address": "Adresa",
@ -748,5 +751,11 @@
  "seed_language_czech": "čeština",
  "seed_language_korean": "korejština",
  "seed_language_chinese_traditional": "Číňan (tradiční)",
-  "polygonscan_history": "Historie PolygonScan"
+  "ascending": "Vzestupné",
+  "descending": "Klesající",
+  "dfx_option_description": "Nakupujte kryptoměny za EUR a CHF. Až 990 € bez dalších KYC. Pro maloobchodní a firemní zákazníky v Evropě",
+  "polygonscan_history": "Historie PolygonScan",
+  "wallet_seed_legacy": "Starší semeno peněženky",
+  "custom_drag": "Custom (Hold and Drag)",
+  "switchToEVMCompatibleWallet": "Přepněte na peněženku kompatibilní s EVM a zkuste to znovu (Ethereum, Polygon)"
 }
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -737,6 +737,9 @@
  "require_for_exchanges_to_external_wallets": "Erforderlich für den Umtausch in externe Wallets",
  "camera_permission_is_required": "Eine Kameraerlaubnis ist erforderlich.\nBitte aktivieren Sie es in den App-Einstellungen.",
  "switchToETHWallet": "Bitte wechseln Sie zu einem Ethereum-Wallet und versuchen Sie es erneut",
+  "order_by": "Sortieren nach",
+  "creation_date": "Erstellungsdatum",
+  "group_by_type": "Gruppe nach Typ",
  "importNFTs": "NFTs importieren",
  "noNFTYet": "Noch keine NFTs",
  "address": "Adresse",
@ -756,5 +759,11 @@
  "seed_language_czech": "Tschechisch",
  "seed_language_korean": "Koreanisch",
  "seed_language_chinese_traditional": "Chinesisch (Traditionell)",
-  "polygonscan_history": "PolygonScan-Verlauf"
+  "ascending": "Aufsteigend",
+  "descending": "Absteigend",
+  "dfx_option_description": "Krypto mit EUR und CHF kaufen. Bis zu 990€ ohne zusätzliches KYC. Für Privat- und Firmenkunden in Europa",
+  "polygonscan_history": "PolygonScan-Verlauf",
+  "wallet_seed_legacy": "Legacy Wallet Seed",
+  "custom_drag": "Custom (Hold and Drag)",
+  "switchToEVMCompatibleWallet": "Bitte wechseln Sie zu einem EVM-kompatiblen Wallet und versuchen Sie es erneut (Ethereum, Polygon)"
 }
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -498,7 +498,7 @@
  "bill_amount": "Bill Amount",
  "you_pay": "You Pay",
  "tip": "Tip:",
-  "custom": "custom",
+  "custom": "Custom",
  "by_cake_pay": "by Cake Pay",
  "expires": "Expires",
  "mm": "MM",
@ -738,6 +738,9 @@
  "require_for_exchanges_to_external_wallets": "Require for exchanges to external wallets",
  "camera_permission_is_required": "Camera permission is required. \nPlease enable it from app settings.",
  "switchToETHWallet": "Please switch to an Ethereum wallet and try again",
+  "order_by": "Order by",
+  "creation_date": "Creation Date",
+  "group_by_type": "Group by type",
  "importNFTs": "Import NFTs",
  "noNFTYet": "No NFTs yet",
  "address": "Address",
@ -757,5 +760,11 @@
  "seed_language_czech": "Czech",
  "seed_language_korean": "Korean",
  "seed_language_chinese_traditional": "Chinese (Traditional)",
-  "polygonscan_history": "PolygonScan history"
+  "ascending": "Ascending",
+  "descending": "Descending",
+  "dfx_option_description": "Buy crypto with EUR & CHF. Up to 990€ without additional KYC. For retail and corporate customers in Europe",
+  "polygonscan_history": "PolygonScan history",
+  "wallet_seed_legacy": "Legacy wallet seed",
+  "custom_drag": "Custom (Hold and Drag)",
+  "switchToEVMCompatibleWallet": "Please switch to an EVM compatible wallet and try again (Ethereum, Polygon)"
 }
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -737,6 +737,9 @@
  "require_for_exchanges_to_external_wallets": "Requerido para intercambios a billeteras externas",
  "camera_permission_is_required": "Se requiere permiso de la cámara.\nHabilítelo desde la configuración de la aplicación.",
  "switchToETHWallet": "Cambie a una billetera Ethereum e inténtelo nuevamente.",
+  "order_by": "Ordenar",
+  "creation_date": "Fecha de creación",
+  "group_by_type": "Grupo por tipo",
  "importNFTs": "Importar NFT",
  "noNFTYet": "Aún no hay NFT",
  "address": "DIRECCIÓN",
@ -755,6 +758,12 @@
  "seedtype_polyseed": "Polieta (16 palabras)",
  "seed_language_czech": "checo",
  "seed_language_korean": "coreano",
+  "ascending": "Ascendente",
+  "descending": "Descendente",
  "seed_language_chinese_traditional": "Chino (tradicional)",
-  "polygonscan_history": "Historial de PolygonScan"
+  "dfx_option_description": "Compre criptomonedas con EUR y CHF. Hasta 990€ sin KYC adicional. Para clientes minoristas y corporativos en Europa",
+  "polygonscan_history": "Historial de PolygonScan",
+  "wallet_seed_legacy": "Semilla de billetera heredada",
+  "custom_drag": "Custom (mantenía y arrastre)",
+  "switchToEVMCompatibleWallet": "Cambie a una billetera compatible con EVM e inténtelo nuevamente (Ethereum, Polygon)"
 }
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -736,7 +736,6 @@
  "domain_looks_up": "Résolution de nom",
  "require_for_exchanges_to_external_wallets": "Exiger pour les échanges vers des portefeuilles externes",
  "camera_permission_is_required": "L'autorisation de la caméra est requise.\nVeuillez l'activer à partir des paramètres de l'application.",
-  "switchToETHWallet": "Veuillez passer à un portefeuille (wallet) Ethereum et réessayer",
  "importNFTs": "Importer des NFT",
  "noNFTYet": "Pas encore de NFT",
  "address": "Adresse",
@ -747,7 +746,11 @@
  "seed_phrase_length": "Longueur de la phrase de départ",
  "unavailable_balance": "Solde indisponible",
  "unavailable_balance_description": "Solde indisponible : ce total comprend les fonds bloqués dans les transactions en attente et ceux que vous avez activement gelés dans vos paramètres de contrôle des pièces. Les soldes bloqués deviendront disponibles une fois leurs transactions respectives terminées, tandis que les soldes gelés resteront inaccessibles aux transactions jusqu'à ce que vous décidiez de les débloquer.",
+  "switchToETHWallet": "Veuillez passer à un portefeuille (wallet) Ethereum et réessayer",
  "unspent_change": "Changement",
+  "order_by": "Commandé par",
+  "creation_date": "Date de création",
+  "group_by_type": "Groupe par type",
  "tor_connection": "Connexion Tor",
  "seed_hex_form": "Graine du portefeuille (forme hexagonale)",
  "seedtype": "Type de type graine",
@ -756,5 +759,11 @@
  "seed_language_czech": "tchèque",
  "seed_language_korean": "coréen",
  "seed_language_chinese_traditional": "Chinois (Traditionnel)",
-  "polygonscan_history": "Historique de PolygonScan"
+  "ascending": "Ascendant",
+  "descending": "Descendant",
+  "dfx_option_description": "Achetez des crypto-monnaies avec EUR et CHF. Jusqu'à 990€ sans KYC supplémentaire. Pour les clients particuliers et entreprises en Europe",
+  "polygonscan_history": "Historique de PolygonScan",
+  "wallet_seed_legacy": "Graine de portefeuille hérité",
+  "custom_drag": "Custom (maintenir et traîner)",
+  "switchToEVMCompatibleWallet": "Veuillez passer à un portefeuille compatible EVM et réessayer (Ethereum, Polygon)"
 }
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@ -715,6 +715,9 @@
  "require_for_exchanges_to_external_wallets": "Bukatar musanya zuwa wallet na waje",
  "camera_permission_is_required": "Ana buƙatar izinin kyamara.\nDa fatan za a kunna shi daga saitunan app.",
  "switchToETHWallet": "Da fatan za a canza zuwa walat ɗin Ethereum kuma a sake gwadawa",
+  "order_by": "Oda ta",
+  "creation_date": "Ranar halitta",
+  "group_by_type": "Rukuni ta nau'in",
  "importNFTs": "Shigo da NFTs",
  "noNFTYet": "Babu NFTs tukuna",
  "address": "Adireshi",
@ -734,5 +737,11 @@
  "seed_language_czech": "Czech",
  "seed_language_korean": "Yaren Koriya",
  "seed_language_chinese_traditional": "Sinanci (na gargajiya)",
-  "polygonscan_history": "PolygonScan tarihin kowane zamani"
+  "ascending": "Hau",
+  "descending": "Saukowa",
+  "dfx_option_description": "Sayi crypto tare da EUR & CHF. Har zuwa € 990 ba tare da ƙarin KYC ba. Don 'yan kasuwa da abokan ciniki na kamfanoni a Turai",
+  "polygonscan_history": "PolygonScan tarihin kowane zamani",
+  "wallet_seed_legacy": "Tallarin walat walat",
+  "custom_drag": "Al'ada (riƙe da ja)",
+  "switchToEVMCompatibleWallet": "Da fatan za a canza zuwa walat ɗin EVM mai jituwa kuma a sake gwadawa (Ethereum, Polygon)"
 }
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -737,6 +737,9 @@
  "require_for_exchanges_to_external_wallets": "बाहरी वॉलेट में एक्सचेंज की आवश्यकता है",
  "camera_permission_is_required": "कैमरे की अनुमति आवश्यक है.\nकृपया इसे ऐप सेटिंग से सक्षम करें।",
  "switchToETHWallet": "कृपया एथेरियम वॉलेट पर स्विच करें और पुनः प्रयास करें",
+  "order_by": "द्वारा आदेश",
+  "creation_date": "निर्माण तिथि",
+  "group_by_type": "प्रकार द्वारा समूह",
  "importNFTs": "एनएफटी आयात करें",
  "noNFTYet": "अभी तक कोई एनएफटी नहीं",
  "address": "पता",
@ -756,5 +759,11 @@
  "seed_language_czech": "चेक",
  "seed_language_korean": "कोरियाई",
  "seed_language_chinese_traditional": "चीनी पारंपरिक)",
-  "polygonscan_history": "पॉलीगॉनस्कैन इतिहास"
+  "ascending": "आरोही",
+  "descending": "अवरोही",
+  "dfx_option_description": "EUR और CHF के साथ क्रिप्टो खरीदें। अतिरिक्त केवाईसी के बिना 990€ तक। यूरोप में खुदरा और कॉर्पोरेट ग्राहकों के लिए",
+  "polygonscan_history": "पॉलीगॉनस्कैन इतिहास",
+  "wallet_seed_legacy": "विरासत बटुए बीज",
+  "custom_drag": "कस्टम (पकड़ और खींचें)",
+  "switchToEVMCompatibleWallet": "कृपया ईवीएम संगत वॉलेट पर स्विच करें और पुनः प्रयास करें (एथेरियम, पॉलीगॉन)"
 }
--- a/Show more
+++ b/Show more