diff --git a/.github/workflows/cache_dependencies.yml b/.github/workflows/cache_dependencies.yml
index ce098b7f1..938027e81 100644
--- a/.github/workflows/cache_dependencies.yml
+++ b/.github/workflows/cache_dependencies.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.4"
           channel: stable
 
       - name: Install package dependencies
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
index 774404e3b..e3617f81e 100644
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.4"
           channel: stable
 
       - name: Install package dependencies
@@ -131,12 +131,12 @@ jobs:
       - name: Generate key properties
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=$STORE_PASS keyPassword=$KEY_PASS
+          dart run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=$STORE_PASS keyPassword=$KEY_PASS
 
       - name: Generate localization
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_localization.dart
+          dart run tool/generate_localization.dart
 
       - name: Build generated code
         run: |
diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml
index f3ce1045d..9e25f9f7a 100644
--- a/.github/workflows/pr_test_build_linux.yml
+++ b/.github/workflows/pr_test_build_linux.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.19.6"
+          flutter-version: "3.24.4"
           channel: stable
 
       - name: Install package dependencies
@@ -111,7 +111,7 @@ jobs:
       - name: Generate localization
         run: |
           cd /opt/android/cake_wallet
-          flutter packages pub run tool/generate_localization.dart
+          dart run tool/generate_localization.dart
 
       - name: Build generated code
         run: |
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5005a8bab..628e2ffe6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -38,11 +38,14 @@ if (appPropertiesFile.exists()) {
 
 android {
     compileSdkVersion 34
+    buildToolsVersion "34.0.0"
 
     lintOptions {
         disable 'InvalidPackage'
     }
 
+    namespace 'com.cakewallet.cake_wallet'
+
     defaultConfig {
         applicationId appProperties['id']
         minSdkVersion 24
@@ -80,7 +83,7 @@ android {
        }
    }
 
-    ndkVersion "25.1.8937393"
+    ndkVersion "27.0.12077973"
 }
 
 flutter {
diff --git a/android/build.gradle b/android/build.gradle
index 7ddb75179..66de0bdca 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.8.21'
+    ext.kotlin_version = '2.0.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/android/gradle.properties b/android/gradle.properties
index 66dd09454..d130e538a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx3072M
+org.gradle.jvmargs=-Xmx4096M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 733c691d3..0cc4e42b9 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
diff --git a/assets/bitcoin_electrum_server_list.yml b/assets/bitcoin_electrum_server_list.yml
index 20a28cd24..83da6a0b2 100644
--- a/assets/bitcoin_electrum_server_list.yml
+++ b/assets/bitcoin_electrum_server_list.yml
@@ -1,6 +1,3 @@
--
-  uri: electrum.cakewallet.com:50002
-  useSSL: true
 -
   uri: btc-electrum.cakewallet.com:50002
   useSSL: true
diff --git a/assets/node_list.yml b/assets/node_list.yml
index 6191129b3..49cc00a94 100644
--- a/assets/node_list.yml
+++ b/assets/node_list.yml
@@ -2,6 +2,7 @@
   uri: xmr-node.cakewallet.com:18081
   is_default: true
   trusted: true
+  useSSL: true
 -
   uri: cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081
   is_default: false
diff --git a/build-guide-linux.md b/build-guide-linux.md
index 55264fbfa..99c2ed0c8 100644
--- a/build-guide-linux.md
+++ b/build-guide-linux.md
@@ -120,7 +120,7 @@ Install Flutter package dependencies with this command:
 
 Your CakeWallet binary will be built with some specific keys for iterate with 3rd party services. You may generate these secret keys placeholders with the following command:
 
-`$ flutter packages pub run tool/generate_new_secrets.dart`
+`$ dart run tool/generate_new_secrets.dart`
 
 We will generate mobx models for the project.
 
@@ -128,7 +128,7 @@ We will generate mobx models for the project.
 
 Then we need to generate localization files.
 
-`$ flutter packages pub run tool/generate_localization.dart`
+`$ dart run tool/generate_localization.dart`
 
 ### 5. Build!
 
diff --git a/configure_cake_wallet.sh b/configure_cake_wallet.sh
index 90ce1c446..a083ec7ff 100755
--- a/configure_cake_wallet.sh
+++ b/configure_cake_wallet.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x -e
 IOS="ios"
 ANDROID="android"
 MACOS="macos"
@@ -36,6 +36,6 @@ fi
 source ./app_env.sh cakewallet
 ./app_config.sh
 cd ../.. && flutter pub get
-flutter packages pub run tool/generate_localization.dart
-./model_generator.sh
+dart run tool/generate_localization.dart
+#./model_generator.sh
 #cd macos && pod install
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index e58fad00f..17ced5adf 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -486,10 +486,11 @@ abstract class ElectrumWalletBase
 
   @action
   Future<void> updateFeeRates() async {
-    if (await checkIfMempoolAPIIsEnabled()) {
+    if (await checkIfMempoolAPIIsEnabled() && type == WalletType.bitcoin) {
       try {
-        final response =
-            await http.get(Uri.parse("http://mempool.cakewallet.com:8999/api/v1/fees/recommended"));
+        final response = await http
+            .get(Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended"))
+            .timeout(Duration(seconds: 5));
 
         final result = json.decode(response.body) as Map<String, dynamic>;
         final slowFee = (result['economyFee'] as num?)?.toInt() ?? 0;
@@ -1502,14 +1503,21 @@ abstract class ElectrumWalletBase
     final bundle = await getTransactionExpanded(hash: txId);
     final outputs = bundle.originalTransaction.outputs;
 
-    final changeAddresses = walletAddresses.allAddresses.where((element) => element.isHidden);
+    final ownAddresses = walletAddresses.allAddresses.map((addr) => addr.address).toSet();
 
-    // look for a change address in the outputs
-    final changeOutput = outputs.firstWhereOrNull((output) => changeAddresses.any(
-        (element) => element.address == addressFromOutputScript(output.scriptPubKey, network)));
+    final receiverAmount = outputs
+        .where((output) => !ownAddresses.contains(addressFromOutputScript(output.scriptPubKey, network)))
+        .fold<int>(0, (sum, output) => sum + output.amount.toInt());
 
-    var allInputsAmount = 0;
+    if (receiverAmount == 0) {
+      throw Exception("Receiver output not found.");
+    }
 
+    final availableInputs = unspentCoins.where((utxo) => utxo.isSending && !utxo.isFrozen).toList();
+    int totalBalance = availableInputs.fold<int>(
+        0, (previousValue, element) => previousValue + element.value.toInt());
+
+    int allInputsAmount = 0;
     for (int i = 0; i < bundle.originalTransaction.inputs.length; i++) {
       final input = bundle.originalTransaction.inputs[i];
       final inputTransaction = bundle.ins[i];
@@ -1520,12 +1528,10 @@ abstract class ElectrumWalletBase
 
     int totalOutAmount = bundle.originalTransaction.outputs
         .fold<int>(0, (previousValue, element) => previousValue + element.amount.toInt());
-
     var currentFee = allInputsAmount - totalOutAmount;
 
     int remainingFee = (newFee - currentFee > 0) ? newFee - currentFee : newFee;
-
-    return changeOutput != null && changeOutput.amount.toInt() - remainingFee >= 0;
+    return totalBalance - receiverAmount - remainingFee >= _dustAmount;
   }
 
   Future<PendingBitcoinTransaction> replaceByFee(String hash, int newFee) async {
@@ -1533,12 +1539,13 @@ abstract class ElectrumWalletBase
       final bundle = await getTransactionExpanded(hash: hash);
 
       final utxos = <UtxoWithAddress>[];
+      final outputs = <BitcoinOutput>[];
       List<ECPrivate> privateKeys = [];
 
       var allInputsAmount = 0;
       String? memo;
 
-      // Add inputs
+      // Add original inputs
       for (var i = 0; i < bundle.originalTransaction.inputs.length; i++) {
         final input = bundle.originalTransaction.inputs[i];
         final inputTransaction = bundle.ins[i];
@@ -1548,8 +1555,7 @@ abstract class ElectrumWalletBase
         allInputsAmount += outTransaction.amount.toInt();
 
         final addressRecord =
-            walletAddresses.allAddresses.firstWhere((element) => element.address == address);
-
+        walletAddresses.allAddresses.firstWhere((element) => element.address == address);
         final btcAddress = RegexUtils.addressTypeFromStr(addressRecord.address, network);
         final privkey = generateECPrivate(
             hd: addressRecord.isHidden ? walletAddresses.sideHd : walletAddresses.mainHd,
@@ -1567,15 +1573,13 @@ abstract class ElectrumWalletBase
               scriptType: _getScriptType(btcAddress),
             ),
             ownerDetails:
-                UtxoAddressDetails(publicKey: privkey.getPublic().toHex(), address: btcAddress),
+            UtxoAddressDetails(publicKey: privkey.getPublic().toHex(), address: btcAddress),
           ),
         );
       }
 
-      // Create a list of available outputs
-      final outputs = <BitcoinOutput>[];
+      // Add original outputs
       for (final out in bundle.originalTransaction.outputs) {
-        // Check if the script contains OP_RETURN
         final script = out.scriptPubKey.script;
         if (script.contains('OP_RETURN') && memo == null) {
           final index = script.indexOf('OP_RETURN');
@@ -1597,7 +1601,7 @@ abstract class ElectrumWalletBase
 
       // Calculate the total amount and fees
       int totalOutAmount =
-          outputs.fold<int>(0, (previousValue, output) => previousValue + output.value.toInt());
+      outputs.fold<int>(0, (previousValue, output) => previousValue + output.value.toInt());
       int currentFee = allInputsAmount - totalOutAmount;
       int remainingFee = newFee - currentFee;
 
@@ -1605,17 +1609,95 @@ abstract class ElectrumWalletBase
         throw Exception("New fee must be higher than the current fee.");
       }
 
-      // Deduct Remaining Fee from Main Outputs
+      // Deduct fee from change outputs first, if possible
       if (remainingFee > 0) {
+        final changeAddresses = walletAddresses.allAddresses.where((element) => element.isHidden);
         for (int i = outputs.length - 1; i >= 0; i--) {
-          int outputAmount = outputs[i].value.toInt();
+          final output = outputs[i];
+          final isChange = changeAddresses
+              .any((element) => element.address == output.address.toAddress(network));
+
+          if (isChange) {
+            int outputAmount = output.value.toInt();
+            if (outputAmount > _dustAmount) {
+              int deduction = (outputAmount - _dustAmount >= remainingFee)
+                  ? remainingFee
+                  : outputAmount - _dustAmount;
+              outputs[i] = BitcoinOutput(
+                  address: output.address, value: BigInt.from(outputAmount - deduction));
+              remainingFee -= deduction;
+
+              if (remainingFee <= 0) break;
+            }
+          }
+        }
+      }
+
+      // If still not enough, add UTXOs until the fee is covered
+      if (remainingFee > 0) {
+        final unusedUtxos = unspentCoins
+            .where((utxo) => utxo.isSending && !utxo.isFrozen && utxo.confirmations! > 0)
+            .toList();
+
+        for (final utxo in unusedUtxos) {
+          final address = RegexUtils.addressTypeFromStr(utxo.address, network);
+          final privkey = generateECPrivate(
+            hd: utxo.bitcoinAddressRecord.isHidden
+                ? walletAddresses.sideHd
+                : walletAddresses.mainHd,
+            index: utxo.bitcoinAddressRecord.index,
+            network: network,
+          );
+          privateKeys.add(privkey);
+
+          utxos.add(UtxoWithAddress(
+            utxo: BitcoinUtxo(
+                txHash: utxo.hash,
+                value: BigInt.from(utxo.value),
+                vout: utxo.vout,
+                scriptType: _getScriptType(address)),
+            ownerDetails:
+            UtxoAddressDetails(publicKey: privkey.getPublic().toHex(), address: address),
+          ));
+
+          allInputsAmount += utxo.value;
+          remainingFee -= utxo.value;
+
+          if (remainingFee < 0) {
+            final changeOutput = outputs.firstWhereOrNull((output) => walletAddresses.allAddresses
+                .any((addr) => addr.address == output.address.toAddress(network)));
+            if (changeOutput != null) {
+              final newValue = changeOutput.value.toInt() + (-remainingFee);
+              outputs[outputs.indexOf(changeOutput)] =
+                  BitcoinOutput(address: changeOutput.address, value: BigInt.from(newValue));
+            } else {
+              final changeAddress = await walletAddresses.getChangeAddress();
+              outputs.add(BitcoinOutput(
+                  address: RegexUtils.addressTypeFromStr(changeAddress.address, network),
+                  value: BigInt.from(-remainingFee)));
+            }
+
+            remainingFee = 0;
+            break;
+          }
+
+          if (remainingFee <= 0) break;
+        }
+      }
+
+      // Deduct from the receiver's output if remaining fee is still greater than 0
+      if (remainingFee > 0) {
+        for (int i = 0; i < outputs.length; i++) {
+          final output = outputs[i];
+          int outputAmount = output.value.toInt();
 
           if (outputAmount > _dustAmount) {
             int deduction = (outputAmount - _dustAmount >= remainingFee)
                 ? remainingFee
                 : outputAmount - _dustAmount;
+
             outputs[i] = BitcoinOutput(
-                address: outputs[i].address, value: BigInt.from(outputAmount - deduction));
+                address: output.address, value: BigInt.from(outputAmount - deduction));
             remainingFee -= deduction;
 
             if (remainingFee <= 0) break;
@@ -1632,11 +1714,11 @@ abstract class ElectrumWalletBase
       final changeAddresses = walletAddresses.allAddresses.where((element) => element.isHidden);
       final List<BitcoinOutput> changeOutputs = outputs
           .where((output) => changeAddresses
-              .any((element) => element.address == output.address.toAddress(network)))
+          .any((element) => element.address == output.address.toAddress(network)))
           .toList();
 
       int totalChangeAmount =
-          changeOutputs.fold<int>(0, (sum, output) => sum + output.value.toInt());
+      changeOutputs.fold<int>(0, (sum, output) => sum + output.value.toInt());
 
       // The final amount that the receiver will receive
       int sendingAmount = allInputsAmount - newFee - totalChangeAmount;
@@ -1653,8 +1735,7 @@ abstract class ElectrumWalletBase
 
       final transaction = txb.buildTransaction((txDigest, utxo, publicKey, sighash) {
         final key =
-            privateKeys.firstWhereOrNull((element) => element.getPublic().toHex() == publicKey);
-
+        privateKeys.firstWhereOrNull((element) => element.getPublic().toHex() == publicKey);
         if (key == null) {
           throw Exception("Cannot find private key");
         }
@@ -1664,6 +1745,7 @@ abstract class ElectrumWalletBase
         } else {
           return key.signInput(txDigest, sigHash: sighash);
         }
+
       });
 
       return PendingBitcoinTransaction(
@@ -1676,16 +1758,16 @@ abstract class ElectrumWalletBase
         hasChange: changeOutputs.isNotEmpty,
         feeRate: newFee.toString(),
       )..addListener((transaction) async {
-          transactionHistory.transactions.values.forEach((tx) {
-            if (tx.id == hash) {
-              tx.isReplaced = true;
-              tx.isPending = false;
-              transactionHistory.addOne(tx);
-            }
-          });
-          transactionHistory.addOne(transaction);
-          await updateBalance();
+        transactionHistory.transactions.values.forEach((tx) {
+          if (tx.id == hash) {
+            tx.isReplaced = true;
+            tx.isPending = false;
+            transactionHistory.addOne(tx);
+          }
         });
+        transactionHistory.addOne(transaction);
+        await updateBalance();
+      });
     } catch (e) {
       throw e;
     }
@@ -1706,7 +1788,7 @@ abstract class ElectrumWalletBase
         try {
           final blockHash = await http.get(
             Uri.parse(
-              "http://mempool.cakewallet.com:8999/api/v1/block-height/$height",
+              "https://mempool.cakewallet.com/api/v1/block-height/$height",
             ),
           );
 
@@ -1715,7 +1797,7 @@ abstract class ElectrumWalletBase
               jsonDecode(blockHash.body) != null) {
             final blockResponse = await http.get(
               Uri.parse(
-                "http://mempool.cakewallet.com:8999/api/v1/block/${blockHash.body}",
+                "https://mempool.cakewallet.com/api/v1/block/${blockHash.body}",
               ),
             );
             if (blockResponse.statusCode == 200 &&
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index c8a83f90c..aa9f3ba05 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -145,10 +145,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: "direct dev"
     description:
@@ -161,10 +161,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
@@ -250,18 +250,18 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cryptography:
     dependency: "direct main"
     description:
@@ -360,10 +360,10 @@ packages:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -431,10 +431,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   grpc:
     dependency: "direct main"
     description:
@@ -503,10 +503,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -535,26 +535,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   ledger_bitcoin:
     dependency: "direct main"
     description:
@@ -577,7 +577,7 @@ packages:
     description:
       path: "packages/ledger-litecoin"
       ref: HEAD
-      resolved-ref: "07cd61ef76a2a017b6d5ef233396740163265457"
+      resolved-ref: "3dee36713e6ebec9dceb59b9ccae7f243a53ea9e"
       url: "https://github.com/cake-tech/ledger-flutter-plus-plugins"
     source: git
     version: "0.0.2"
@@ -593,10 +593,10 @@ packages:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -609,26 +609,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
@@ -681,10 +681,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -729,10 +729,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -809,18 +809,18 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.3.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -849,10 +849,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "59dc807b94d29d52ddbb1b3c0d3b9d0a67fc535a64e62a5542c8db0513fcb6c2"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -873,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -967,10 +967,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -991,10 +991,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   universal_ble:
     dependency: transitive
     description:
@@ -1031,10 +1031,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -1047,18 +1047,26 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -1092,5 +1100,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml
index bff6104ac..522199c82 100644
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   http: ^1.1.0
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
-  intl: ^0.18.0
+  intl: ^0.19.0
   shared_preferences: ^2.0.15
   cw_core:
     path: ../cw_core
diff --git a/cw_core/lib/get_height_by_date.dart b/cw_core/lib/get_height_by_date.dart
index 2b0b77a89..7929d7cbd 100644
--- a/cw_core/lib/get_height_by_date.dart
+++ b/cw_core/lib/get_height_by_date.dart
@@ -270,7 +270,7 @@ const bitcoinDates = {
 Future<int> getBitcoinHeightByDateAPI({required DateTime date}) async {
   final response = await http.get(
     Uri.parse(
-      "http://mempool.cakewallet.com:8999/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}",
+      "https://mempool.cakewallet.com/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}",
     ),
   );
 
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index 1094b6402..18d2ffc44 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -203,9 +203,30 @@ class Node extends HiveObject with Keyable {
         headers: {'Content-Type': 'application/json'},
         body: json.encode(body),
       );
-
       client.close();
 
+      if ((
+        response.body.contains("400 Bad Request") // Some other generic error
+        || response.body.contains("plain HTTP request was sent to HTTPS port") // Cloudflare
+        || response.headers["location"] != null // Generic reverse proxy
+        || response.body.contains("301 Moved Permanently") // Poorly configured generic reverse proxy
+      ) && !(useSSL??false)
+      ) {
+
+        final oldUseSSL = useSSL;
+        useSSL = true;
+        try {
+          final ret = await requestMoneroNode();
+          if (ret == true) {
+            await save();
+            return ret;
+          }
+          useSSL = oldUseSSL;
+        } catch (e) {
+          useSSL = oldUseSSL;
+        }
+      }
+
       final resBody = json.decode(response.body) as Map<String, dynamic>;
       return !(resBody['result']['offline'] as bool);
     } catch (_) {
diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock
index c2bdda5f1..44ef15a41 100644
--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@@ -5,34 +5,39 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "64.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.7.0"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: "21afe4333076c02877d14f4a89df111e658a6d466cbfc802eb705eb91bd5adfd"
+      sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.5"
   async:
     dependency: transitive
     description:
@@ -69,10 +74,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: "direct dev"
     description:
@@ -85,18 +90,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.8"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.11"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -109,10 +114,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.8.1"
+    version: "8.9.2"
   cake_backup:
     dependency: "direct main"
     description:
@@ -166,42 +171,42 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cryptography:
     dependency: transitive
     description:
       name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   cupertino_icons:
     dependency: transitive
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368"
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.4"
+    version: "2.3.7"
   encrypt:
     dependency: "direct main"
     description:
@@ -222,26 +227,26 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.3"
   file:
     dependency: "direct main"
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -251,10 +256,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_mobx
-      sha256: "4a5d062ff85ed3759f4aac6410ff0ffae32e324b2e71ca722ae1b37b32e865f4"
+      sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0+2"
+    version: "2.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -264,10 +269,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -280,10 +285,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   hive:
     dependency: transitive
     description:
@@ -304,10 +309,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -328,10 +333,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -352,42 +357,50 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -400,42 +413,42 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
       name: mobx
-      sha256: "74ee54012dc7c1b3276eaa960a600a7418ef5f9997565deb8fca1fd88fb36b78"
+      sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0+1"
+    version: "2.3.3+2"
   mobx_codegen:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: b26c7f9c20b38f0ea572c1ed3f29d8e027cb265538bbd1aed3ec198642cfca42
+      sha256: "8e0d8653a0c720ad933cd8358f6f89f740ce89203657c13f25bea772ef1fff7c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0+1"
+    version: "2.6.1"
   nested:
     dependency: transitive
     description:
@@ -464,26 +477,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -504,18 +517,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -528,10 +541,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.4"
+    version: "3.9.1"
   pool:
     dependency: transitive
     description:
@@ -544,10 +557,10 @@ packages:
     dependency: transitive
     description:
       name: provider
-      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
@@ -560,10 +573,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   shelf:
     dependency: transitive
     description:
@@ -576,10 +589,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -589,10 +602,10 @@ packages:
     dependency: "direct main"
     description:
       name: socks5_proxy
-      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -661,10 +674,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -685,10 +698,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   unorm_dart:
     dependency: "direct main"
     description:
@@ -709,10 +722,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -721,30 +734,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.9"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
@@ -754,5 +775,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0-0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_core/pubspec.yaml b/cw_core/pubspec.yaml
index 6e32c2ba1..19eda51e0 100644
--- a/cw_core/pubspec.yaml
+++ b/cw_core/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path_provider: ^2.0.11
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
-  intl: ^0.18.0
+  intl: ^0.19.0
   encrypt: ^5.0.1
   cake_backup:
     git:
diff --git a/cw_haven/android/build.gradle b/cw_haven/android/build.gradle
index d29c31d4e..8eb728a67 100644
--- a/cw_haven/android/build.gradle
+++ b/cw_haven/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.cakewallet.cw_haven'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '2.0.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,8 +25,20 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
 
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.cakewallet.cw_haven'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
diff --git a/cw_haven/pubspec.lock b/cw_haven/pubspec.lock
index 1369675f5..cb5d3e2c3 100644
--- a/cw_haven/pubspec.lock
+++ b/cw_haven/pubspec.lock
@@ -21,18 +21,18 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: ab96a1cb3beeccf8145c52e449233fe68364c9641623acd3adad66f8184f1039
+      sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.5"
   async:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.2"
   build_resolvers:
     dependency: "direct dev"
     description:
@@ -85,18 +85,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.7"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.3"
+    version: "8.9.2"
   cake_backup:
     dependency: transitive
     description:
@@ -134,10 +134,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   clock:
     dependency: transitive
     description:
@@ -150,10 +150,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
@@ -166,34 +166,34 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.6"
   cryptography:
     dependency: transitive
     description:
       name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   cupertino_icons:
     dependency: transitive
     description:
       name: cupertino_icons
-      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.8"
   cw_core:
     dependency: "direct main"
     description:
@@ -213,10 +213,10 @@ packages:
     dependency: transitive
     description:
       name: encrypt
-      sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -229,26 +229,26 @@ packages:
     dependency: "direct main"
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -258,10 +258,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_mobx
-      sha256: "0da4add0016387a7bf309a0d0c41d36c6b3ae25ed7a176409267f166509e723e"
+      sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6+5"
+    version: "2.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -271,10 +271,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -287,10 +287,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.2"
   hive:
     dependency: transitive
     description:
@@ -311,10 +311,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -335,10 +335,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -359,42 +359,42 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -407,42 +407,50 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
       name: mobx
-      sha256: f1862bd92c6a903fab67338f27e2f731117c3cb9ea37cee1a487f9e4e0de314a
+      sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3+1"
+    version: "2.3.3+2"
   mobx_codegen:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: "86122e410d8ea24dda0c69adb5c2a6ccadd5ce02ad46e144764e0d0184a06181"
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.0"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   package_config:
     dependency: transitive
     description:
@@ -463,26 +471,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -495,42 +503,42 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.8"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.2"
+    version: "3.9.1"
   pool:
     dependency: transitive
     description:
@@ -539,38 +547,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  provider:
+    dependency: transitive
+    description:
+      name: provider
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -580,10 +596,10 @@ packages:
     dependency: transitive
     description:
       name: socks5_proxy
-      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -652,10 +668,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -676,10 +692,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   unorm_dart:
     dependency: transitive
     description:
@@ -700,10 +716,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -712,38 +728,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.2.0-0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_haven/pubspec.yaml b/cw_haven/pubspec.yaml
index d868c986d..452fed93a 100644
--- a/cw_haven/pubspec.yaml
+++ b/cw_haven/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path_provider: ^2.0.11
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
-  intl: ^0.18.0
+  intl: ^0.19.0
   cw_core:
     path: ../cw_core
 
diff --git a/cw_monero/lib/api/coins_info.dart b/cw_monero/lib/api/coins_info.dart
index c1b634cc6..ef7d3cfd6 100644
--- a/cw_monero/lib/api/coins_info.dart
+++ b/cw_monero/lib/api/coins_info.dart
@@ -12,6 +12,18 @@ int countOfCoins() => monero.Coins_count(coins!);
 
 monero.CoinsInfo getCoin(int index) => monero.Coins_coin(coins!, index);
 
+int? getCoinByKeyImage(String keyImage) {
+  final count = countOfCoins();
+  for (int i = 0; i < count; i++) {
+    final coin = getCoin(i);
+    final coinAddress = monero.CoinsInfo_keyImage(coin);
+    if (keyImage == coinAddress) {
+      return i;
+    }
+  }
+  return null;
+}
+
 void freezeCoin(int index) => monero.Coins_setFrozen(coins!, index: index);
 
 void thawCoin(int index) => monero.Coins_thaw(coins!, index: index);
diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
index 7748a16af..7c253509c 100644
--- a/cw_monero/lib/api/transaction_history.dart
+++ b/cw_monero/lib/api/transaction_history.dart
@@ -6,6 +6,7 @@ import 'package:cw_monero/api/exceptions/creation_transaction_exception.dart';
 import 'package:cw_monero/api/monero_output.dart';
 import 'package:cw_monero/api/structs/pending_transaction.dart';
 import 'package:cw_monero/api/wallet.dart';
+import 'package:cw_monero/exceptions/monero_transaction_creation_exception.dart';
 import 'package:ffi/ffi.dart';
 import 'package:monero/monero.dart' as monero;
 import 'package:monero/src/generated_bindings_monero.g.dart' as monero_gen;
@@ -17,7 +18,7 @@ String getTxKey(String txId) {
   final status = monero.Wallet_status(wptr!);
   if (status != 0) {
     final error = monero.Wallet_errorString(wptr!);
-    return txId+"_"+error;
+    return "";
   }
   return txKey;
 }
@@ -91,12 +92,23 @@ Future<PendingTransactionDescription> createTransactionSync(
     List<String> preferredInputs = const []}) async {
 
   final amt = amount == null ? 0 : monero.Wallet_amountFromString(amount);
-  
-  final address_ = address.toNativeUtf8(); 
-  final paymentId_ = paymentId.toNativeUtf8(); 
-  final preferredInputs_ = preferredInputs.join(monero.defaultSeparatorStr).toNativeUtf8();
 
   final waddr = wptr!.address;
+
+  // force reconnection in case the os killed the connection?
+  // fixes failed to get block height error.
+  Isolate.run(() async {
+    monero.Wallet_synchronized(Pointer.fromAddress(waddr));
+  });
+
+  final address_ = address.toNativeUtf8(); 
+  final paymentId_ = paymentId.toNativeUtf8();
+  if (preferredInputs.isEmpty) {
+    throw MoneroTransactionCreationException("No inputs provided, transaction cannot be constructed");
+  }
+
+  final preferredInputs_ = preferredInputs.join(monero.defaultSeparatorStr).toNativeUtf8();
+
   final addraddr = address_.address;
   final paymentIdAddr = paymentId_.address;
   final preferredInputsAddr = preferredInputs_.address;
@@ -192,14 +204,23 @@ String? commitTransaction({required monero.PendingTransaction transactionPointer
     ? monero.PendingTransaction_commitUR(transactionPointer, 120)
     : monero.PendingTransaction_commit(transactionPointer, filename: '', overwrite: false);
 
-  final String? error = (() {
+  String? error = (() {
     final status = monero.PendingTransaction_status(transactionPointer.cast());
     if (status == 0) {
       return null;
     }
-    return monero.Wallet_errorString(wptr!);
+    return monero.PendingTransaction_errorString(transactionPointer.cast());
   })();
+  if (error == null) {
+    error = (() {
+      final status = monero.Wallet_status(wptr!);
+      if (status == 0) {
+        return null;
+      }
+      return monero.Wallet_errorString(wptr!);
+    })();
   
+  }
   if (error != null) {
     throw CreationTransactionException(message: error);
   }
@@ -348,16 +369,7 @@ class Transaction {
         confirmations = monero.TransactionInfo_confirmations(txInfo),
         fee = monero.TransactionInfo_fee(txInfo),
         description = monero.TransactionInfo_description(txInfo),
-        key = getTxKey(txInfo);
-
-  static String getTxKey(monero.TransactionInfo txInfo) {
-    final txKey = monero.Wallet_getTxKey(wptr!, txid: monero.TransactionInfo_hash(txInfo));
-    final status = monero.Wallet_status(wptr!);
-    if (status != 0) {
-      return "";
-    }
-    return txKey;
-  }
+        key = getTxKey(monero.TransactionInfo_hash(txInfo));
 
   Transaction.dummy({
     required this.displayLabel,
diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart
index 928fd7ef1..667a1ff69 100644
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@@ -4,6 +4,7 @@ import 'dart:isolate';
 
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart';
+import 'package:flutter/foundation.dart';
 import 'package:monero/monero.dart' as monero;
 import 'package:mutex/mutex.dart';
 
@@ -129,6 +130,15 @@ Future<bool> setupNodeSync(
     throw SetupWalletException(message: error);
   }
 
+  if (kDebugMode) {
+    monero.Wallet_init3(
+      wptr!, argv0: '',
+      defaultLogBaseName: 'moneroc',
+      console: true,
+      logPath: '',
+    );
+  }
+
   return status == 0;
 }
 
@@ -150,14 +160,15 @@ final storeMutex = Mutex();
 
 int lastStorePointer = 0;
 int lastStoreHeight = 0;
-void storeSync() async {
+void storeSync({bool force = false}) async {
   final addr = wptr!.address;
   final synchronized = await Isolate.run(() {
     return monero.Wallet_synchronized(Pointer.fromAddress(addr));
   });
   if (lastStorePointer == wptr!.address &&
       lastStoreHeight + 5000 > monero.Wallet_blockChainHeight(wptr!) &&
-      !synchronized) {
+      !synchronized && 
+      !force) {
     return;
   }
   lastStorePointer = wptr!.address;
diff --git a/cw_monero/lib/api/wallet_manager.dart b/cw_monero/lib/api/wallet_manager.dart
index 7f9dbd8fa..d10f7e25a 100644
--- a/cw_monero/lib/api/wallet_manager.dart
+++ b/cw_monero/lib/api/wallet_manager.dart
@@ -286,8 +286,18 @@ Future<void> loadWallet(
     /// 0: Software Wallet
     /// 1: Ledger
     /// 2: Trezor
-    final deviceType = monero.WalletManager_queryWalletDevice(wmPtr,
-        keysFileName: "$path.keys", password: password, kdfRounds: 1);
+    late final deviceType;
+
+    if (Platform.isAndroid || Platform.isIOS) {
+      deviceType = monero.WalletManager_queryWalletDevice(
+        wmPtr,
+        keysFileName: "$path.keys",
+        password: password,
+        kdfRounds: 1,
+      );
+    } else {
+      deviceType = 0;
+    }
 
     if (deviceType == 1) {
       final dummyWPtr = wptr ??
diff --git a/cw_monero/lib/monero_unspent.dart b/cw_monero/lib/monero_unspent.dart
index 87d8f0b39..f45fcddaf 100644
--- a/cw_monero/lib/monero_unspent.dart
+++ b/cw_monero/lib/monero_unspent.dart
@@ -1,10 +1,32 @@
 import 'package:cw_core/unspent_transaction_output.dart';
+import 'package:cw_monero/api/coins_info.dart';
+import 'package:monero/monero.dart' as monero;
 
 class MoneroUnspent extends Unspent {
   MoneroUnspent(
       String address, String hash, String keyImage, int value, bool isFrozen, this.isUnlocked)
       : super(address, hash, value, 0, keyImage) {
-    this.isFrozen = isFrozen;
+  }
+
+  @override
+  set isFrozen(bool freeze) {
+    print("set isFrozen: $freeze ($keyImage): $freeze");
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    if (freeze) {
+      freezeCoin(coinId);
+    } else {
+      thawCoin(coinId);
+    }
+  }
+
+  @override
+  bool get isFrozen {
+    print("get isFrozen");
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    final coin = getCoin(coinId);
+    return monero.CoinsInfo_frozen(coin);
   }
 
   final bool isUnlocked;
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 5f53b30ba..2b302e745 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -309,9 +309,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
             'You do not have enough XMR to send this amount.');
       }
 
-      if (!spendAllCoins && (allInputsAmount < totalAmount + estimatedFee)) {
-        throw MoneroTransactionNoInputsException(inputs.length);
-      }
+      if (inputs.isEmpty) MoneroTransactionCreationException(
+        'No inputs selected');
 
       final moneroOutputs = outputs.map((output) {
         final outputAddress =
@@ -337,23 +336,18 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       final formattedAmount =
           output.sendAll ? null : output.formattedCryptoAmount;
 
-      if ((formattedAmount != null && unlockedBalance < formattedAmount) ||
-          (formattedAmount == null && unlockedBalance <= 0)) {
-        final formattedBalance = moneroAmountToString(amount: unlockedBalance);
-
-        throw MoneroTransactionCreationException(
-            'You do not have enough unlocked balance. Unlocked: $formattedBalance. Transaction amount: ${output.cryptoAmount}.');
-      }
+      // if ((formattedAmount != null && unlockedBalance < formattedAmount) ||
+      //     (formattedAmount == null && unlockedBalance <= 0)) {
+      //   final formattedBalance = moneroAmountToString(amount: unlockedBalance);
+      //
+      //   throw MoneroTransactionCreationException(
+      //       'You do not have enough unlocked balance. Unlocked: $formattedBalance. Transaction amount: ${output.cryptoAmount}.');
+      // }
 
       final estimatedFee =
           calculateEstimatedFee(_credentials.priority, formattedAmount);
-      if (!spendAllCoins &&
-          ((formattedAmount != null &&
-                  allInputsAmount < (formattedAmount + estimatedFee)) ||
-              formattedAmount == null)) {
-        throw MoneroTransactionNoInputsException(inputs.length);
-      }
-
+      if (inputs.isEmpty) MoneroTransactionCreationException(
+        'No inputs selected');
       pendingTransactionDescription =
           await transaction_history.createTransaction(
               address: address!,
@@ -363,6 +357,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
               preferredInputs: inputs);
     }
 
+    // final status = monero.PendingTransaction_status(pendingTransactionDescription);
+
     return PendingMoneroTransaction(pendingTransactionDescription);
   }
 
@@ -515,7 +511,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       for (var i = 0; i < coinCount; i++) {
         final coin = getCoin(i);
         final coinSpent = monero.CoinsInfo_spent(coin);
-        if (coinSpent == false) {
+        if (coinSpent == false && monero.CoinsInfo_subaddrAccount(coin) == walletAddresses.account!.id) {
           final unspent = MoneroUnspent(
             monero.CoinsInfo_address(coin),
             monero.CoinsInfo_hash(coin),
@@ -729,9 +725,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
   void _askForUpdateBalance() {
     final unlockedBalance = _getUnlockedBalance();
-    final fullBalance = _getFullBalance();
-    final frozenBalance = _getFrozenBalance();
-
+    final fullBalance = _getUnlockedBalance() + _getFrozenBalance();
+    final frozenBalance = 0; // this is calculated on the monero side now
     if (balance[currency]!.fullBalance != fullBalance ||
         balance[currency]!.unlockedBalance != unlockedBalance ||
         balance[currency]!.frozenBalance != frozenBalance) {
@@ -757,9 +752,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     for (var coin in unspentCoinsInfo.values.where((element) =>
         element.walletId == id &&
         element.accountIndex == walletAddresses.account!.id)) {
-      if (coin.isFrozen) frozenBalance += coin.value;
+      if (coin.isFrozen && !coin.isSending) frozenBalance += coin.value;
     }
-
     return frozenBalance;
   }
 
diff --git a/cw_monero/lib/pending_monero_transaction.dart b/cw_monero/lib/pending_monero_transaction.dart
index eb714eeb3..1c01a60dc 100644
--- a/cw_monero/lib/pending_monero_transaction.dart
+++ b/cw_monero/lib/pending_monero_transaction.dart
@@ -6,6 +6,7 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/amount_converter.dart';
 
 import 'package:cw_core/pending_transaction.dart';
+import 'package:cw_monero/api/wallet.dart';
 
 class DoubleSpendException implements Exception {
   DoubleSpendException();
@@ -53,6 +54,7 @@ class PendingMoneroTransaction with PendingTransaction {
 
       rethrow;
     }
+    storeSync(force: true);
   }
 
   @override
diff --git a/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
new file mode 120000
index 000000000..a2b4915e7
--- /dev/null
+++ b/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
@@ -0,0 +1 @@
+/Users/user/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
\ No newline at end of file
diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
index 30c304b89..1e9916e2b 100644
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: "direct dev"
     description:
@@ -93,10 +93,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
@@ -174,18 +174,18 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cryptography:
     dependency: transitive
     description:
@@ -253,18 +253,18 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -311,10 +311,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   hashlib:
     dependency: transitive
     description:
@@ -375,10 +375,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -407,26 +407,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   ledger_flutter_plus:
     dependency: "direct main"
     description:
@@ -447,10 +447,10 @@ packages:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -463,26 +463,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
@@ -552,10 +552,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -600,10 +600,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -680,10 +680,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -765,10 +765,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -789,10 +789,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   universal_ble:
     dependency: transitive
     description:
@@ -829,10 +829,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -845,18 +845,26 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
@@ -882,5 +890,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.19.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml
index c36b5edef..1070dba68 100644
--- a/cw_monero/pubspec.yaml
+++ b/cw_monero/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path_provider: ^2.0.11
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
-  intl: ^0.18.0
+  intl: ^0.19.0
   encrypt: ^5.0.1
   polyseed: ^0.0.6
   cw_core:
diff --git a/cw_mweb/android/build.gradle b/cw_mweb/android/build.gradle
index 7e67b98ad..0d17a47ec 100644
--- a/cw_mweb/android/build.gradle
+++ b/cw_mweb/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.cakewallet.mweb'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '2.0.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -33,15 +33,19 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.cakewallet.mweb'
+    }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
diff --git a/cw_mweb/android/settings.gradle b/cw_mweb/android/settings.gradle
index 88fbd66fb..4a0c212c0 100644
--- a/cw_mweb/android/settings.gradle
+++ b/cw_mweb/android/settings.gradle
@@ -1 +1,3 @@
 rootProject.name = 'cw_mweb'
+id "com.android.application" version "8.3.2" apply false
+id "org.jetbrains.kotlin.android" version "2.0.20" apply false
diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock
index dd955e344..f4d5c00f8 100644
--- a/cw_nano/pubspec.lock
+++ b/cw_nano/pubspec.lock
@@ -21,18 +21,18 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda"
+      sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.3"
+    version: "1.5.5"
   async:
     dependency: transitive
     description:
@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -93,10 +93,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
   build_runner_core:
     dependency: "direct overridden"
     description:
@@ -190,18 +190,18 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   cryptography:
     dependency: transitive
     description:
@@ -245,18 +245,18 @@ packages:
     dependency: "direct main"
     description:
       name: ed25519_hd_key
-      sha256: c5c9f11a03f5789bf9dcd9ae88d641571c802640851f1cacdb13123f171b3a26
+      sha256: "31e191ec97492873067e46dc9cc0c7d55170559c83a478400feffa0627acaccf"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   encrypt:
     dependency: transitive
     description:
       name: encrypt
-      sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -269,26 +269,26 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   fixnum_nanodart:
     dependency: transitive
     description:
@@ -306,10 +306,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_mobx
-      sha256: "0da4add0016387a7bf309a0d0c41d36c6b3ae25ed7a176409267f166509e723e"
+      sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6+5"
+    version: "2.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -324,10 +324,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -340,10 +340,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   hex:
     dependency: "direct main"
     description:
@@ -372,10 +372,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -396,10 +396,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -420,34 +420,34 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   libcrypto:
     dependency: "direct main"
     description:
@@ -460,10 +460,10 @@ packages:
     dependency: transitive
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -476,26 +476,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
@@ -529,6 +529,14 @@ packages:
       url: "https://github.com/perishllc/nanoutil.git"
     source: git
     version: "1.0.3"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   package_config:
     dependency: transitive
     description:
@@ -549,26 +557,26 @@ packages:
     dependency: transitive
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -581,34 +589,34 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   pinenacl:
     dependency: transitive
     description:
       name: pinenacl
-      sha256: "3a5503637587d635647c93ea9a8fecf48a420cc7deebe6f1fc85c2a5637ab327"
+      sha256: "57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -621,10 +629,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.9.1"
   pool:
     dependency: transitive
     description:
@@ -633,6 +641,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  provider:
+    dependency: transitive
+    description:
+      name: provider
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
@@ -645,50 +661,50 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   rational:
     dependency: transitive
     description:
       name: rational
-      sha256: ba58e9e18df9abde280e8b10051e4bce85091e41e8e7e411b6cde2e738d357cf
+      sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "671e7a931f55a08aa45be2a13fe7247f2a41237897df434b30d2012388191833"
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.3"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -701,18 +717,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.4.2"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -725,10 +741,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -738,10 +754,10 @@ packages:
     dependency: transitive
     description:
       name: socks5_proxy
-      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -810,10 +826,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -834,10 +850,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   unorm_dart:
     dependency: transitive
     description:
@@ -858,10 +874,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -870,30 +886,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.5.0"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
@@ -903,5 +927,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
-  flutter: ">=3.16.6"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_shared_external/android/build.gradle b/cw_shared_external/android/build.gradle
index 64b550364..8d2b1b13d 100644
--- a/cw_shared_external/android/build.gradle
+++ b/cw_shared_external/android/build.gradle
@@ -25,7 +25,20 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
+
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.cakewallet.cw_shared_external'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/cw_wownero/lib/api/transaction_history.dart b/cw_wownero/lib/api/transaction_history.dart
index 6b0923e83..ce93df7d1 100644
--- a/cw_wownero/lib/api/transaction_history.dart
+++ b/cw_wownero/lib/api/transaction_history.dart
@@ -6,13 +6,16 @@ import 'package:cw_wownero/api/exceptions/creation_transaction_exception.dart';
 import 'package:cw_wownero/api/wallet.dart';
 import 'package:cw_wownero/api/wownero_output.dart';
 import 'package:cw_wownero/api/structs/pending_transaction.dart';
+import 'package:cw_wownero/exceptions/wownero_transaction_creation_exception.dart';
 import 'package:ffi/ffi.dart';
 import 'package:monero/wownero.dart' as wownero;
 import 'package:monero/src/generated_bindings_wownero.g.dart' as wownero_gen;
 
 
 String getTxKey(String txId) {
-  return wownero.Wallet_getTxKey(wptr!, txid: txId);
+  final ret = wownero.Wallet_getTxKey(wptr!, txid: txId);
+  wownero.Wallet_status(wptr!);
+  return ret;
 }
 
 wownero.TransactionHistory? txhistory;
@@ -86,7 +89,10 @@ Future<PendingTransactionDescription> createTransactionSync(
   final amt = amount == null ? 0 : wownero.Wallet_amountFromString(amount);
   
   final address_ = address.toNativeUtf8(); 
-  final paymentId_ = paymentId.toNativeUtf8(); 
+  final paymentId_ = paymentId.toNativeUtf8();
+  if (preferredInputs.isEmpty) {
+    throw WowneroTransactionCreationException("No inputs provided, transaction cannot be constructed");
+  }
   final preferredInputs_ = preferredInputs.join(wownero.defaultSeparatorStr).toNativeUtf8();
 
   final waddr = wptr!.address;
diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
index 5367051c8..a2390b640 100644
--- a/cw_wownero/pubspec.lock
+++ b/cw_wownero/pubspec.lock
@@ -21,18 +21,18 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: ab96a1cb3beeccf8145c52e449233fe68364c9641623acd3adad66f8184f1039
+      sha256: "6b151826fcc95ff246cd219a0bf4c753ea14f4081ad71c61939becf3aba27f70"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.5"
   async:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.2"
   build_resolvers:
     dependency: "direct dev"
     description:
@@ -85,18 +85,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.7"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.3"
+    version: "8.9.2"
   cake_backup:
     dependency: transitive
     description:
@@ -134,10 +134,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   clock:
     dependency: transitive
     description:
@@ -150,10 +150,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
@@ -166,26 +166,26 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.6"
   cryptography:
     dependency: transitive
     description:
       name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   cupertino_icons:
     dependency: transitive
     description:
@@ -213,10 +213,10 @@ packages:
     dependency: "direct main"
     description:
       name: encrypt
-      sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -229,26 +229,26 @@ packages:
     dependency: "direct main"
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -258,10 +258,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_mobx
-      sha256: "0da4add0016387a7bf309a0d0c41d36c6b3ae25ed7a176409267f166509e723e"
+      sha256: "859fbf452fa9c2519d2700b125dd7fb14c508bbdd7fb65e26ca8ff6c92280e2e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6+5"
+    version: "2.2.1+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -271,10 +271,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -287,26 +287,26 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.2"
   hashlib:
     dependency: transitive
     description:
       name: hashlib
-      sha256: d41795742c10947930630118c6836608deeb9047cd05aee32d2baeb697afd66a
+      sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.2"
+    version: "1.21.0"
   hashlib_codecs:
     dependency: transitive
     description:
       name: hashlib_codecs
-      sha256: "2b570061f5a4b378425be28a576c1e11783450355ad4345a19f606ff3d96db0f"
+      sha256: "8cea9ccafcfeaa7324d2ae52c61c69f7ff71f4237507a018caab31b9e416e3b1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   hive:
     dependency: transitive
     description:
@@ -327,10 +327,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -351,10 +351,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -375,42 +375,42 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -423,42 +423,42 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
       name: mobx
-      sha256: f1862bd92c6a903fab67338f27e2f731117c3cb9ea37cee1a487f9e4e0de314a
+      sha256: "63920b27b32ad1910adfe767ab1750e4c212e8923232a1f891597b362074ea5e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3+1"
+    version: "2.3.3+2"
   mobx_codegen:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: "86122e410d8ea24dda0c69adb5c2a6ccadd5ce02ad46e144764e0d0184a06181"
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.0"
   monero:
     dependency: "direct main"
     description:
@@ -476,6 +476,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   package_config:
     dependency: transitive
     description:
@@ -496,26 +504,26 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -528,26 +536,26 @@ packages:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -560,10 +568,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.9.1"
   polyseed:
     dependency: "direct main"
     description:
@@ -580,38 +588,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  provider:
+    dependency: transitive
+    description:
+      name: provider
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -621,10 +637,10 @@ packages:
     dependency: transitive
     description:
       name: socks5_proxy
-      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -693,10 +709,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -717,10 +733,10 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   unorm_dart:
     dependency: transitive
     description:
@@ -741,10 +757,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.5"
   watcher:
     dependency: "direct overridden"
     description:
@@ -753,38 +769,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
+    version: "3.0.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.2.0-0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
index 2549d59e0..c5bc3a0ba 100644
--- a/cw_wownero/pubspec.yaml
+++ b/cw_wownero/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
   path_provider: ^2.0.11
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
-  intl: ^0.18.0
+  intl: ^0.19.0
   encrypt: ^5.0.1
   polyseed: ^0.0.6
   cw_core:
diff --git a/how_to_add_new_wallet_type.md b/how_to_add_new_wallet_type.md
index d71e181e0..74350e5d8 100644
--- a/how_to_add_new_wallet_type.md
+++ b/how_to_add_new_wallet_type.md
@@ -23,7 +23,7 @@
 
 - Add the code to run the code generation needed for the files in the `cw_walletx` package to the `model_generator.sh` script
 
-		 cd cw_walletx && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+		 cd cw_walletx && flutter pub get && dart run build_runner build --delete-conflicting-outputs && cd ..
 
 - Add the relevant dev_dependencies for generating the files also
     - build_runner
@@ -78,9 +78,9 @@ A `Proxy` class is used to communicate with the specific wallet package we have.
 
 		./app_config.sh
 
-		cd cw_walletx && flutter pub get && flutter packages pub run build_runner build
+		cd cw_walletx && flutter pub get && dart run build_runner build
 
-		flutter packages pub run build_runner build --delete-conflicting-outputs
+		dart run build_runner build --delete-conflicting-outputs
 
 Moving forward, our interactions with the cw_walletx package would be through the proxy class and its methods.
 
@@ -191,9 +191,9 @@ You can add as many node entries as desired.
 
 - Run the following commands after to generate modified files in cw_core  and lib		
 		
-		cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+		cd cw_core && flutter pub get && dart run build_runner build --delete-conflicting-outputs && cd ..
 
-		flutter packages pub run build_runner build --delete-conflicting-outputs
+		dart run build_runner build --delete-conflicting-outputs
 
 - Lastly, before we run the app to test what we’ve done so far, 
 - Go to `lib/src/dashboard/widgets/menu_widget.dart` and add an icon for walletX to be used within the app.				
diff --git a/howto-build-android.md b/howto-build-android.md
index 57d29f459..5afecfba3 100644
--- a/howto-build-android.md
+++ b/howto-build-android.md
@@ -8,7 +8,7 @@ The following are the system requirements to build Cake Wallet for your Android
 Ubuntu >= 20.04 
 Android SDK 29 or higher (better to have the latest one 33)
 Android NDK 17c
-Flutter 3.19.x
+Flutter 3.24.4
 ```
 
 ### 1. Installing Package Dependencies
@@ -51,7 +51,7 @@ You may download and install the latest version of Android Studio [here](https:/
 
 ### 3. Installing Flutter
 
-Install Flutter with version `3.19.x`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).
+Install Flutter with version `3.24.4`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).
 
 ### 4. Installing rustup
 
@@ -66,7 +66,7 @@ Verify that the Android toolchain, Flutter, and Android Studio have been correct
 The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
 ```
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.19.x, on Linux, locale en_US.UTF-8)
+[✓] Flutter (Channel stable, 3.24.4, on Linux, locale en_US.UTF-8)
 [✓] Android toolchain - develop for Android devices (Android SDK version 29 or higher)
 [✓] Android Studio (version 4.0 or higher)
 ```
@@ -126,17 +126,17 @@ Install Flutter package dependencies with this command:
 
 Your Cake Wallet binary will be built with cryptographic salts, which are used for secure encryption of your data. You may generate these secret salts with the following command:
 
-`$ flutter packages pub run tool/generate_new_secrets.dart`
+`$ dart run tool/generate_new_secrets.dart`
 
 Next, we must generate key properties based on the secure keystore you generated for Android (in step 5). **MODIFY THE FOLLOWING COMMAND** with the "store password" and "key password" you assigned when creating your keystore (in step 5).
 
-`$ flutter packages pub run tool/generate_android_key_properties.dart keyAlias=key storeFile=$HOME/key.jks storePassword=<store password> keyPassword=<key password>`
+`$ dart run tool/generate_android_key_properties.dart keyAlias=key storeFile=$HOME/key.jks storePassword=<store password> keyPassword=<key password>`
 
 **REMINDER:** The *above* command will **not** succeed unless you replaced the `storePassword` and `keyPassword` variables with the correct passwords for your keystore.
 
 Then we need to generate localization files.
 
-`$ flutter packages pub run tool/generate_localization.dart`
+`$ dart run tool/generate_localization.dart`
 
 Finally build mobx models for the app:
 
diff --git a/howto-build-ios.md b/howto-build-ios.md
index 544d4359e..753e17e93 100644
--- a/howto-build-ios.md
+++ b/howto-build-ios.md
@@ -7,7 +7,7 @@ The following are the system requirements to build Cake Wallet for your iOS devi
 ```
 macOS >= 14.0 
 Xcode 15.3
-Flutter 3.19.x
+Flutter 3.24.4
 ```
 
 ### 1. Installing Package Dependencies
@@ -26,7 +26,7 @@ You may download and install the latest version of [Xcode](https://developer.app
 
 ### 3. Installing Flutter
 
-Need to install flutter with version `3.19.x`. For this please check section [Install Flutter](https://docs.flutter.dev/get-started/install/macos/mobile-ios?tab=download).
+Need to install flutter with version `3.24.4`. For this please check section [Install Flutter](https://docs.flutter.dev/get-started/install/macos/mobile-ios?tab=download).
 
 ### 4. Installing rustup
 
@@ -41,7 +41,7 @@ Verify that the Flutter and Xcode have been correctly installed on your system w
 The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
 ```
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.19.x, on macOS 14.x.x)
+[✓] Flutter (Channel stable, 3.24.4, on macOS 14.x.x)
 [✓] Xcode - develop for iOS and macOS (Xcode 15.3)
 ```
 
@@ -82,7 +82,7 @@ Install Flutter package dependencies with this command:
 
 Your Cake Wallet binary will be built with cryptographic salts, which are used for secure encryption of your data. You may generate these secret salts with the following command:
 
-`$ flutter packages pub run tool/generate_new_secrets.dart`
+`$ dart run tool/generate_new_secrets.dart`
 
 Then we need to generate localization files and mobx models.
 
diff --git a/howto-build-macos.md b/howto-build-macos.md
index 2e535e5be..a497e1ffa 100644
--- a/howto-build-macos.md
+++ b/howto-build-macos.md
@@ -7,7 +7,7 @@ The following are the system requirements to build Cake Wallet for your macOS de
 ```
 macOS >= 14.0 
 Xcode 15.3
-Flutter 3.19.x
+Flutter 3.24.4
 ```
 
 ### 1. Installing Package Dependencies
@@ -28,7 +28,7 @@ You may download and install the latest version of [Xcode](https://developer.app
 
 ### 3. Installing Flutter
 
-Need to install flutter with version `3.19.x`. For this please check section [Install Flutter](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
+Need to install flutter with version `3.24.4`. For this please check section [Install Flutter](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
 
 ### 4. Installing rustup
 
@@ -43,7 +43,7 @@ Verify that Flutter and Xcode have been correctly installed on your system with
 The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
 ```
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.19.x, on macOS 14.x.x)
+[✓] Flutter (Channel stable, 3.24.4, on macOS 14.x.x)
 [✓] Xcode - develop for iOS and macOS (Xcode 15.3)
 ```
 
@@ -93,7 +93,7 @@ Install Flutter package dependencies with this command:
 
 Your Cake Wallet binary will be built with cryptographic salts, which are used for secure encryption of your data. You may generate these secret salts with the following command:
 
-`$ flutter packages pub run tool/generate_new_secrets.dart`
+`$ dart run tool/generate_new_secrets.dart`
 
 Then we need to generate localization files and mobx models.
 
diff --git a/howto-build-windows.md b/howto-build-windows.md
index 504f8f785..3ebecaa61 100644
--- a/howto-build-windows.md
+++ b/howto-build-windows.md
@@ -6,12 +6,12 @@ The following are the system requirements to build CakeWallet for your Windows P
 
 ```
 Windows 10 or later (64-bit), x86-64 based
-Flutter 3.19.x
+Flutter 3.24.4
 ```
 
 ### 1. Installing Flutter
 
-Install Flutter with version `3.19.x`. Follow the Flutter [installation guide](https://docs.flutter.dev/get-started/install/windows).
+Install Flutter with version `3.24.4`. Follow the Flutter [installation guide](https://docs.flutter.dev/get-started/install/windows).
 
 ### 2. Install Development Tools
 
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index abcac01fb..bb55b01c6 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2,39 +2,7 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
-  - CryptoSwift (1.8.2)
-  - cw_haven (0.0.1):
-    - cw_haven/Boost (= 0.0.1)
-    - cw_haven/Haven (= 0.0.1)
-    - cw_haven/OpenSSL (= 0.0.1)
-    - cw_haven/Sodium (= 0.0.1)
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Boost (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Haven (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/OpenSSL (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_haven/Sodium (0.0.1):
-    - cw_shared_external
-    - Flutter
-  - cw_mweb (0.0.1):
-    - Flutter
-  - cw_shared_external (0.0.1):
-    - cw_shared_external/Boost (= 0.0.1)
-    - cw_shared_external/OpenSSL (= 0.0.1)
-    - cw_shared_external/Sodium (= 0.0.1)
-    - Flutter
-  - cw_shared_external/Boost (0.0.1):
-    - Flutter
-  - cw_shared_external/OpenSSL (0.0.1):
-    - Flutter
-  - cw_shared_external/Sodium (0.0.1):
-    - Flutter
+  - CryptoSwift (1.8.3)
   - device_display_brightness (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -81,10 +49,10 @@ PODS:
   - flutter_inappwebview_ios (0.0.1):
     - Flutter
     - flutter_inappwebview_ios/Core (= 0.0.1)
-    - OrderedSet (~> 5.0)
+    - OrderedSet (~> 6.0.3)
   - flutter_inappwebview_ios/Core (0.0.1):
     - Flutter
-    - OrderedSet (~> 5.0)
+    - OrderedSet (~> 6.0.3)
   - flutter_local_authentication (1.2.0):
     - Flutter
   - flutter_mailer (0.0.1):
@@ -98,7 +66,8 @@ PODS:
     - Flutter
   - integration_test (0.0.1):
     - Flutter
-  - OrderedSet (5.0.0)
+  - MTBBarcodeScanner (5.0.11)
+  - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -106,7 +75,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.1.1):
     - Flutter
-  - ReachabilitySwift (5.2.3)
+  - ReachabilitySwift (5.2.4)
   - SDWebImage (5.19.7):
     - SDWebImage/Core (= 5.19.7)
   - SDWebImage/Core (5.19.7)
@@ -117,6 +86,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - SwiftProtobuf (1.28.2)
   - sp_scanner (0.0.1):
     - Flutter
   - SwiftyGif (5.4.5)
@@ -136,9 +106,6 @@ PODS:
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - CryptoSwift
-  - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
-  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
-  - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
   - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
@@ -158,7 +125,6 @@ DEPENDENCIES:
   - 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`)
-  - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -179,12 +145,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  cw_haven:
-    :path: ".symlinks/plugins/cw_haven/ios"
-  cw_mweb:
-    :path: ".symlinks/plugins/cw_mweb/ios"
-  cw_shared_external:
-    :path: ".symlinks/plugins/cw_shared_external/ios"
   device_display_brightness:
     :path: ".symlinks/plugins/device_display_brightness/ios"
   device_info_plus:
@@ -223,8 +183,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sp_scanner:
-    :path: ".symlinks/plugins/sp_scanner/ios"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   universal_ble:
@@ -238,10 +196,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
-  CryptoSwift: c63a805d8bb5e5538e88af4e44bb537776af11ea
-  cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
-  cw_mweb: 87af74f9659fed0c1a2cbfb44413f1070e79e3ae
-  cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
+  CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
   device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   devicelocale: b22617f40038496deffba44747101255cee005b0
@@ -250,22 +205,24 @@ SPEC CHECKSUMS:
   fast_scanner: 44c00940355a51258cd6c2085734193cd23d95bc
   file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
   flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
-  integration_test: 13825b8a9334a850581300559b8839134b124670
-  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979
+  ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
   SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
   sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d
   sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 477d47f7b..0a4db4ddd 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,7 +2,7 @@ import UIKit
 import Flutter
 import workmanager
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {    
     override func application(
         _ application: UIApplication,
diff --git a/lib/buy/onramper/onramper_buy_provider.dart b/lib/buy/onramper/onramper_buy_provider.dart
index dade41d43..827a5d448 100644
--- a/lib/buy/onramper/onramper_buy_provider.dart
+++ b/lib/buy/onramper/onramper_buy_provider.dart
@@ -248,11 +248,18 @@ class OnRamperBuyProvider extends BuyProvider {
   String _tagToNetwork(String tag) {
     switch (tag) {
       case 'OMNI':
+      case 'BSC':
         return tag;
       case 'POL':
         return 'POLYGON';
-      default:
-        return CryptoCurrency.fromString(tag).fullName ?? tag;
+      case 'ZEC':
+        return 'ZCASH';
+    default:
+        try {
+          return CryptoCurrency.fromString(tag).fullName!;
+        } catch (_) {
+          return tag;
+        }
     }
   }
 
diff --git a/lib/cake_pay/cake_pay_api.dart b/lib/cake_pay/cake_pay_api.dart
index 1f91b338d..a39fbe085 100644
--- a/lib/cake_pay/cake_pay_api.dart
+++ b/lib/cake_pay/cake_pay_api.dart
@@ -233,7 +233,8 @@ class CakePayApi {
     var response = await http.get(uri, headers: headers);
 
     if (response.statusCode != 200) {
-      throw Exception(response.body);
+      throw Exception(
+          'Failed to fetch vendors: statusCode - ${response.statusCode}, queryParams -$queryParams, response - ${response.body}');
     }
 
     final bodyJson = json.decode(response.body);
diff --git a/lib/di.dart b/lib/di.dart
index facdec912..7b1cf3d07 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -42,6 +42,7 @@ import 'package:cake_wallet/src/screens/receive/address_list_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
 import 'package:cake_wallet/src/screens/settings/mweb_logs_page.dart';
 import 'package:cake_wallet/src/screens/settings/mweb_node_page.dart';
+import 'package:cake_wallet/src/screens/welcome/welcome_page.dart';
 import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
@@ -746,6 +747,7 @@ Future<void> setup({
       _transactionDescriptionBox,
       getIt.get<AppStore>().wallet!.isHardwareWallet ? getIt.get<LedgerViewModel>() : null,
       coinTypeToSpendFrom: coinTypeToSpendFrom ?? UnspentCoinType.any,
+      getIt.get<UnspentCoinsListViewModel>(param1: coinTypeToSpendFrom),
     ),
   );
 
@@ -1102,6 +1104,8 @@ Future<void> setup({
       (onSuccessfulPinSetup, _) => SetupPinCodePage(getIt.get<SetupPinCodeViewModel>(),
           onSuccessfulPinSetup: onSuccessfulPinSetup));
 
+  getIt.registerFactory(() => WelcomePage());
+
   getIt.registerFactory(() => RescanViewModel(getIt.get<AppStore>().wallet!));
 
   getIt.registerFactory(() => RescanPage(getIt.get<RescanViewModel>()));
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index f873314c0..7f0679625 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -260,10 +260,34 @@ Future<void> defaultSettingsMigration(
           updateBtcElectrumNodeToUseSSL(nodes, sharedPreferences);
           break;
         case 43:
-          _updateCakeXmrNode(nodes);
+          await _updateCakeXmrNode(nodes);
           _deselectExchangeProvider(sharedPreferences, "THORChain");
           _deselectExchangeProvider(sharedPreferences, "SimpleSwap");
           break;
+        case 44:
+          await _updateCakeXmrNode(nodes);
+          await _changeDefaultNode(
+            nodes: nodes,
+            sharedPreferences: sharedPreferences,
+            type: WalletType.bitcoin,
+            newDefaultUri: newCakeWalletBitcoinUri,
+            currentNodePreferenceKey: PreferencesKey.currentBitcoinElectrumSererIdKey,
+            useSSL: true,
+            oldUri: ['cakewallet.com'],
+          );
+          _changeDefaultNode(
+            nodes: nodes,
+            sharedPreferences: sharedPreferences,
+            type: WalletType.tron,
+            newDefaultUri: tronDefaultNodeUri,
+            currentNodePreferenceKey: PreferencesKey.currentTronNodeIdKey,
+            useSSL: true,
+            oldUri: [
+              'tron-rpc.publicnode.com:443',
+              'api.trongrid.io',
+            ],
+          );
+          break;
 
         default:
           break;
@@ -279,17 +303,54 @@ Future<void> defaultSettingsMigration(
   await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
 }
 
-void _updateCakeXmrNode(Box<Node> nodes) {
+/// generic function for changing any wallet default node
+/// instead of making a new function for each change
+Future<void> _changeDefaultNode({
+  required Box<Node> nodes,
+  required SharedPreferences sharedPreferences,
+  required WalletType type,
+  required String newDefaultUri,
+  required String currentNodePreferenceKey,
+  required bool useSSL,
+  required List<String> oldUri, // leave empty if you want to force replace the node regardless of the user's current node
+}) async {
+  final currentNodeId = sharedPreferences.getInt(currentNodePreferenceKey);
+  final currentNode = nodes.values.firstWhere((node) => node.key == currentNodeId);
+  final shouldReplace = oldUri.any((e) => currentNode.uriRaw.contains(e));
+
+  if (shouldReplace) {
+    var newNodeId =
+        nodes.values.firstWhereOrNull((element) => element.uriRaw == newDefaultUri)?.key;
+
+    // new node doesn't exist, then add it
+    if (newNodeId == null) {
+      final newNode = Node(
+        uri: newDefaultUri,
+        type: type,
+        useSSL: useSSL,
+      );
+
+      await nodes.add(newNode);
+      newNodeId = newNode.key;
+    }
+
+    await sharedPreferences.setInt(currentNodePreferenceKey, newNodeId as int);
+  }
+}
+
+Future<void> _updateCakeXmrNode(Box<Node> nodes) async {
   final node = nodes.values.firstWhereOrNull((element) => element.uriRaw == newCakeWalletMoneroUri);
 
-  if (node != null && !node.trusted) {
+  if (node != null) {
     node.trusted = true;
-    node.save();
+    node.useSSL = true;
+    await node.save();
   }
 }
 
 void updateBtcElectrumNodeToUseSSL(Box<Node> nodes, SharedPreferences sharedPreferences) {
-  final btcElectrumNode = nodes.values.firstWhereOrNull((element) => element.uriRaw == newCakeWalletBitcoinUri);
+  final btcElectrumNode =
+      nodes.values.firstWhereOrNull((element) => element.uriRaw == newCakeWalletBitcoinUri);
 
   if (btcElectrumNode != null) {
     btcElectrumNode.useSSL = true;
@@ -538,7 +599,6 @@ Node? getBitcoinCashDefaultElectrumServer({required Box<Node> nodes}) {
 }
 
 Node getMoneroDefaultNode({required Box<Node> nodes}) {
-  final timeZone = DateTime.now().timeZoneOffset.inHours;
   var nodeUri = newCakeWalletMoneroUri;
 
   try {
@@ -858,7 +918,8 @@ Future<void> changeDefaultMoneroNode(
     }
   });
 
-  final newCakeWalletNode = Node(uri: newCakeWalletMoneroUri, type: WalletType.monero, trusted: true);
+  final newCakeWalletNode =
+      Node(uri: newCakeWalletMoneroUri, type: WalletType.monero, trusted: true);
 
   await nodeSource.add(newCakeWalletNode);
 
@@ -897,7 +958,7 @@ Future<void> updateBtcNanoWalletInfos(Box<WalletInfo> walletsInfoSource) async {
 Future<void> changeDefaultNanoNode(
     Box<Node> nodeSource, SharedPreferences sharedPreferences) async {
   const oldNanoNodeUriPattern = 'rpc.nano.to';
-  final currentNanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
+  final currentNanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoNodeIdKey);
   final currentNanoNode = nodeSource.values.firstWhere((node) => node.key == currentNanoNodeId);
 
   final newCakeWalletNode = Node(
@@ -909,7 +970,8 @@ Future<void> changeDefaultNanoNode(
   await nodeSource.add(newCakeWalletNode);
 
   if (currentNanoNode.uri.toString().contains(oldNanoNodeUriPattern)) {
-    await sharedPreferences.setInt(PreferencesKey.currentNodeIdKey, newCakeWalletNode.key as int);
+    await sharedPreferences.setInt(
+        PreferencesKey.currentNanoNodeIdKey, newCakeWalletNode.key as int);
   }
 }
 
@@ -924,7 +986,7 @@ Future<void> changeDefaultBitcoinNode(
       currentBitcoinNode.uri.toString().contains(cakeWalletBitcoinNodeUriPattern);
 
   final newCakeWalletBitcoinNode =
-      Node(uri: newCakeWalletBitcoinUri, type: WalletType.bitcoin, useSSL: false);
+      Node(uri: newCakeWalletBitcoinUri, type: WalletType.bitcoin, useSSL: true);
 
   if (!nodeSource.values.any((element) => element.uriRaw == newCakeWalletBitcoinUri)) {
     await nodeSource.add(newCakeWalletBitcoinNode);
diff --git a/lib/entities/main_actions.dart b/lib/entities/main_actions.dart
index 94be0d2b7..29c161c5f 100644
--- a/lib/entities/main_actions.dart
+++ b/lib/entities/main_actions.dart
@@ -1,7 +1,5 @@
 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/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 
@@ -68,7 +66,7 @@ class MainActions {
 
 
   static MainActions tradeAction = MainActions._(
-    name: (context) => '${S.of(context).buy} / ${S.of(context).sell}',
+    name: (context) => '${S.of(context).buy}/${S.of(context).sell}',
     image: 'assets/images/buy_sell.png',
     isEnabled: (viewModel) => viewModel.isEnabledTradeAction,
     canShow: (viewModel) => viewModel.hasTradeAction,
diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart
index 11ba4724c..42ab19b31 100644
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@@ -26,23 +26,80 @@ class AddressResolver {
   final SettingsStore settingsStore;
 
   static const unstoppableDomains = [
-    'crypto',
-    'zil',
-    'x',
-    'wallet',
-    'bitcoin',
-    '888',
-    'nft',
-    'dao',
-    'blockchain',
-    'polygon',
-    'klever',
-    'hi',
-    'kresus',
-    'anime',
-    'manga',
-    'binanceus',
-    'xmr',
+    "888",
+    "altimist",
+    "anime",
+    "austin",
+    "bald",
+    "benji",
+    "bet",
+    "binanceus",
+    "bitcoin",
+    "bitget",
+    "blockchain",
+    "ca",
+    "chomp",
+    "clay",
+    "co",
+    "com",
+    "crypto",
+    "dao",
+    "dfz",
+    "digital",
+    "dream",
+    "eth",
+    "ethermail",
+    "farms",
+    "fun",
+    "go",
+    "group",
+    "hi",
+    "host",
+    "info",
+    "io",
+    "klever",
+    "kresus",
+    "kryptic",
+    "lfg",
+    "life",
+    "live",
+    "ltd",
+    "manga",
+    "metropolis",
+    "moon",
+    "mumu",
+    "net",
+    "nft",
+    "online",
+    "org",
+    "pog",
+    "polygon",
+    "press",
+    "pro",
+    "propykeys",
+    "pudgy",
+    "pw",
+    "raiin",
+    "secret",
+    "site",
+    "smobler",
+    "space",
+    "stepn",
+    "store",
+    "tball",
+    "tech",
+    "ubu",
+    "uno",
+    "unstoppable",
+    "wallet",
+    "website",
+    "wifi",
+    "witg",
+    "wrkx",
+    "x",
+    "xmr",
+    "xyz",
+    "zil",
   ];
 
   static String? extractAddressByType({required String raw, required CryptoCurrency type}) {
diff --git a/lib/locales/hausa_intl.dart b/lib/locales/hausa_intl.dart
index 6cf757b60..99e47d7da 100644
--- a/lib/locales/hausa_intl.dart
+++ b/lib/locales/hausa_intl.dart
@@ -795,6 +795,14 @@ class HaMaterialLocalizations extends GlobalMaterialLocalizations {
   @override
   // TODO: implement shareButtonLabel
   String get shareButtonLabel => "shareButtonLabel";
+  
+  @override
+  // TODO: implement clearButtonTooltip
+  String get clearButtonTooltip => "clearButtonTooltip";
+  
+  @override
+  // TODO: implement selectedDateLabel
+  String get selectedDateLabel => "selectedDateLabel";
 }
 
 /// Cupertino Support
diff --git a/lib/locales/yoruba_intl.dart b/lib/locales/yoruba_intl.dart
index 3c720b80e..bb2385274 100644
--- a/lib/locales/yoruba_intl.dart
+++ b/lib/locales/yoruba_intl.dart
@@ -794,6 +794,14 @@ class YoMaterialLocalizations extends GlobalMaterialLocalizations {
   @override
   // TODO: implement shareButtonLabel
   String get shareButtonLabel => "shareButtonLabel";
+  
+  @override
+  // TODO: implement clearButtonTooltip
+  String get clearButtonTooltip => "clearButtonTooltip";
+  
+  @override
+  // TODO: implement selectedDateLabel
+  String get selectedDateLabel => "selectedDateLabel";
 }
 
 /// Cupertino Support
diff --git a/lib/main.dart b/lib/main.dart
index 51fab4dd1..d67fda098 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -16,7 +16,6 @@ import 'package:cake_wallet/exchange/exchange_template.dart';
 import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/locales/locale.dart';
-import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/reactions/bootstrap.dart';
 import 'package:cake_wallet/router.dart' as Router;
 import 'package:cake_wallet/routes.dart';
@@ -204,7 +203,7 @@ Future<void> initializeAppConfigs() async {
     transactionDescriptions: transactionDescriptions,
     secureStorage: secureStorage,
     anonpayInvoiceInfo: anonpayInvoiceInfo,
-    initialMigrationVersion: 43,
+    initialMigrationVersion: 44,
   );
 }
 
diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart
index d7e6f90c0..b804ff14e 100644
--- a/lib/reactions/on_current_wallet_change.dart
+++ b/lib/reactions/on_current_wallet_change.dart
@@ -63,6 +63,8 @@ void startCurrentWalletChangeReaction(
       startWalletSyncStatusChangeReaction(wallet, fiatConversionStore);
       startCheckConnectionReaction(wallet, settingsStore);
 
+      await Future.delayed(Duration.zero);
+
       if (wallet.type == WalletType.monero ||
           wallet.type == WalletType.wownero ||
           wallet.type == WalletType.bitcoin ||
diff --git a/lib/router.dart b/lib/router.dart
index 1382da28f..a64369b32 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -105,7 +105,8 @@ import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_page.dart';
-import 'package:cake_wallet/src/screens/welcome/create_welcome_page.dart';
+import 'package:cake_wallet/src/screens/welcome/create_pin_welcome_page.dart';
+import 'package:cake_wallet/src/screens/welcome/welcome_page.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
@@ -142,36 +143,33 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
   switch (settings.name) {
     case Routes.welcome:
-      return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
+      return MaterialPageRoute<void>(builder: (_) => CreatePinWelcomePage());
 
-    case Routes.newWalletFromWelcome:
+    case Routes.welcomeWallet:
       if (SettingsStoreBase.walletPasswordDirectInput) {
-        if (availableWalletTypes.length == 1) {
-          return createRoute(
-            RouteSettings(
-              name: Routes.newWallet,
-              arguments: NewWalletArguments(type: availableWalletTypes.first),
-            ),
-          );
-        } else {
-          return createRoute(RouteSettings(name: Routes.newWalletType));
-        }
+        return createRoute(RouteSettings(name: Routes.welcomePage));
       }
-
       return CupertinoPageRoute<void>(
           builder: (_) =>
               getIt.get<SetupPinCodePage>(param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
-                if (availableWalletTypes.length == 1) {
-                  Navigator.of(context.context).pushNamed(
-                    Routes.newWallet,
-                    arguments: NewWalletArguments(type: availableWalletTypes.first),
-                  );
-                } else {
-                  Navigator.of(context.context).pushNamed(Routes.newWalletType);
-                }
+                Navigator.of(context.context).pushNamed(Routes.welcomePage);
               }),
           fullscreenDialog: true);
 
+    case Routes.welcomePage:
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<WelcomePage>());
+
+    case Routes.newWalletFromWelcome:
+        if (isSingleCoin) {
+          return createRoute(
+            RouteSettings(
+              name: Routes.newWallet,
+              arguments: NewWalletArguments(type: availableWalletTypes.first)
+            ),
+          );
+        }
+        return createRoute(RouteSettings(name: Routes.newWalletType));
+
     case Routes.newWalletType:
       return CupertinoPageRoute<void>(
         builder: (_) => getIt.get<NewWalletTypePage>(
@@ -251,24 +249,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
           builder: (_) => getIt.get<RestoreOptionsPage>(param1: isNewInstall));
 
     case Routes.restoreWalletFromSeedKeys:
-      final isNewInstall = settings.arguments as bool;
-
-      if (isNewInstall) {
+      if (isSingleCoin) {
         return CupertinoPageRoute<void>(
-            builder: (_) => getIt.get<SetupPinCodePage>(
-                    param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
-                  if (isSingleCoin) {
-                    return Navigator.of(context.context)
-                        .pushNamed(Routes.restoreWallet, arguments: availableWalletTypes.first);
-                  }
-
-                  return Navigator.pushNamed(context.context, Routes.restoreWalletType);
-                }),
-            fullscreenDialog: true);
-      } else if (isSingleCoin) {
-        return MaterialPageRoute<void>(
             builder: (_) => getIt.get<WalletRestorePage>(param1: availableWalletTypes.first));
-      } else {
+      }
         return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<NewWalletTypePage>(
             param1: NewWalletTypeArguments(
@@ -279,21 +263,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
             ),
           ),
         );
-      }
 
     case Routes.restoreWalletFromHardwareWallet:
-      final isNewInstall = settings.arguments as bool;
-
-      if (isNewInstall) {
-        return CupertinoPageRoute<void>(
-          builder: (_) => getIt.get<SetupPinCodePage>(
-            param1: (PinCodeState<PinCodeWidget> context, dynamic _) =>
-                Navigator.of(context.context)
-                    .pushNamed(Routes.restoreWalletFromHardwareWallet, arguments: false),
-          ),
-          fullscreenDialog: true,
-        );
-      }
       if (isSingleCoin) {
         return MaterialPageRoute<void>(
             builder: (_) => ConnectDevicePage(
@@ -305,7 +276,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
                   ),
                   getIt.get<LedgerViewModel>(),
                 ));
-      } else {
+      }
         return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<NewWalletTypePage>(
             param1: NewWalletTypeArguments(
@@ -323,7 +294,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
             ),
           ),
         );
-      }
 
     case Routes.restoreWalletTypeFromQR:
       return CupertinoPageRoute<void>(
diff --git a/lib/routes.dart b/lib/routes.dart
index 0b8beb0ea..bea118ae0 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -1,5 +1,7 @@
 class Routes {
   static const welcome = '/welcome';
+  static const welcomeWallet = '/welcome_create_restore_wallet';
+  static const welcomePage = '/welcome_page';
   static const newWallet = '/new_wallet';
   static const setupPin = '/setup_pin_code';
   static const newWalletFromWelcome = '/new_wallet_from_welcome';
diff --git a/lib/src/screens/buy/buy_sell_page.dart b/lib/src/screens/buy/buy_sell_page.dart
index d2f16fe3c..945559bb6 100644
--- a/lib/src/screens/buy/buy_sell_page.dart
+++ b/lib/src/screens/buy/buy_sell_page.dart
@@ -170,8 +170,9 @@ class BuySellPage extends BasePage {
                           },
                           color: Theme.of(context).primaryColor,
                           textColor: Colors.white,
-                          isDisabled: false,
-                          isLoading: !buySellViewModel.isReadyToTrade)),
+                          isDisabled: buySellViewModel.isBuySellQuotFailed,
+                          isLoading: !buySellViewModel.isReadyToTrade &&
+                              !buySellViewModel.isBuySellQuotFailed)),
                 ]),
               )),
         ));
diff --git a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
index 31eaa23ff..f2958ee31 100644
--- a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
+++ b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
@@ -94,6 +94,10 @@ class CakePayCardsPage extends BasePage {
             _cardsListViewModel.resetLoadingNextPageState();
             _cardsListViewModel.getVendors();
           }
+
+          _cardsListViewModel.settingsStore.selectedCakePayCountry =
+              _cardsListViewModel.selectedCountry;
+
         }
       });
     });
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 9c012d518..8c236404d 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -285,38 +285,40 @@ class _DashboardPageView extends BasePage {
                             .syncedBackgroundColor,
                       ),
                       child: Container(
-                        padding: EdgeInsets.only(left: 24, right: 32),
+                        padding: EdgeInsets.symmetric(horizontal: 10),
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                           children: MainActions.all
                               .where((element) => element.canShow?.call(dashboardViewModel) ?? true)
                               .map(
-                                (action) => Semantics(
-                                  button: true,
-                                  enabled: (action.isEnabled?.call(dashboardViewModel) ?? true),
-                                  child: ActionButton(
-                                    key: ValueKey(
-                                        'dashboard_page_${action.name(context)}_action_button_key'),
-                                    image: Image.asset(
-                                      action.image,
-                                      height: 24,
-                                      width: 24,
-                                      color: action.isEnabled?.call(dashboardViewModel) ?? true
-                                          ? Theme.of(context)
-                                              .extension<DashboardPageTheme>()!
-                                              .mainActionsIconColor
+                                (action) => Expanded(
+                                  child: Semantics(
+                                    button: true,
+                                    enabled: (action.isEnabled?.call(dashboardViewModel) ?? true),
+                                    child: ActionButton(
+                                      key: ValueKey(
+                                          'dashboard_page_${action.name(context)}_action_button_key'),
+                                      image: Image.asset(
+                                        action.image,
+                                        height: 24,
+                                        width: 24,
+                                        color: action.isEnabled?.call(dashboardViewModel) ?? true
+                                            ? Theme.of(context)
+                                                .extension<DashboardPageTheme>()!
+                                                .mainActionsIconColor
+                                            : Theme.of(context)
+                                                .extension<BalancePageTheme>()!
+                                                .labelTextColor,
+                                      ),
+                                      title: action.name(context),
+                                      onClick: () async =>
+                                          await action.onTap(context, dashboardViewModel),
+                                      textColor: action.isEnabled?.call(dashboardViewModel) ?? true
+                                          ? null
                                           : Theme.of(context)
                                               .extension<BalancePageTheme>()!
                                               .labelTextColor,
                                     ),
-                                    title: action.name(context),
-                                    onClick: () async =>
-                                        await action.onTap(context, dashboardViewModel),
-                                    textColor: action.isEnabled?.call(dashboardViewModel) ?? true
-                                        ? null
-                                        : Theme.of(context)
-                                            .extension<BalancePageTheme>()!
-                                            .labelTextColor,
                                   ),
                                 ),
                               )
diff --git a/lib/src/screens/dashboard/pages/cake_features_page.dart b/lib/src/screens/dashboard/pages/cake_features_page.dart
index 37bc3a55f..775cb6c3f 100644
--- a/lib/src/screens/dashboard/pages/cake_features_page.dart
+++ b/lib/src/screens/dashboard/pages/cake_features_page.dart
@@ -10,91 +10,81 @@ import 'package:cake_wallet/view_model/dashboard/cake_features_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 
 class CakeFeaturesPage extends StatelessWidget {
   CakeFeaturesPage({required this.dashboardViewModel, required this.cakeFeaturesViewModel});
 
   final DashboardViewModel dashboardViewModel;
   final CakeFeaturesViewModel cakeFeaturesViewModel;
-  final _scrollController = ScrollController();
 
   @override
   Widget build(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 10.0),
-      child: RawScrollbar(
-        thumbColor: Colors.white.withOpacity(0.15),
-        radius: Radius.circular(20),
-        thumbVisibility: true,
-        thickness: 2,
-        controller: _scrollController,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              SizedBox(height: 50),
-              Text(
-                'Cake ${S.of(context).features}',
-                style: TextStyle(
-                  fontSize: 24,
-                  fontWeight: FontWeight.w500,
-                  color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            SizedBox(height: 50),
+            Text(
+              'Cake ${S.of(context).features}',
+              style: TextStyle(
+                fontSize: 24,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
               ),
-              Expanded(
-                child: ListView(
-                  controller: _scrollController,
-                  children: <Widget>[
-                    SizedBox(height: 20),
-                    DashBoardRoundedCardWidget(
-                      onTap: () => _navigatorToGiftCardsPage(context),
-                      title: 'Cake Pay',
-                      subTitle: S.of(context).cake_pay_subtitle,
-                      image: Image.asset(
-                        'assets/images/cards.png',
-                        height: 100,
-                        width: 115,
-                        fit: BoxFit.cover,
-                      ),
+            ),
+            Expanded(
+              child: ListView(
+                children: <Widget>[
+                  SizedBox(height: 20),
+                  DashBoardRoundedCardWidget(
+                    onTap: () => _navigatorToGiftCardsPage(context),
+                    title: 'Cake Pay',
+                    subTitle: S.of(context).cake_pay_subtitle,
+                    image: Image.asset(
+                      'assets/images/cards.png',
+                      height: 100,
+                      width: 115,
+                      fit: BoxFit.cover,
                     ),
-                    SizedBox(height: 10),
-                    DashBoardRoundedCardWidget(
-                      onTap: () => _launchUrl("cake.nano-gpt.com"),
-                      title: "NanoGPT",
-                      subTitle: S.of(context).nanogpt_subtitle,
-                      image: Image.asset(
-                        'assets/images/nanogpt.png',
-                        height: 80,
-                        width: 80,
-                        fit: BoxFit.cover,
-                      ),
+                  ),
+                  SizedBox(height: 10),
+                  DashBoardRoundedCardWidget(
+                    onTap: () => _launchUrl("cake.nano-gpt.com"),
+                    title: "NanoGPT",
+                    subTitle: S.of(context).nanogpt_subtitle,
+                    image: Image.asset(
+                      'assets/images/nanogpt.png',
+                      height: 80,
+                      width: 80,
+                      fit: BoxFit.cover,
                     ),
-                    SizedBox(height: 10),
-                    Observer(
-                      builder: (context) {
-                        if (!dashboardViewModel.hasSignMessages) {
-                          return const SizedBox();
-                        }
-                        return DashBoardRoundedCardWidget(
-                          onTap: () => Navigator.of(context).pushNamed(Routes.signPage),
-                          title: S.current.sign_verify_message,
-                          subTitle: S.current.sign_verify_message_sub,
-                          icon: Icon(
-                            Icons.speaker_notes_rounded,
-                            color:
-                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                            size: 75,
-                          ),
-                        );
-                      },
-                    ),
-                  ],
-                ),
+                  ),
+                  SizedBox(height: 10),
+                  Observer(
+                    builder: (context) {
+                      if (!dashboardViewModel.hasSignMessages) {
+                        return const SizedBox();
+                      }
+                      return DashBoardRoundedCardWidget(
+                        onTap: () => Navigator.of(context).pushNamed(Routes.signPage),
+                        title: S.current.sign_verify_message,
+                        subTitle: S.current.sign_verify_message_sub,
+                        icon: Icon(
+                          Icons.speaker_notes_rounded,
+                          color:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                          size: 75,
+                        ),
+                      );
+                    },
+                  ),
+                ],
               ),
-            ],
-          ),
+            ),
+          ],
         ),
       ),
     );
diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart
index 49ebab3cd..21f056c0c 100644
--- a/lib/src/screens/dashboard/widgets/action_button.dart
+++ b/lib/src/screens/dashboard/widgets/action_button.dart
@@ -50,6 +50,7 @@ class ActionButton extends StatelessWidget {
                   fontSize: 10,
                   color: textColor ??
                       Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor),
+              textAlign: TextAlign.center,
             )
           ],
         ),
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
index 21133a438..aca3231ec 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
@@ -8,7 +8,7 @@ class SyncIndicatorIcon extends StatelessWidget {
       {this.boolMode = true,
       this.isSynced = false,
       this.value = waiting,
-      this.size = 4.0});
+      this.size = 6.0});
 
   final bool boolMode;
   final bool isSynced;
diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart
index d1d419d60..79714aa05 100644
--- a/lib/src/screens/restore/restore_options_page.dart
+++ b/lib/src/screens/restore/restore_options_page.dart
@@ -85,9 +85,7 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
                   key: ValueKey('restore_options_from_seeds_or_keys_button_key'),
                   onPressed: () => Navigator.pushNamed(
                     context,
-                    Routes.restoreWalletFromSeedKeys,
-                    arguments: widget.isNewInstall,
-                  ),
+                    Routes.restoreWalletFromSeedKeys),
                   image: imageSeedKeys,
                   title: S.of(context).restore_title_from_seed_keys,
                   description: S.of(context).restore_description_from_seed_keys,
@@ -109,8 +107,7 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
                     child: OptionTile(
                       key: ValueKey('restore_options_from_hardware_wallet_button_key'),
                       onPressed: () => Navigator.pushNamed(
-                          context, Routes.restoreWalletFromHardwareWallet,
-                          arguments: widget.isNewInstall),
+                          context, Routes.restoreWalletFromHardwareWallet),
                       image: imageLedger,
                       title: S.of(context).restore_title_from_hardware_wallet,
                       description: S.of(context).restore_description_from_hardware_wallet,
@@ -158,15 +155,6 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
         await PermissionHandler.checkPermission(Permission.camera, context);
 
     if (!isCameraPermissionGranted) return;
-    bool isPinSet = false;
-    if (widget.isNewInstall) {
-      await Navigator.pushNamed(context, Routes.setupPin,
-          arguments: (PinCodeState<PinCodeWidget> setupPinContext, String _) {
-        setupPinContext.close();
-        isPinSet = true;
-      });
-    }
-    if (!widget.isNewInstall || isPinSet) {
       try {
         if (isRestoring) {
           return;
@@ -188,5 +176,4 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
         _onWalletCreateFailure(context, e.toString());
       }
     }
-  }
 }
diff --git a/lib/src/screens/welcome/create_pin_welcome_page.dart b/lib/src/screens/welcome/create_pin_welcome_page.dart
new file mode 100644
index 000000000..d8ff1578e
--- /dev/null
+++ b/lib/src/screens/welcome/create_pin_welcome_page.dart
@@ -0,0 +1,138 @@
+import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+
+class CreatePinWelcomePage extends BasePage {
+  static const aspectRatioImage = 1.25;
+  final welcomeImageLight = Image.asset('assets/images/welcome_light.png');
+  final welcomeImageDark = Image.asset('assets/images/welcome.png');
+
+  String appTitle(BuildContext context) {
+    if (isMoneroOnly) {
+      return S.of(context).monero_com;
+    }
+
+    if (isHaven) {
+      return S.of(context).haven_app;
+    }
+
+    return S.of(context).cake_wallet;
+  }
+
+  String appDescription(BuildContext context) {
+    if (isMoneroOnly) {
+      return S.of(context).monero_com_wallet_text;
+    }
+
+    if (isHaven) {
+      return S.of(context).haven_app_wallet_text;
+    }
+
+    return S.of(context).new_first_wallet_text;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.background,
+        resizeToAvoidBottomInset: false,
+        body: body(context));
+  }
+
+  @override
+  Widget body(BuildContext context) {
+    final welcomeImage = currentTheme.type == ThemeType.dark ? welcomeImageDark : welcomeImageLight;
+
+    final newWalletImage = Image.asset('assets/images/new_wallet.png',
+        height: 12,
+        width: 12,
+        color: Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor);
+
+    return PopScope(
+      canPop: false,
+      child: ScrollableWithBottomSection(
+        content: Container(
+          alignment: Alignment.center,
+          child: ConstrainedBox(
+            constraints:
+            BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                Column(
+                  children: <Widget>[
+                    SizedBox(height: 70),
+                    AspectRatio(
+                      aspectRatio: aspectRatioImage,
+                      child: FittedBox(child: welcomeImage, fit: BoxFit.contain),
+                    ),
+                    SizedBox(height: 50),
+                    Padding(
+                      padding: EdgeInsets.only(top: 24),
+                      child: Text(
+                        S.of(context).welcome,
+                        style: TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(top: 5),
+                      child: Text(
+                        appTitle(context),
+                        style: TextStyle(
+                          fontSize: 36,
+                          fontWeight: FontWeight.bold,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(top: 5),
+                      child: Text(
+                        appDescription(context),
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+        bottomSection: Padding(
+          padding: EdgeInsets.only(top: 24),
+          child: PrimaryImageButton(
+            key: ValueKey('create_pin_welcome_page_create_a_pin_button_key'),
+            onPressed: () => Navigator.pushNamed(context, Routes.welcomeWallet),
+            image: newWalletImage,
+            text: S.current.set_a_pin,
+            color: Theme.of(context)
+                .extension<WalletListTheme>()!
+                .createNewWalletButtonBackgroundColor,
+            textColor:
+            Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/screens/welcome/create_welcome_page.dart b/lib/src/screens/welcome/create_welcome_page.dart
deleted file mode 100644
index 2d4b3cc28..000000000
--- a/lib/src/screens/welcome/create_welcome_page.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/screens/welcome/welcome_page.dart';
-
-Widget createWelcomePage() => WelcomePage();
\ No newline at end of file
diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart
index 5b7b7f06d..f76c7723a 100644
--- a/lib/src/screens/welcome/welcome_page.dart
+++ b/lib/src/screens/welcome/welcome_page.dart
@@ -10,42 +10,28 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class WelcomePage extends BasePage {
   static const aspectRatioImage = 1.25;
-  final welcomeImageLight = Image.asset('assets/images/welcome_light.png');
-  final welcomeImageDark = Image.asset('assets/images/welcome.png');
-
-  String appTitle(BuildContext context) {
-    if (isMoneroOnly) {
-      return S.of(context).monero_com;
-    }
-
-    if (isHaven) {
-      return S.of(context).haven_app;
-    }
-
-    return S.of(context).cake_wallet;
-  }
-
-  String appDescription(BuildContext context) {
-    if (isMoneroOnly) {
-      return S.of(context).monero_com_wallet_text;
-    }
-
-    if (isHaven) {
-      return S.of(context).haven_app_wallet_text;
-    }
-
-    return S.of(context).new_first_wallet_text;
-  }
+  final welcomeImageLight = Image.asset('assets/images/wallet_type_light.png');
+  final welcomeImageDark = Image.asset('assets/images/wallet_type.png');
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.background,
-        resizeToAvoidBottomInset: false,
-        body: body(context));
+  String? get title => S.current.wallet;
+
+  @override
+  bool get resizeToAvoidBottomInset => false;
+
+  @override
+  Widget trailing(BuildContext context) {
+    final Uri _url = Uri.parse('https://guides.cakewallet.com/docs/basic-features/basic-features/');
+    return IconButton(
+      icon: Icon(Icons.info_outline),
+      onPressed: () async {
+        await launchUrl(_url);
+      },
+    );
   }
 
   @override
@@ -59,106 +45,136 @@ class WelcomePage extends BasePage {
     final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
         height: 12, width: 12, color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
-    return WillPopScope(
-      onWillPop: () async => false,
-      child: ScrollableWithBottomSection(
-        content: Container(
-          alignment: Alignment.center,
-          padding: EdgeInsets.only(top: 64, bottom: 24, left: 24, right: 24),
-          child: ConstrainedBox(
-            constraints:
-                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: <Widget>[
-                Column(
-                  children: <Widget>[
-                    AspectRatio(
-                      aspectRatio: aspectRatioImage,
-                      child: FittedBox(child: welcomeImage, fit: BoxFit.contain),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 24),
-                      child: Text(
-                        S.of(context).welcome,
-                        style: TextStyle(
-                          fontSize: 18,
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
-                        ),
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                    Padding(
+    return ScrollableWithBottomSection(
+      content: Container(
+        alignment: Alignment.center,
+        padding: EdgeInsets.only(top: 64, bottom: 24, left: 24, right: 24),
+        child: ConstrainedBox(
+          constraints:
+              BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              Column(
+                children: <Widget>[
+                  AspectRatio(
+                    aspectRatio: aspectRatioImage,
+                    child: FittedBox(child: welcomeImage, fit: BoxFit.contain),
+                  ),
+                  Padding(
+                      padding: EdgeInsets.only(top: 20),
+                      child: highlightText(context, S.of(context).welcome_subtitle_new_wallet,
+                          S.of(context).create_new)),
+                  SizedBox(height: 10),
+                  Padding(
                       padding: EdgeInsets.only(top: 5),
-                      child: Text(
-                        appTitle(context),
-                        style: TextStyle(
-                          fontSize: 36,
-                          fontWeight: FontWeight.bold,
-                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
-                        ),
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 5),
-                      child: Text(
-                        appDescription(context),
-                        style: TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
-                        ),
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
+                      child: highlightText(context, S.of(context).welcome_subtitle_restore_wallet,
+                          S.of(context).restore_existing_wallet)),
+                ],
+              ),
+            ],
           ),
         ),
-        bottomSection: Column(
-          children: <Widget>[
-            Text(
-              S.of(context).please_make_selection,
-              style: TextStyle(
-                fontSize: 12,
-                fontWeight: FontWeight.normal,
-                color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
-              ),
-              textAlign: TextAlign.center,
-            ),
-            Padding(
-              padding: EdgeInsets.only(top: 24),
-              child: PrimaryImageButton(
-                key: ValueKey('welcome_page_create_new_wallet_button_key'),
-                onPressed: () => Navigator.pushNamed(context, Routes.newWalletFromWelcome),
-                image: newWalletImage,
-                text: S.of(context).create_new,
-                color: Theme.of(context)
-                    .extension<WalletListTheme>()!
-                    .createNewWalletButtonBackgroundColor,
-                textColor:
-                    Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
-              ),
-            ),
-            Padding(
-              padding: EdgeInsets.only(top: 10),
-              child: PrimaryImageButton(
+      ),
+      bottomSection: Column(
+        children: <Widget>[
+          Padding(
+            padding: EdgeInsets.only(top: 24),
+            child: PrimaryImageButton(
                 key: ValueKey('welcome_page_restore_wallet_button_key'),
-                  onPressed: () {
-                    Navigator.pushNamed(context, Routes.restoreOptions, arguments: true);
-                  },
-                  image: restoreWalletImage,
-                  text: S.of(context).restore_wallet,
-                  color: Theme.of(context).cardColor,
-                  textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
-            )
-          ],
-        ),
+                onPressed: () {
+                  Navigator.pushNamed(context, Routes.restoreOptions, arguments: true);
+                },
+                image: restoreWalletImage,
+                text: S.of(context).restore_existing_wallet,
+                color: Theme.of(context).cardColor,
+                textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+          ),
+          Padding(
+            padding: EdgeInsets.only(top: 10),
+            child: PrimaryImageButton(
+              key: ValueKey('welcome_page_create_new_wallet_button_key'),
+              onPressed: () => Navigator.pushNamed(context, Routes.newWalletFromWelcome),
+              image: newWalletImage,
+              text: S.of(context).create_new,
+              color: Theme.of(context)
+                  .extension<WalletListTheme>()!
+                  .createNewWalletButtonBackgroundColor,
+              textColor:
+                  Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
+            ),
+          ),
+        ],
       ),
     );
   }
+
+  RichText highlightText(BuildContext context, String text, String highlightWord) {
+    final regex = RegExp(highlightWord, caseSensitive: false);
+    final matches = regex.allMatches(text);
+
+    if (matches.isEmpty) {
+      return RichText(
+        textAlign: TextAlign.center,
+        text: TextSpan(
+          text: text,
+          style: TextStyle(
+            fontSize: 16,
+            height: 1.5,
+            fontWeight: FontWeight.w400,
+            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          ),
+        ),
+      );
+    }
+
+    List<InlineSpan> spans = [];
+    int lastMatchEnd = 0;
+
+    for (final match in matches) {
+      final start = match.start;
+      final end = match.end;
+
+      if (start > lastMatchEnd) {
+        spans.add(TextSpan(
+          text: text.substring(lastMatchEnd, start),
+          style: TextStyle(
+            fontSize: 16,
+            height: 1.5,
+            fontWeight: FontWeight.w400,
+            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          ),
+        ));
+      }
+
+      spans.add(TextSpan(
+        text: text.substring(start, end),
+        style: TextStyle(
+          fontSize: 16,
+          height: 1.5,
+          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          fontWeight: FontWeight.bold,
+        ),
+      ));
+
+      lastMatchEnd = end;
+    }
+
+    if (lastMatchEnd < text.length) {
+      spans.add(TextSpan(
+        text: text.substring(lastMatchEnd),
+        style: TextStyle(
+          fontSize: 16,
+          height: 1.5,
+          fontWeight: FontWeight.w400,
+          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+        ),
+      ));
+    }
+
+    return RichText(
+      textAlign: TextAlign.center,
+      text: TextSpan(children: spans),
+    );
+  }
 }
diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart
index 1c6b6da02..650ee684d 100644
--- a/lib/src/widgets/blockchain_height_widget.dart
+++ b/lib/src/widgets/blockchain_height_widget.dart
@@ -191,11 +191,13 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
           height = wownero!.getHeightByDate(date: date);
         }
       }
-      setState(() {
-        dateController.text = DateFormat('yyyy-MM-dd').format(date);
-        restoreHeightController.text = '$height';
-        _changeHeight(height);
-      });
+      if (mounted) {
+        setState(() {
+          dateController.text = DateFormat('yyyy-MM-dd').format(date);
+          restoreHeightController.text = '$height';
+          _changeHeight(height);
+        });
+      }
     }
   }
 
diff --git a/lib/src/widgets/services_updates_widget.dart b/lib/src/widgets/services_updates_widget.dart
index 1787b7118..17f231303 100644
--- a/lib/src/widgets/services_updates_widget.dart
+++ b/lib/src/widgets/services_updates_widget.dart
@@ -92,15 +92,17 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                           );
                         }
                         return Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 20),
-                          child: Stack(
+                          padding: const EdgeInsets.symmetric(horizontal: 12),
+                          child: Column(
                             children: [
-                              body,
+                              Expanded(child: body),
                               Align(
                                 alignment: Alignment.bottomCenter,
                                 child: Padding(
                                   padding: EdgeInsets.symmetric(
-                                      horizontal: MediaQuery.of(context).size.width / 8),
+                                    horizontal: MediaQuery.of(context).size.width / 8,
+                                    vertical: 20,
+                                  ),
                                   child: PrimaryImageButton(
                                     onPressed: () {
                                       try {
diff --git a/lib/store/app_store.dart b/lib/store/app_store.dart
index 24d5dc6a4..ff3ba0535 100644
--- a/lib/store/app_store.dart
+++ b/lib/store/app_store.dart
@@ -50,8 +50,8 @@ abstract class AppStoreBase with Store {
       getIt.get<Web3WalletService>().create();
       await getIt.get<Web3WalletService>().init();
     }
-    await getIt.get<SharedPreferences>().setString(PreferencesKey.currentWalletName, wallet.name);
-    await getIt
+    getIt.get<SharedPreferences>().setString(PreferencesKey.currentWalletName, wallet.name);
+    getIt
         .get<SharedPreferences>()
         .setInt(PreferencesKey.currentWalletType, serializeToInt(wallet.type));
   }
diff --git a/lib/view_model/buy/buy_sell_view_model.dart b/lib/view_model/buy/buy_sell_view_model.dart
index e1c53ee56..4d7151fac 100644
--- a/lib/view_model/buy/buy_sell_view_model.dart
+++ b/lib/view_model/buy/buy_sell_view_model.dart
@@ -155,13 +155,18 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
     final hasSelectedPaymentMethod = selectedPaymentMethod != null;
     final isPaymentMethodLoaded = paymentMethodState is PaymentMethodLoaded;
     final isBuySellQuotLoaded = buySellQuotState is BuySellQuotLoaded;
+    final isBuySellQuotFailed = buySellQuotState is BuySellQuotFailed;
 
     return hasSelectedQuote &&
         hasSelectedPaymentMethod &&
         isPaymentMethodLoaded &&
-        isBuySellQuotLoaded;
+        isBuySellQuotLoaded &&
+        !isBuySellQuotFailed;
   }
 
+  @computed
+  bool get isBuySellQuotFailed => buySellQuotState is BuySellQuotFailed;
+
   @action
   void reset() {
     cryptoCurrency = wallet.currency;
diff --git a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
index 8585da9da..442bd51b4 100644
--- a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
+++ b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
@@ -204,7 +204,11 @@ abstract class CakePayCardsListViewModelBase with Store {
   }
 
   @action
-  void setSelectedCountry(Country country) => settingsStore.selectedCakePayCountry = country;
+  void setSelectedCountry(Country country) {
+    // just so it triggers the reaction even when selecting the default country
+    settingsStore.selectedCakePayCountry = null;
+    settingsStore.selectedCakePayCountry = country;
+  }
 
   @action
   void togglePrepaidCards() => displayPrepaidCards = !displayPrepaidCards;
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index 69011aa74..69a500c9b 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -19,6 +19,7 @@ import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
+import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_list_view_model.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cw_core/exceptions.dart';
 import 'package:cw_core/transaction_info.dart';
@@ -64,6 +65,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
         wallet.type == WalletType.tron;
   }
 
+  UnspentCoinsListViewModel unspentCoinsListViewModel;
+
   SendViewModelBase(
     AppStore appStore,
     this.sendTemplateViewModel,
@@ -71,7 +74,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
     this.balanceViewModel,
     this.contactListViewModel,
     this.transactionDescriptionBox,
-    this.ledgerViewModel, {
+    this.ledgerViewModel,
+    this.unspentCoinsListViewModel, {
     this.coinTypeToSpendFrom = UnspentCoinType.any,
   })  : state = InitialExecutionState(),
         currencies = appStore.wallet!.balance.keys.toList(),
@@ -530,6 +534,16 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       throw Exception('Priority is null for wallet type: ${wallet.type}');
     }
 
+    if (hasCoinControl) {
+      bool isCoinSelected = false;
+      for (var coin in unspentCoinsListViewModel.items) {
+        isCoinSelected = isCoinSelected || (coin.isSending && !coin.isFrozen);
+      }
+      if (!isCoinSelected) {
+        throw Exception("No coin selected in coin control, you need to select a coin in order to spend");
+      }
+    }
+
     switch (wallet.type) {
       case WalletType.bitcoin:
       case WalletType.litecoin:
diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart
index a189ebe6c..e675acf17 100644
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@@ -159,7 +159,7 @@ abstract class TransactionDetailsViewModelBase with Store {
       case WalletType.monero:
         return 'https://monero.com/tx/${txId}';
       case WalletType.bitcoin:
-        return 'https://mempool.space/${wallet.isTestnet ? "testnet/" : ""}tx/${txId}';
+        return 'https://mempool.cakewallet.com/${wallet.isTestnet ? "testnet/" : ""}tx/${txId}';
       case WalletType.litecoin:
         return 'https://blockchair.com/litecoin/transaction/${txId}';
       case WalletType.bitcoinCash:
diff --git a/model_generator.sh b/model_generator.sh
index 293923d1e..730817c24 100755
--- a/model_generator.sh
+++ b/model_generator.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
-cd cw_core; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_evm; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_monero; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_bitcoin; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_haven; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_nano; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_bitcoin_cash; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_solana; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_tron; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
-cd cw_wownero; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
+set -x -e
+
+cd cw_core; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_evm; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_monero; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_bitcoin; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_haven; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_nano; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_bitcoin_cash; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_solana; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_tron; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
+cd cw_wownero; flutter pub get; dart run build_runner build --delete-conflicting-outputs; cd ..
 cd cw_polygon; flutter pub get; cd ..
 cd cw_ethereum; flutter pub get; cd ..
 cd cw_mweb && flutter pub get && cd ..
-flutter packages pub run build_runner build --delete-conflicting-outputs
+dart run build_runner build --delete-conflicting-outputs
+
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index fa70b5837..221f1d9bf 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -3,21 +3,21 @@ dependencies:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-  intl: ^0.18.0
-  url_launcher: ^6.1.4
+  intl: ^0.19.0
+  url_launcher: 6.3.1
   qr_flutter:
     git:
       url: https://github.com/cake-tech/qr.flutter.git
       ref: cake-4.0.2
       version: 4.0.2
-  shared_preferences: ^2.0.15
+  shared_preferences: 2.3.2
   # provider: ^6.0.3
   rxdart: ^0.28.0
   yaml: ^3.1.1
   fast_scanner:
     git:
       url: https://github.com/MrCyjaneK/fast_scanner
-      ref: c8311b46cc67dd02250970a54d2a4526168187f3
+      ref: c5a08720216a508bf1fe3d062ad19d2836545a42
   http: ^1.1.0
   path_provider: ^2.0.11
   mobx: ^2.1.4
@@ -26,23 +26,25 @@ dependencies:
   share_plus: ^10.0.0
   # date_range_picker: ^1.0.6
   #https://api.flutter.dev/flutter/material/showDateRangePicker.html
-  dio: ^4.0.6
+  dio: ^5.7.0
   hive: ^2.2.3
   hive_flutter: ^1.1.0
-  local_auth_android: 1.0.21
+  local_auth_android: ^1.0.46
   flutter_local_authentication:
     git:
       url: https://github.com/cake-tech/flutter_local_authentication
   package_info_plus: ^8.0.1
-  devicelocale:
-    git:
-      url: https://github.com/cake-tech/flutter-devicelocale
+  devicelocale: 0.8.1
   auto_size_text: ^3.0.0
   dotted_border: ^2.0.0+2
   smooth_page_indicator: ^1.0.0+2
-  flutter_inappwebview: ^6.0.0
+  flutter_inappwebview: ^6.1.5
   flutter_spinkit: ^5.1.0
-  uni_links: ^0.5.1
+  uni_links:
+    git:
+      url: https://github.com/MrCyjaneK/uni_links
+      ref: 8e9efa4d9beb19e4ac44009576337f1ce51c22e2
+      path: uni_links
   lottie: ^1.3.0
   animate_do: ^2.1.0
   cupertino_icons: ^1.0.5
@@ -63,12 +65,15 @@ dependencies:
       ref: master
   permission_handler: ^10.0.0
   device_display_brightness:
-    git:
-      url: https://github.com/cake-tech/device_display_brightness.git
-      ref: master
-  workmanager: ^0.5.1
+   git:
+     url: https://github.com/MrCyjaneK/device_display_brightness.git
+     ref: 4cac18c446ce686f3d75b1565badbd7da439bbd9
+  workmanager: ^0.5.2
   wakelock_plus: ^1.2.5
-  flutter_mailer: ^2.0.2
+  flutter_mailer:       
+    git:
+      url: https://github.com/taljacobson/flutter_mailer
+      ref: 2a7d04d61f56e1ca166ab42e91e0daf1bfddfaf2
   device_info_plus: ^9.1.0
   base32: 2.1.3
   in_app_review: ^2.0.6
@@ -77,19 +82,22 @@ dependencies:
       url: https://github.com/cake-tech/cake_backup.git
       ref: main
       version: 1.0.0
-  flutter_plugin_android_lifecycle: 2.0.9
+  flutter_plugin_android_lifecycle: 2.0.23
   path_provider_android: ^2.2.1
-  shared_preferences_android: 2.0.17
-  url_launcher_android: 6.0.24
+  shared_preferences_android: 2.3.3
+  url_launcher_android: 6.3.14
   url_launcher_linux: 3.1.1 # https://github.com/flutter/flutter/issues/153083
-  sensitive_clipboard: ^1.0.0
+  sensitive_clipboard:
+    git:
+      url: https://github.com/MrCyjaneK/sensitive_clipboard
+      ref: 288c7ee2d63b459bc735f7dc89321b29a1f12fae
   walletconnect_flutter_v2: ^2.1.4
   eth_sig_util: ^0.0.9
   ens_dart:
     git:
       url: https://github.com/cake-tech/ens_dart.git
       ref: main
-  fluttertoast: 8.1.4
+  fluttertoast: 8.2.8
 #  tor:
 #    git:
 #      url: https://github.com/cake-tech/tor.git
diff --git a/pubspec_description.yaml b/pubspec_description.yaml
index b51fe96d6..928bc4f1f 100644
--- a/pubspec_description.yaml
+++ b/pubspec_description.yaml
@@ -4,4 +4,4 @@ version: 0.0.0
 publish_to: none
 
 environment:
-  sdk: ">=3.1.0 <4.0.0"
\ No newline at end of file
+  sdk: ^3.5.0
\ No newline at end of file
diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index 9ebab6b6f..25a3d5fa5 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "اختر ممثلًا جديدًا",
   "nanogpt_subtitle": "جميع النماذج الأحدث (GPT-4 ، Claude). \\ nno اشتراك ، ادفع مع Crypto.",
   "narrow": "ضيق",
-  "new_first_wallet_text": "حافظ بسهولة على أمان العملة المشفرة",
+  "new_first_wallet_text": "الحفاظ على سلامة التشفير الخاص بك هو قطعة من الكعكة",
   "new_node_testing": "تجربة العقدة الجديدة",
   "new_subaddress_create": "إنشاء",
   "new_subaddress_label_name": "تسمية",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "قم باستعادة محفظتك من ضغطات المفاتيح المولدة المحفوظة من مفاتيحك الخاصة",
   "restore_description_from_seed": "قم باستعادة محفظتك من الرمز المكون من 25 كلمة أو 13 كلمة",
   "restore_description_from_seed_keys": "استرجع محفظتك من السييد / المفاتيح التي قمت بحفظها في مكان آمن",
+  "restore_existing_wallet": "استعادة محفظة موجودة",
   "restore_from_date_or_blockheight": "الرجاء إدخال تاريخ قبل إنشاء هذه المحفظة ببضعة أيام. أو إذا كنت تعرف ارتفاع البلوك، فيرجى إدخاله بدلاً من ذلك",
   "restore_from_seed_placeholder": "الرجاء إدخال أو لصق السييد الخاصة بك هنا",
   "restore_new_seed": "سييد جديدة",
@@ -670,6 +671,7 @@
   "sent": "تم الأرسال",
   "service_health_disabled": "تم تعطيل نشرة صحة الخدمة",
   "service_health_disabled_message": "هذه هي صفحة نشرة صحة الخدمة ، يمكنك تمكين هذه الصفحة ضمن الإعدادات -> الخصوصية",
+  "set_a_pin": "تعيين دبوس",
   "settings": "إعدادات",
   "settings_all": "الكل",
   "settings_allow_biometrical_authentication": "السماح بالمصادقة البيومترية",
@@ -890,6 +892,7 @@
   "view_transaction_on": "عرض العملية على",
   "voting_weight": "وزن التصويت",
   "waitFewSecondForTxUpdate": "ﺕﻼﻣﺎﻌﻤﻟﺍ ﻞﺠﺳ ﻲﻓ ﺔﻠﻣﺎﻌﻤﻟﺍ ﺲﻜﻌﻨﺗ ﻰﺘﺣ ﻥﺍﻮﺛ ﻊﻀﺒﻟ ﺭﺎﻈﺘﻧﻻﺍ ﻰﺟﺮﻳ",
+  "wallet": "محفظة",
   "wallet_group": "مجموعة محفظة",
   "wallet_group_description_four": "لإنشاء محفظة مع بذرة جديدة تماما.",
   "wallet_group_description_one": "في محفظة الكيك ، يمكنك إنشاء ملف",
@@ -922,6 +925,8 @@
   "wallets": "المحافظ",
   "warning": "تحذير",
   "welcome": "مرحبا بك في",
+  "welcome_subtitle_new_wallet": "إذا كنت ترغب في البدء من جديد ، فانقر فوق إنشاء محفظة جديدة أدناه وستكون خارج السباقات.",
+  "welcome_subtitle_restore_wallet": "إذا كان لديك محفظة موجودة تريد إحضارها إلى كعكة ، فما عليك سوى اختيار استعادة المحفظة الموجودة وسنمشيك خلال العملية.",
   "welcome_to_cakepay": "مرحبا بكم في Cake Pay!",
   "what_is_silent_payments": "ما هي المدفوعات الصامتة؟",
   "widgets_address": "عنوان",
diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb
index 91256938d..ef3dc48df 100644
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Изберете нов представител",
   "nanogpt_subtitle": "Всички най-нови модели (GPT-4, Claude). \\ Nno абонамент, платете с Crypto.",
   "narrow": "Тесен",
-  "new_first_wallet_text": "Лесно пазете криптовалутата си в безопасност",
+  "new_first_wallet_text": "Запазването на криптовалутата ви е парче торта",
   "new_node_testing": "Тестване на нов node",
   "new_subaddress_create": "Създаване",
   "new_subaddress_label_name": "Име на Label",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Възстановяване на портфейл от генерираните от Вашите тайни ключове клавиши",
   "restore_description_from_seed": "Възстановяване на портфейл от кода от 13 или 25 думи",
   "restore_description_from_seed_keys": "Възстановете своя портфейл от seed/keys, които сте съхранили на сигурно място",
+  "restore_existing_wallet": "Възстановете съществуващия портфейл",
   "restore_from_date_or_blockheight": "Моля, въведете дата няколко дни преди създаването на този портфейл. Ако знаете blockheight-а, въведето него вместо това",
   "restore_from_seed_placeholder": "Моля, въведете своя seed тук",
   "restore_new_seed": "Нов seed",
@@ -670,6 +671,7 @@
   "sent": "Изпратени",
   "service_health_disabled": "Service Health Bulletin е деактивиран",
   "service_health_disabled_message": "Това е страницата на Bulletin на Service Health, можете да активирате тази страница в Настройки -> Поверителност",
+  "set_a_pin": "Поставете щифт",
   "settings": "Настройки",
   "settings_all": "Всичко",
   "settings_allow_biometrical_authentication": "Позволяване на биометрично удостоверяване.",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Вижте транзакция на ",
   "voting_weight": "Тегло на гласуване",
   "waitFewSecondForTxUpdate": "Моля, изчакайте няколко секунди, докато транзакцията се отрази в историята на транзакциите",
+  "wallet": "Портфейл",
   "wallet_group": "Група на портфейла",
   "wallet_group_description_four": "За да създадете портфейл с изцяло ново семе.",
   "wallet_group_description_one": "В портфейла за торта можете да създадете a",
@@ -922,6 +925,8 @@
   "wallets": "Портфейли",
   "warning": "Внимание",
   "welcome": "Добре дошли в",
+  "welcome_subtitle_new_wallet": "Ако искате да стартирате свеж, докоснете Създайте нов портфейл по -долу и ще се откажете от състезанията.",
+  "welcome_subtitle_restore_wallet": "Ако имате съществуващ портфейл, който искате да внесете в тортата, просто изберете възстановяване на съществуващия портфейл и ще ви преведем през процеса.",
   "welcome_to_cakepay": "Добре дошли в Cake Pay!",
   "what_is_silent_payments": "Какво са мълчаливи плащания?",
   "widgets_address": "Адрес",
diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb
index 0fe38166c..1e8e9eff6 100644
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Vyberte nového zástupce",
   "nanogpt_subtitle": "Všechny nejnovější modely (GPT-4, Claude). \\ Nno předplatné, plaťte krypto.",
   "narrow": "Úzký",
-  "new_first_wallet_text": "Snadno udržujte svou kryptoměnu v bezpečí",
+  "new_first_wallet_text": "Udržování svého kryptového v bezpečí je kus dortu",
   "new_node_testing": "Testování nového uzlu",
   "new_subaddress_create": "Vytvořit",
   "new_subaddress_label_name": "Popisek",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Obnovte svou peněženku pomocí generovaných stisků kláves uložených z vašich soukromých klíčů",
   "restore_description_from_seed": "Obnovte svou peněženku pomocí kombinace 25, nebo 13 slov",
   "restore_description_from_seed_keys": "Obnovte svou peněženku ze seedu/klíčů, které jste si uložili na bezpečném místě",
+  "restore_existing_wallet": "Obnovte stávající peněženku",
   "restore_from_date_or_blockheight": "Prosím zadejte datum z doby několik dnů před tím, než jste si zakládali tuto peněženku. Nebo místo toho zadejte výšku bloku, pokud ji znáte.",
   "restore_from_seed_placeholder": "Prosím zadejte, nebo vložte ze schránky svůj seed.",
   "restore_new_seed": "Nový seed",
@@ -670,6 +671,7 @@
   "sent": "Odesláno",
   "service_health_disabled": "Bulletin zdraví služeb je deaktivován",
   "service_health_disabled_message": "Toto je stránka Bulletin Service Health Bulletin, můžete tuto stránku povolit v rámci nastavení -> Ochrana osobních údajů",
+  "set_a_pin": "Nastavte špendlík",
   "settings": "Nastavení",
   "settings_all": "VŠE",
   "settings_allow_biometrical_authentication": "Povolit biometrické ověření",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Zobrazit transakci na ",
   "voting_weight": "Hlasová váha",
   "waitFewSecondForTxUpdate": "Počkejte několik sekund, než se transakce projeví v historii transakcí",
+  "wallet": "Peněženka",
   "wallet_group": "Skupina peněženky",
   "wallet_group_description_four": "Vytvoření peněženky s zcela novým semenem.",
   "wallet_group_description_one": "V peněžence dortu můžete vytvořit a",
@@ -922,6 +925,8 @@
   "wallets": "Peněženky",
   "warning": "Varování",
   "welcome": "Vítejte v",
+  "welcome_subtitle_new_wallet": "Pokud chcete začít čerstvě, klepněte na Vytvořit novou peněženku níže a budete na závodech.",
+  "welcome_subtitle_restore_wallet": "Pokud máte existující peněženku, kterou chcete přinést do dortu, jednoduše si vyberte obnovení stávající peněženky a my vás projdeme procesem.",
   "welcome_to_cakepay": "Vítejte v Cake Pay!",
   "what_is_silent_payments": "Co jsou tiché platby?",
   "widgets_address": "Adresa",
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 212ce05f7..871301833 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Wählen Sie einen neuen Vertreter aus",
   "nanogpt_subtitle": "Alle neuesten Modelle (GPT-4, Claude).",
   "narrow": "Eng",
-  "new_first_wallet_text": "Bewahren Sie Ihre Kryptowährung einfach sicher auf",
+  "new_first_wallet_text": "Wenn Sie Ihren Krypto schützen, ist ein Kinderspiel",
   "new_node_testing": "Neuen Knoten testen",
   "new_subaddress_create": "Erstellen",
   "new_subaddress_label_name": "Bezeichnung",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "Stellen Sie Ihr Wallet aus generierten Tastenanschlägen her, die von Ihren privaten Schlüsseln gespeichert wurden",
   "restore_description_from_seed": "Stellen Sie Ihre Wallet aus den 25 Wörtern oder dem 13-Wort-Kombinationscode wieder her",
   "restore_description_from_seed_keys": "Stellen Sie Ihr Wallet aus Seed/Schlüsseln wieder her, die Sie sicher aufbewahrt haben",
+  "restore_existing_wallet": "Bestehende Brieftasche wiederherstellen",
   "restore_from_date_or_blockheight": "Bitte geben Sie ein Datum ein, das einige Tage vor dem Erstellen dieser Wallet liegt. Oder wenn Sie die Blockhöhe kennen, geben Sie stattdessen diese ein",
   "restore_from_seed_placeholder": "Seed bitte hier eingeben oder einfügen",
   "restore_new_seed": "Neuer Seed",
@@ -671,6 +672,7 @@
   "sent": "Versendet",
   "service_health_disabled": "Service Health Bulletin ist deaktiviert",
   "service_health_disabled_message": "Dies ist die Seite \"Service Health Bulletin\", können Sie diese Seite unter Einstellungen -> Privatsphäre aktivieren",
+  "set_a_pin": "Setzen Sie einen Stift",
   "settings": "Einstellungen",
   "settings_all": "ALLE",
   "settings_allow_biometrical_authentication": "Biometrische Authentifizierung zulassen",
@@ -893,6 +895,7 @@
   "voting_weight": "Stimmgewicht",
   "waitFewSecondForTxUpdate": "Bitte warten Sie einige Sekunden, bis die Transaktion im Transaktionsverlauf angezeigt wird",
   "waiting_payment_confirmation": "Warte auf Zahlungsbestätigung",
+  "wallet": "Geldbörse",
   "wallet_group": "Walletgruppe",
   "wallet_group_description_four": "eine Wallet mit einem völlig neuen Seed schaffen.",
   "wallet_group_description_one": "In CakeWallet können Sie eine erstellen",
@@ -925,6 +928,8 @@
   "wallets": "Wallets",
   "warning": "Warnung",
   "welcome": "Willkommen bei",
+  "welcome_subtitle_new_wallet": "Wenn Sie frisch anfangen möchten, tippen Sie unten neue Brieftaschen und Sie werden zu den Rennen gehen.",
+  "welcome_subtitle_restore_wallet": "Wenn Sie über eine vorhandene Brieftasche verfügen, die Sie in Kuchen bringen möchten, wählen Sie einfach die vorhandene Brieftasche wiederherstellen und wir werden Sie durch den Prozess führen.",
   "welcome_to_cakepay": "Willkommen bei Cake Pay!",
   "what_is_silent_payments": "Was sind stille Zahlungen?",
   "widgets_address": "Adresse",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 15e0c04b3..057bc6d6b 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Pick a new representative",
   "nanogpt_subtitle": "All the newest models (GPT-4, Claude).\\nNo subscription, pay with crypto.",
   "narrow": "Narrow",
-  "new_first_wallet_text": "Keep your crypto safe, piece of cake",
+  "new_first_wallet_text": "Keeping your crypto safe is a piece of cake",
   "new_node_testing": "New node testing",
   "new_subaddress_create": "Create",
   "new_subaddress_label_name": "Label name",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Restore your wallet from generated keystrokes saved from your private keys",
   "restore_description_from_seed": "Restore your wallet from either the 25 word or 13 word combination code",
   "restore_description_from_seed_keys": "Get back your wallet from seed/keys that you've saved to secure place",
+  "restore_existing_wallet": "Restore Existing Wallet",
   "restore_from_date_or_blockheight": "Please enter a date a few days before you created this wallet. Or if you know the blockheight, please enter it instead",
   "restore_from_seed_placeholder": "Please enter or paste your seed here",
   "restore_new_seed": "New seed",
@@ -670,6 +671,7 @@
   "sent": "Sent",
   "service_health_disabled": "Service Health Bulletin is disabled",
   "service_health_disabled_message": "This is the service health bulletin page, you can enable this page under Settings -> Privacy",
+  "set_a_pin": "Set a PIN",
   "settings": "Settings",
   "settings_all": "ALL",
   "settings_allow_biometrical_authentication": "Allow biometrical authentication",
@@ -890,6 +892,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "Voting Weight",
   "waitFewSecondForTxUpdate": "Kindly wait for a few seconds for transaction to reflect in transactions history",
+  "wallet": "Wallet",
   "wallet_group": "Wallet Group",
   "wallet_group_description_four": "to create a wallet with an entirely new seed.",
   "wallet_group_description_one": "In Cake Wallet, you can create a",
@@ -922,6 +925,8 @@
   "wallets": "Wallets",
   "warning": "Warning",
   "welcome": "Welcome to",
+  "welcome_subtitle_new_wallet": "If you want to start fresh, tap Create New Wallet below and you'll be off to the races.",
+  "welcome_subtitle_restore_wallet": "If you have an existing wallet you want to bring into Cake, simply choose Restore Existing Wallet and we'll walk you through the process.",
   "welcome_to_cakepay": "Welcome to Cake Pay!",
   "what_is_silent_payments": "What are Silent Payments?",
   "widgets_address": "Address",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 83c0a09f0..c9135f054 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Elija un nuevo representante",
   "nanogpt_subtitle": "Todos los modelos más nuevos (GPT-4, Claude). \\nSin suscripción, pague con cripto.",
   "narrow": "Angosto",
-  "new_first_wallet_text": "Mantén fácilmente tu criptomoneda segura",
+  "new_first_wallet_text": "Mantener su criptografía a salvo es un pedazo de pastel",
   "new_node_testing": "Prueba nuevos nodos",
   "new_subaddress_create": "Crear",
   "new_subaddress_label_name": "Nombre de etiqueta",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "Restaure su billetera de las pulsaciones de teclas generadas guardadas de sus claves privadas",
   "restore_description_from_seed": "Restaure su billetera desde el código de combinación de 25 palabras i de 13 palabras",
   "restore_description_from_seed_keys": "Recupere su billetera de las semillas/claves que ha guardado en un lugar seguro",
+  "restore_existing_wallet": "Restaurar la billetera existente",
   "restore_from_date_or_blockheight": "Ingrese una fecha unos días antes de crear esta billetera. O si conoce la altura del bloque, ingréselo en su lugar",
   "restore_from_seed_placeholder": "Ingrese o pegue su frase de código aquí",
   "restore_new_seed": "Nueva semilla",
@@ -671,6 +672,7 @@
   "sent": "Expedido",
   "service_health_disabled": "El boletín de salud del servicio está deshabilitado",
   "service_health_disabled_message": "Esta es la página del Boletín de Salud del Servicio, puede habilitar esta página en Configuración -> Privacidad",
+  "set_a_pin": "Establecer un alfiler",
   "settings": "Configuraciones",
   "settings_all": "TODOS",
   "settings_allow_biometrical_authentication": "Permitir autenticación biométrica",
@@ -891,6 +893,7 @@
   "view_transaction_on": "Ver transacción en ",
   "voting_weight": "Peso de votación",
   "waitFewSecondForTxUpdate": "Espera unos segundos para que la transacción se refleje en el historial de transacciones.",
+  "wallet": "Billetera",
   "wallet_group": "Grupo de billetera",
   "wallet_group_description_four": "Para crear una billetera con una semilla completamente nueva.",
   "wallet_group_description_one": "En la billetera de pastel, puedes crear un",
@@ -923,6 +926,8 @@
   "wallets": "Carteras",
   "warning": "Advertencia",
   "welcome": "Bienvenido",
+  "welcome_subtitle_new_wallet": "Si desea comenzar de nuevo, toque Crear nueva billetera a continuación y se irá a las carreras.",
+  "welcome_subtitle_restore_wallet": "Si tiene una billetera existente que desea llevar al pastel, simplemente elija Restaurar la billetera existente y lo guiaremos a través del proceso.",
   "welcome_to_cakepay": "¡Bienvenido a Cake Pay!",
   "what_is_silent_payments": "¿Qué son los pagos silenciosos?",
   "widgets_address": "Dirección",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 549ec5275..eaeac58a9 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Choisissez un nouveau représentant",
   "nanogpt_subtitle": "Tous les modèles les plus récents (GPT-4, Claude). \\ NNO abonnement, payez avec crypto.",
   "narrow": "Étroit",
-  "new_first_wallet_text": "Gardez facilement votre crypto-monnaie en sécurité",
+  "new_first_wallet_text": "Garder votre crypto en sécurité est un morceau de gâteau",
   "new_node_testing": "Test du nouveau nœud",
   "new_subaddress_create": "Créer",
   "new_subaddress_label_name": "Nom",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Restaurer votre portefeuille (wallet) d'après les séquences de touches générées d'après vos clefs privées",
   "restore_description_from_seed": "Restaurer votre portefeuille (wallet) depuis une phrase secrète (seed) de 25 ou 13 mots",
   "restore_description_from_seed_keys": "Restaurez votre portefeuille (wallet) depuis une phrase secrète (seed) ou des clefs que vous avez stockées en lieu sûr",
+  "restore_existing_wallet": "Restaurer le portefeuille existant",
   "restore_from_date_or_blockheight": "Merci d'entrer une date antérieure de quelques jours à la date de création de votre portefeuille (wallet). Ou si vous connaissez la hauteur de bloc, merci de la spécifier plutôt qu'une date",
   "restore_from_seed_placeholder": "Merci d'entrer ou de coller votre phrase secrète (seed) ici",
   "restore_new_seed": "Nouvelle phrase secrète (seed)",
@@ -670,6 +671,7 @@
   "sent": "Envoyés",
   "service_health_disabled": "Le bulletin de santé du service est handicapé",
   "service_health_disabled_message": "Ceci est la page du Bulletin de santé du service, vous pouvez activer cette page sous Paramètres -> Confidentialité",
+  "set_a_pin": "Régler une goupille",
   "settings": "Paramètres",
   "settings_all": "TOUT",
   "settings_allow_biometrical_authentication": "Autoriser l'authentification biométrique",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Voir la Transaction sur ",
   "voting_weight": "Poids de vote",
   "waitFewSecondForTxUpdate": "Veuillez attendre quelques secondes pour que la transaction soit reflétée dans l'historique des transactions.",
+  "wallet": "Portefeuille",
   "wallet_group": "Groupe de portefeuille",
   "wallet_group_description_four": "Pour créer un portefeuille avec une graine entièrement nouvelle.",
   "wallet_group_description_one": "Dans Cake Wallet, vous pouvez créer un",
@@ -919,9 +922,11 @@
   "wallet_seed_legacy": "Graine de portefeuille hérité",
   "wallet_store_monero_wallet": "Portefeuille (Wallet) Monero",
   "walletConnect": "WalletConnect",
-  "wallets": "Portefeuilles (Wallets)",
+  "wallets": "Portefeuilles",
   "warning": "Avertissement",
   "welcome": "Bienvenue sur",
+  "welcome_subtitle_new_wallet": "Si vous souhaitez recommencer à créer un nouveau portefeuille ci-dessous et vous serez parti pour les courses.",
+  "welcome_subtitle_restore_wallet": "Si vous avez un portefeuille existant que vous souhaitez apporter dans le gâteau, choisissez simplement restaurer le portefeuille existant et nous vous guiderons tout au long du processus.",
   "welcome_to_cakepay": "Bienvenue sur Cake Pay !",
   "what_is_silent_payments": "Qu'est-ce que les paiements silencieux?",
   "widgets_address": "Adresse",
diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb
index 222a9cf2f..6a0713d6d 100644
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Dauki sabon wakili",
   "nanogpt_subtitle": "Duk sabbin samfuran (GPT-4, CLODE). \\ NNO biyan kuɗi, biya tare da crypto.",
   "narrow": "kunkuntar",
-  "new_first_wallet_text": "A sauƙaƙe kiyaye kuzarin ku",
+  "new_first_wallet_text": "Tsayawa kayatar da lafiya",
   "new_node_testing": "Sabbin gwajin kumburi",
   "new_subaddress_create": "Ƙirƙiri",
   "new_subaddress_label_name": "Lakabin suna",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "Maido da walat ɗin ku daga maɓallan maɓalli da aka ƙera da aka ajiye daga maɓallan ku na sirri",
   "restore_description_from_seed": "Dawo da kwalinku daga 25 ko 13 lambar haɗin kalma",
   "restore_description_from_seed_keys": "Maido da walat ɗin ku daga iri/maɓallan da kuka adana don amintaccen wuri",
+  "restore_existing_wallet": "Dawo da walat ɗin da yake",
   "restore_from_date_or_blockheight": "Don Allah shigar da wata kwanan a kafin ku ƙirƙirar wannan kwalinku. Ko idan kun san blockheight, don Allah shigar da shi",
   "restore_from_seed_placeholder": "Da fatan za a shigar da ko manna maɓallin ku a nan",
   "restore_new_seed": "Sabon iri",
@@ -672,6 +673,7 @@
   "sent": "Aika",
   "service_health_disabled": "Ba a kashe Bayar da Kiwon Lafiya",
   "service_health_disabled_message": "Wannan shafin yanar gizo mai kula da sabis ne, zaka iya kunna wannan shafin a karkashin saiti -> Sirri",
+  "set_a_pin": "Saita PIN",
   "settings": "Saiti",
   "settings_all": "DUK",
   "settings_allow_biometrical_authentication": "Bada izinin tantance sawun yatsa",
@@ -892,6 +894,7 @@
   "view_transaction_on": "Dubo aikace-aikacen akan",
   "voting_weight": "Nauyi mai nauyi",
   "waitFewSecondForTxUpdate": "Da fatan za a jira ƴan daƙiƙa don ciniki don yin tunani a tarihin ma'amala",
+  "wallet": "Zabira",
   "wallet_group": "Wallet kungiyar",
   "wallet_group_description_four": "Don ƙirƙirar walat tare da sabon iri.",
   "wallet_group_description_one": "A cikin walat walat, zaka iya ƙirƙirar",
@@ -924,6 +927,8 @@
   "wallets": "Wallets",
   "warning": "Gargadi",
   "welcome": "Barka da zuwa",
+  "welcome_subtitle_new_wallet": "Idan kana son farawa sabo ne, matsa Newirƙiri Sabuwar Wallow a ƙasa kuma za ka tafi da tsere.",
+  "welcome_subtitle_restore_wallet": "Idan kuna da walat ɗin da kuke son shigo da cake, kawai zaɓi a cikin walat ɗin da yake ciki kuma za mu bi ku ta hanyar aiwatarwa.",
   "welcome_to_cakepay": "Barka da zuwa Cake Pay!",
   "what_is_silent_payments": "Menene biyan shiru?",
   "widgets_address": "Adireshin",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 1b2f3a1b3..f1e294d22 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "एक नया प्रतिनिधि चुनें",
   "nanogpt_subtitle": "सभी नवीनतम मॉडल (GPT-4, क्लाउड)। \\ nno सदस्यता, क्रिप्टो के साथ भुगतान करें।",
   "narrow": "सँकरा",
-  "new_first_wallet_text": "आसानी से अपनी क्रिप्टोक्यूरेंसी को सुरक्षित रखें",
+  "new_first_wallet_text": "अपने क्रिप्टो को सुरक्षित रखना केक का एक टुकड़ा है",
   "new_node_testing": "नई नोड परीक्षण",
   "new_subaddress_create": "सर्जन करना",
   "new_subaddress_label_name": "लेबल का नाम",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "अपने वॉलेट को जेनरेट से पुनर्स्थापित करें आपकी निजी कुंजी से कीस्ट्रोक्स सहेजे गए",
   "restore_description_from_seed": "या तो 25 शब्द से अपने वॉलेट को पुनर्स्थापित करें या 13 शब्द संयोजन कोड",
   "restore_description_from_seed_keys": "अपने बटुए को बीज से वापस लें/वे कुंजियाँ जिन्हें आपने सुरक्षित स्थान पर सहेजा है",
+  "restore_existing_wallet": "मौजूदा बटुए को पुनर्स्थापित करें",
   "restore_from_date_or_blockheight": "कृपया इस वॉलेट को बनाने से कुछ दिन पहले एक तारीख दर्ज करें। या यदि आप ब्लॉकचेट जानते हैं, तो कृपया इसके बजाय इसे दर्ज करें",
   "restore_from_seed_placeholder": "कृपया अपना कोड वाक्यांश यहां दर्ज करें या पेस्ट करें",
   "restore_new_seed": "नया बीज",
@@ -672,6 +673,7 @@
   "sent": "भेज दिया",
   "service_health_disabled": "सेवा स्वास्थ्य बुलेटिन अक्षम है",
   "service_health_disabled_message": "यह सेवा स्वास्थ्य बुलेटिन पृष्ठ है, आप इस पृष्ठ को सेटिंग्स के तहत सक्षम कर सकते हैं -> गोपनीयता",
+  "set_a_pin": "एक पिन सेट करना",
   "settings": "समायोजन",
   "settings_all": "सब",
   "settings_allow_biometrical_authentication": "बायोमेट्रिक प्रमाणीकरण की अनुमति दें",
@@ -892,6 +894,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "वोटिंग वेट",
   "waitFewSecondForTxUpdate": "लेन-देन इतिहास में लेन-देन प्रतिबिंबित होने के लिए कृपया कुछ सेकंड प्रतीक्षा करें",
+  "wallet": "बटुआ",
   "wallet_group": "बटुए समूह",
   "wallet_group_description_four": "एक पूरी तरह से नए बीज के साथ एक बटुआ बनाने के लिए।",
   "wallet_group_description_one": "केक बटुए में, आप एक बना सकते हैं",
@@ -924,6 +927,8 @@
   "wallets": "पर्स",
   "warning": "चेतावनी",
   "welcome": "स्वागत हे सेवा मेरे",
+  "welcome_subtitle_new_wallet": "यदि आप ताजा शुरू करना चाहते हैं, तो नीचे नया बटुआ बनाएं और आप दौड़ से दूर हो जाएंगे।",
+  "welcome_subtitle_restore_wallet": "यदि आपके पास एक मौजूदा बटुआ है जिसे आप केक में लाना चाहते हैं, तो बस मौजूदा बटुए को पुनर्स्थापित करें और हम आपको प्रक्रिया के माध्यम से चलेंगे।",
   "welcome_to_cakepay": "केकपे में आपका स्वागत है!",
   "what_is_silent_payments": "मूक भुगतान क्या है?",
   "widgets_address": "पता",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 4e106fdf6..6b9f20259 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Odaberite novog predstavnika",
   "nanogpt_subtitle": "Svi najnoviji modeli (GPT-4, Claude). \\ NNO pretplata, plaćajte kripto.",
   "narrow": "Usko",
-  "new_first_wallet_text": "Jednostavno čuvajte svoju kripto valutu",
+  "new_first_wallet_text": "Čuvanje kriptovaluta je komad torte",
   "new_node_testing": "Provjera novog nodea",
   "new_subaddress_create": "Izradi",
   "new_subaddress_label_name": "Oznaka",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Oporavi novčanik pomoću generiranih pritisaka na tipke spremljenih od vlastitih privatnih ključeva (keys)",
   "restore_description_from_seed": "Oporavi novčanik pomoću koda koji sadrži kombinaciju od 25 ili 13 riječi",
   "restore_description_from_seed_keys": "Oporavi novčanik pomoću pristupnog izraza/ključa spremljenog na sigurno mjesto",
+  "restore_existing_wallet": "Vratite postojeći novčanik",
   "restore_from_date_or_blockheight": "Molimo unesite datum od nekoliko dana prije nego što ste izradili ovaj novčanik ili ako znate visinu bloka, molimo unesite je.",
   "restore_from_seed_placeholder": "Molimo unesite ili zalijepite svoj pristupni izraz ovdje",
   "restore_new_seed": "Novi pristupi izraz",
@@ -670,6 +671,7 @@
   "sent": "Poslano",
   "service_health_disabled": "Zdravstveni bilten usluge je onemogućen",
   "service_health_disabled_message": "Ovo je stranica zdravstvenog biltena o usluzi, možete omogućiti ovu stranicu pod postavkama -> privatnost",
+  "set_a_pin": "Postavite pin",
   "settings": "Postavke",
   "settings_all": "SVE",
   "settings_allow_biometrical_authentication": "Dopusti biometrijsku autentifikaciju",
@@ -890,6 +892,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "Težina glasanja",
   "waitFewSecondForTxUpdate": "Pričekajte nekoliko sekundi da se transakcija prikaže u povijesti transakcija",
+  "wallet": "Novčanik",
   "wallet_group": "Skupina novčanika",
   "wallet_group_description_four": "Da biste stvorili novčanik s potpuno novim sjemenom.",
   "wallet_group_description_one": "U novčaniku kolača možete stvoriti a",
@@ -922,6 +925,8 @@
   "wallets": "Novčanici",
   "warning": "Upozorenje",
   "welcome": "Dobrodošli na",
+  "welcome_subtitle_new_wallet": "Ako želite započeti svježe, dodirnite Create New Wallet u nastavku i krenite na utrke.",
+  "welcome_subtitle_restore_wallet": "Ako imate postojeći novčanik koji želite unijeti u tortu, jednostavno odaberite Vratite postojeći novčanik i prošetat ćemo vas kroz postupak.",
   "welcome_to_cakepay": "Dobro došli u Cake Pay!",
   "what_is_silent_payments": "Što je tiha plaćanja?",
   "widgets_address": "Adresa",
diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb
index 40142ca5b..d3d7987d2 100644
--- a/res/values/strings_hy.arb
+++ b/res/values/strings_hy.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Ընտրեք նոր ներկայացուցիչ",
   "nanogpt_subtitle": "Բոլոր ամենանոր մոդելներ (GPT-4, Claude).\\nԱռանց բաժանորդագրության, վճարեք կրիպտոարժույթով",
   "narrow": "Նեղ",
-  "new_first_wallet_text": "Ինչպես պահել ձեր կրիպտոգրաֆիան անվտանգ, կարկանդակ",
+  "new_first_wallet_text": "Ձեր ծպտյալ անվտանգ պահելը տորթի մի կտոր է",
   "new_node_testing": "Նոր հանգույցի փորձարկում",
   "new_subaddress_create": "Ստեղծել",
   "new_subaddress_label_name": "Պիտակի անուն",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Վերականգնեք ձեր դրամապանակը ձեր գախտնի բանալիների հիման վրա ստեղծված մուտքագրումներից",
   "restore_description_from_seed": "Վերականգնեք ձեր դրամապպանակը 25 բառերի կամ 13 բառերի համադրությամբ",
   "restore_description_from_seed_keys": "Վերականգնեք ձեր դրամապանակը սերմից/բանալիներից, որը դուք պահպանել եք ապահով վայրում",
+  "restore_existing_wallet": "Վերականգնել առկա դրամապանակը",
   "restore_from_date_or_blockheight": "Խնդրում ենք մուտքագրել այն ամսաթիվը, երբ դուք ստեղծել եք այս դրամապանակը։ Կամ, եթե դուք գիտեք բլոկի բարձրությունը, խնդրում ենք մուտքագրել այն",
   "restore_from_seed_placeholder": "Խնդրում ենք մուտքագրել կամ տեղադրել ձեր սերմը այստեղ",
   "restore_new_seed": "Նոր սերմ",
@@ -670,6 +671,7 @@
   "sent": "Ուղարկված",
   "service_health_disabled": "Ծառայության առողջությունը անջատված է",
   "service_health_disabled_message": "Սա ծառայության առողջության էջն է, դուք կարող եք այս էջը միացնել Կարգավորումներ -> Գաղտնիություն",
+  "set_a_pin": "Սեփական քորոց սահմանեք",
   "settings": "Կարգավորումներ",
   "settings_all": "Բոլորը",
   "settings_allow_biometrical_authentication": "Թույլատրել կենսաչափական վավերացում",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Դիտել Գործարքը ",
   "voting_weight": "Քվեարկության Քաշ",
   "waitFewSecondForTxUpdate": "Խնդրում ենք սպասել մի քանի վայրկյան, որպեսզի գործարքը արտացոլվի գործարքների պատմության մեջ",
+  "wallet": "Դրամապանակ",
   "wallet_group": "Դրամապանակների խումբ",
   "wallet_group_description_four": "Ամբողջովին նոր սերմով դրամապանակ ստեղծելու համար:",
   "wallet_group_description_one": "Տորթի դրամապանակում կարող եք ստեղծել ա",
@@ -922,6 +925,8 @@
   "wallets": "Դրամապանակներ",
   "warning": "Զգուշացում",
   "welcome": "Բարի գալուստ",
+  "welcome_subtitle_new_wallet": "Եթե ​​ցանկանում եք սկսել թարմ, հպեք Ստեղծեք նոր դրամապանակ ներքեւում եւ դուրս կգաք ցեղերի:",
+  "welcome_subtitle_restore_wallet": "Եթե ​​ունեք գոյություն ունեցող դրամապանակ, որը ցանկանում եք տորթի մեջ մտցնել, պարզապես ընտրեք վերականգնել առկա դրամապանակը, եւ մենք ձեզ քայլելու ենք գործընթացի միջոցով:",
   "welcome_to_cakepay": "Բարի գալուստ Cake Pay!",
   "what_is_silent_payments": "Ի՞նչ է Լուռ Վճարումները:",
   "widgets_address": "Հասցե",
diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb
index 04336b76e..fae208549 100644
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Pilih perwakilan baru",
   "nanogpt_subtitle": "Semua model terbaru (GPT-4, Claude). \\ Nno langganan, bayar dengan crypto.",
   "narrow": "Sempit",
-  "new_first_wallet_text": "Dengan mudah menjaga cryptocurrency Anda aman",
+  "new_first_wallet_text": "Menjaga crypto Anda aman adalah sepotong kue",
   "new_node_testing": "Pengujian node baru",
   "new_subaddress_create": "Buat",
   "new_subaddress_label_name": "Nama label",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "Pulihkan dompet Anda dari tombol yang dihasilkan yang disimpan dari kunci pribadi Anda",
   "restore_description_from_seed": "Pulihkan dompet Anda dari kombinasi kode 25 atau 13 kata",
   "restore_description_from_seed_keys": "Dapatkan kembali dompet Anda dari seed/kunci yang Anda simpan di tempat yang aman",
+  "restore_existing_wallet": "Kembalikan dompet yang ada",
   "restore_from_date_atau_blockheight": "Silakan masukkan tanggal beberapa hari sebelum Anda membuat dompet ini. Atau jika Anda tahu blockheight, silakan masukkannya sebagai gantinya",
   "restore_from_date_or_blockheight": "Harap masukkan tanggal beberapa hari sebelum Anda membuat dompet ini. Atau jika Anda tahu blockheight, silakan masukkan sebagai gantinya",
   "restore_from_seed_placeholder": "Silakan masukkan atau tempel seed Anda di sini",
@@ -673,6 +674,7 @@
   "sent": "Dikirim",
   "service_health_disabled": "Buletin Kesehatan Layanan dinonaktifkan",
   "service_health_disabled_message": "Ini adalah halaman Buletin Kesehatan Layanan, Anda dapat mengaktifkan halaman ini di bawah Pengaturan -> Privasi",
+  "set_a_pin": "Atur pin",
   "settings": "Pengaturan",
   "settings_all": "SEMUA",
   "settings_allow_biometrical_authentication": "Izinkan otentikasi biometrik",
@@ -893,6 +895,7 @@
   "view_transaction_on": "Lihat Transaksi di ",
   "voting_weight": "Berat voting",
   "waitFewSecondForTxUpdate": "Mohon tunggu beberapa detik hingga transaksi terlihat di riwayat transaksi",
+  "wallet": "Dompet",
   "wallet_group": "Kelompok dompet",
   "wallet_group_description_four": "Untuk membuat dompet dengan benih yang sama sekali baru.",
   "wallet_group_description_one": "Di dompet kue, Anda dapat membuat file",
@@ -925,6 +928,8 @@
   "wallets": "Dompet",
   "warning": "Peringatan",
   "welcome": "Selamat datang di",
+  "welcome_subtitle_new_wallet": "Jika Anda ingin memulai segar, ketuk membuat dompet baru di bawah ini dan Anda akan pergi ke balapan.",
+  "welcome_subtitle_restore_wallet": "Jika Anda memiliki dompet yang ada yang ingin Anda bawa ke dalam kue, cukup pilih kembalikan dompet yang ada dan kami akan memandu Anda melalui prosesnya.",
   "welcome_to_cakepay": "Selamat Datang di Cake Pay!",
   "what_is_silent_payments": "Apa itu pembayaran diam?",
   "widgets_address": "Alamat",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index ad15ab3a9..e6e4928c5 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -428,7 +428,7 @@
   "nano_pick_new_rep": "Scegli un nuovo rappresentante",
   "nanogpt_subtitle": "Tutti i modelli più recenti (GPT-4, Claude). Abbonamento nno, paga con cripto.",
   "narrow": "Stretto",
-  "new_first_wallet_text": "Mantieni facilmente la tua criptovaluta al sicuro",
+  "new_first_wallet_text": "Mantenere la tua criptovaluta è un pezzo di torta",
   "new_node_testing": "Test novo nodo",
   "new_subaddress_create": "Crea",
   "new_subaddress_label_name": "Nome etichetta",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "Recupera il tuo portafoglio da una sequenza di caratteri generati dalle tue chiavi private",
   "restore_description_from_seed": "Recupera il tuo portafoglio da una combinazione di 25 o 13 parole",
   "restore_description_from_seed_keys": "Recupera il tuo portafoglio dal seme/chiavi che hai salvato in un posto sicuro",
+  "restore_existing_wallet": "Ripristina il portafoglio esistente",
   "restore_from_date_or_blockheight": "Gentilmente inserisci la data di un paio di giorni prima che hai creato questo portafoglio. Oppure inserisci l'altezza del blocco se la conosci",
   "restore_from_seed_placeholder": "Gentilmente inserisci o incolla il tuo seme qui",
   "restore_new_seed": "Nuovo seme",
@@ -672,6 +673,7 @@
   "sent": "Inviato",
   "service_health_disabled": "Il Bollettino sanitario di servizio è disabilitato",
   "service_health_disabled_message": "Questa è la pagina del Bollettino sanitario del servizio, è possibile abilitare questa pagina in Impostazioni -> Privacy",
+  "set_a_pin": "Imposta un pin",
   "settings": "Impostazioni",
   "settings_all": "TUTTO",
   "settings_allow_biometrical_authentication": "Consenti autenticazione biometrica",
@@ -893,6 +895,7 @@
   "voting_weight": "Peso di voto",
   "waitFewSecondForTxUpdate": "Attendi qualche secondo affinché la transazione venga riflessa nella cronologia delle transazioni",
   "waiting_payment_confirmation": "In attesa di conferma del pagamento",
+  "wallet": "Portafoglio",
   "wallet_group": "Gruppo di portafoglio",
   "wallet_group_description_four": "Per creare un portafoglio con un seme completamente nuovo.",
   "wallet_group_description_one": "Nel portafoglio di torte, puoi creare un",
@@ -925,6 +928,8 @@
   "wallets": "Portafogli",
   "warning": "Avvertimento",
   "welcome": "Benvenuto",
+  "welcome_subtitle_new_wallet": "Se vuoi ricominciare da capo, tocca Crea un nuovo portafoglio di seguito e sarai alle gare.",
+  "welcome_subtitle_restore_wallet": "Se hai un portafoglio esistente che vuoi portare nella torta, scegli semplicemente il ripristino del portafoglio esistente e ti guideremo attraverso il processo.",
   "welcome_to_cakepay": "Benvenuto in Cake Pay!",
   "what_is_silent_payments": "Che cos'è i pagamenti silenziosi?",
   "widgets_address": "Indirizzo",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 520a73ade..fd4d83cc8 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -428,7 +428,7 @@
   "nano_pick_new_rep": "新しい代表者を選びます",
   "nanogpt_subtitle": "すべての最新モデル（GPT-4、Claude）。\\ nnoサブスクリプション、暗号で支払います。",
   "narrow": "狭い",
-  "new_first_wallet_text": "暗号通貨を簡単に安全に保ちます",
+  "new_first_wallet_text": "暗号を安全に保つことはケーキです",
   "new_node_testing": "新しいノードのテスト",
   "new_subaddress_create": "作成する",
   "new_subaddress_label_name": "ラベル名",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "生成されたウォレットを復元します秘密鍵から保存されたキーストローク",
   "restore_description_from_seed": "25ワードからウォレットを復元しますまたは13ワードの組み合わせコード",
   "restore_description_from_seed_keys": "安全な場所に保存したシード/キーから財布を取り戻す",
+  "restore_existing_wallet": "既存のウォレットを復元します",
   "restore_from_date_or_blockheight": "このウォレットを作成する数日前に日付を入力してください。 または、ブロックの高さがわかっている場合は、代わりに入力してください",
   "restore_from_seed_placeholder": "ここにコードフレーズを入力または貼り付けてください",
   "restore_new_seed": "新しい種",
@@ -671,6 +672,7 @@
   "sent": "送信済み",
   "service_health_disabled": "サービスヘルス速報は無効です",
   "service_health_disabled_message": "これはService Health Bulletinページです。設定の下でこのページを有効にすることができます - >プライバシー",
+  "set_a_pin": "ピンを設定します",
   "settings": "設定",
   "settings_all": "すべて",
   "settings_allow_biometrical_authentication": "生体認証を許可する",
@@ -891,6 +893,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "投票重み",
   "waitFewSecondForTxUpdate": "取引履歴に取引が反映されるまで数秒お待ちください。",
+  "wallet": "財布",
   "wallet_group": "ウォレットグループ",
   "wallet_group_description_four": "まったく新しい種子の財布を作成します。",
   "wallet_group_description_one": "ケーキウォレットでは、aを作成できます",
@@ -923,6 +926,8 @@
   "wallets": "財布",
   "warning": "警告",
   "welcome": "ようこそ に",
+  "welcome_subtitle_new_wallet": "新鮮な開始したい場合は、以下の新しい財布を作成すると、レースに出かけることができます。",
+  "welcome_subtitle_restore_wallet": "ケーキに持ち込みたい既存のウォレットがある場合は、既存のウォレットを復元するだけで、プロセスを説明します。",
   "welcome_to_cakepay": "Cake Payへようこそ！",
   "what_is_silent_payments": "サイレント支払いとは何ですか？",
   "widgets_address": "住所",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 1d9748866..6fce665ec 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "새로운 담당자를 선택하십시오",
   "nanogpt_subtitle": "모든 최신 모델 (GPT-4, Claude). \\ nno 구독, Crypto로 지불하십시오.",
   "narrow": "좁은",
-  "new_first_wallet_text": "cryptocurrency를 쉽게 안전하게 유지하십시오",
+  "new_first_wallet_text": "암호화를 안전하게 유지하는 것은 케이크 조각입니다",
   "new_node_testing": "새로운 노드 테스트",
   "new_subaddress_create": "몹시 떠들어 대다",
   "new_subaddress_label_name": "라벨 이름",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "개인 키에서 저장된 생성 된 키 스트로크에서 월렛 복원",
   "restore_description_from_seed": "25 단어 또는 13 단어 조합 코드에서 지갑을 복원하십시오.",
   "restore_description_from_seed_keys": "안전한 장소에 저장 한 종자 / 키로 지갑을 되 찾으십시오.",
+  "restore_existing_wallet": "기존 지갑을 복원하십시오",
   "restore_from_date_or_blockheight": "이 지갑을 생성하기 며칠 전에 날짜를 입력하십시오. 또는 블록 높이를 알고있는 경우 대신 입력하십시오.",
   "restore_from_seed_placeholder": "여기에 코드 문구를 입력하거나 붙여 넣으십시오.",
   "restore_new_seed": "새로운 씨앗",
@@ -671,6 +672,7 @@
   "sent": "보냄",
   "service_health_disabled": "서비스 건강 게시판이 장애가되었습니다",
   "service_health_disabled_message": "이것은 서비스 건강 게시판 페이지입니다. 설정 에서이 페이지를 활성화 할 수 있습니다 -> 개인 정보",
+  "set_a_pin": "핀을 설정하십시오",
   "settings": "설정",
   "settings_all": "모든",
   "settings_allow_biometrical_authentication": "생체 인증 허용",
@@ -891,6 +893,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "투표 중량",
   "waitFewSecondForTxUpdate": "거래 내역에 거래가 반영될 때까지 몇 초 정도 기다려 주세요.",
+  "wallet": "지갑",
   "wallet_group": "지갑 그룹",
   "wallet_group_description_four": "완전히 새로운 씨앗으로 지갑을 만듭니다.",
   "wallet_group_description_one": "케이크 지갑에서는 a를 만들 수 있습니다",
@@ -923,6 +926,8 @@
   "wallets": "지갑",
   "warning": "경고",
   "welcome": "환영 에",
+  "welcome_subtitle_new_wallet": "신선하게 시작하려면 아래에서 새 지갑을 만들면 레이스로 떠날 것입니다.",
+  "welcome_subtitle_restore_wallet": "케이크에 가져 오려는 기존 지갑이 있다면 기존 지갑 복원을 선택하면 프로세스를 안내해 드리겠습니다.",
   "welcome_to_cakepay": "Cake Pay에 오신 것을 환영합니다!",
   "what_is_silent_payments": "조용한 지불이란 무엇입니까?",
   "widgets_address": "주소",
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index e6be67060..e933010fd 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "အသစ်တစ်ခုကိုရွေးပါ",
   "nanogpt_subtitle": "အားလုံးနောက်ဆုံးပေါ်မော်ဒယ်များ (GPT-4, Claude) ။ \\ nno subscription, crypto နှင့်အတူပေးဆောင်။",
   "narrow": "ကျဉ်းသော",
-  "new_first_wallet_text": "သင့်ရဲ့ cryptocurrencrencres ကိုအလွယ်တကူလုံခြုံစွာထားရှိပါ",
+  "new_first_wallet_text": "သင်၏ Crypto Safe ကိုလုံခြုံအောင်ပြုလုပ်ခြင်းသည်ကိတ်မုန့်တစ်မျိုးဖြစ်သည်",
   "new_node_testing": "နှာခေါင်း အသစ်စမ်းသပ်ခြင်း။",
   "new_subaddress_create": "ဖန်တီးပါ။",
   "new_subaddress_label_name": "အညွှန်းအမည်",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "သင့်ကိုယ်ပိုင်သော့များမှ သိမ်းဆည်းထားသော ထုတ်ပေးထားသော သော့ချက်များမှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
   "restore_description_from_seed": "25 စကားလုံး သို့မဟုတ် 13 စကားလုံးပေါင်းစပ်ကုဒ်မှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
   "restore_description_from_seed_keys": "သင့်ပိုက်ဆံအိတ်ကို လုံခြုံသောနေရာတွင် သိမ်းဆည်းထားသော မျိုးစေ့/သော့များမှ ပြန်လည်ရယူပါ။",
+  "restore_existing_wallet": "ရှိပြီးသားပိုက်ဆံအိတ်ကို restore",
   "restore_from_date_or_blockheight": "ဤပိုက်ဆံအိတ်ကို သင်မဖန်တီးမီ ရက်အနည်းငယ်အလိုတွင် ရက်စွဲတစ်ခု ထည့်သွင်းပါ။ သို့မဟုတ် ဘလော့ခ်ဟိုက် ကို သိပါက ၎င်းအစား ၎င်းကို ထည့်ပါ။",
   "restore_from_seed_placeholder": "သင့်အစေ့ကို ဤနေရာတွင် ထည့်ပါ သို့မဟုတ် ကူးထည့်ပါ။",
   "restore_new_seed": "မျိုးစေ့အသစ်",
@@ -670,6 +671,7 @@
   "sent": "ပို့လိုက်ပါတယ်။",
   "service_health_disabled": "ဝန်ဆောင်မှုကျန်းမာရေးစာစောင်အားပိတ်ထားသည်",
   "service_health_disabled_message": "ဤသည်မှာ 0 န်ဆောင်မှုကျန်းမာရေးစာစောင်စာမျက်နှာတွင်ဤစာမျက်နှာကို Settings အောက်တွင်ဖွင့်ထားနိုင်သည်",
+  "set_a_pin": "PIN နံပါတ်ကိုသတ်မှတ်ပါ",
   "settings": "ဆက်တင်များ",
   "settings_all": "အားလုံး",
   "settings_allow_biometrical_authentication": "ဇီဝဗေဒဆိုင်ရာ အထောက်အထားစိစစ်ခြင်းကို ခွင့်ပြုပါ။",
@@ -890,6 +892,7 @@
   "view_transaction_on": "ငွေလွှဲခြင်းကို ဖွင့်ကြည့်ပါ။",
   "voting_weight": "မဲပေးအလေးချိန်",
   "waitFewSecondForTxUpdate": "ငွေပေးငွေယူ မှတ်တမ်းတွင် ရောင်ပြန်ဟပ်ရန် စက္ကန့်အနည်းငယ်စောင့်ပါ။",
+  "wallet": "ပိုက်ဆံအိတ်",
   "wallet_group": "ပိုက်ဆံအိတ်အုပ်စု",
   "wallet_group_description_four": "လုံးဝအသစ်သောမျိုးစေ့နှင့်အတူပိုက်ဆံအိတ်ဖန်တီးရန်။",
   "wallet_group_description_one": "ကိတ်မုန့်၌, သင်တစ် ဦး ဖန်တီးနိုင်ပါတယ်",
@@ -922,6 +925,8 @@
   "wallets": "ပိုက်ဆံအိတ်",
   "warning": "သတိပေးချက်",
   "welcome": "မှကြိုဆိုပါတယ်။",
+  "welcome_subtitle_new_wallet": "လတ်ဆတ်စွာစတင်လိုပါကအောက်ကပိုက်ဆံအိတ်အသစ်ကိုဖန်တီးပါ။",
+  "welcome_subtitle_restore_wallet": "အကယ်. သင့်တွင်သင်ကိတ်မုန့်ထဲသို့ယူဆောင်လိုသောလက်ရှိပိုက်ဆံအိတ်ရှိပါက Restore Lestore Wallet ကိုရွေးပါ။",
   "welcome_to_cakepay": "Cake Pay မှကြိုဆိုပါသည်။",
   "what_is_silent_payments": "အသံတိတ်ငွေပေးချေမှုဆိုတာဘာလဲ",
   "widgets_address": "လိပ်စာ",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 82c3899d4..fc6496c3f 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Kies een nieuwe vertegenwoordiger",
   "nanogpt_subtitle": "Alle nieuwste modellen (GPT-4, Claude). \\ Nno-abonnement, betalen met crypto.",
   "narrow": "Smal",
-  "new_first_wallet_text": "Houd uw cryptocurrency gemakkelijk veilig",
+  "new_first_wallet_text": "Je crypto veilig houden is een fluitje van een cent",
   "new_node_testing": "Nieuwe knooppunttest",
   "new_subaddress_create": "Creëren",
   "new_subaddress_label_name": "Label naam",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Herstel uw portemonnee van gegenereerd toetsaanslagen opgeslagen van uw privésleutels",
   "restore_description_from_seed": "Herstel uw portemonnee van het 25 woord of 13 woord combinatiecode",
   "restore_description_from_seed_keys": "Ontvang uw portemonnee terug uit seed / keys die u hebt opgeslagen op een veilige plaats",
+  "restore_existing_wallet": "Herstel de bestaande portemonnee",
   "restore_from_date_or_blockheight": "Voer een datum in een paar dagen voordat u deze portemonnee heeft gemaakt. Of als u de blokhoogte kent, voert u deze in",
   "restore_from_seed_placeholder": "Voer hier uw codefrase in of plak deze",
   "restore_new_seed": "Nieuw zaad",
@@ -670,6 +671,7 @@
   "sent": "Verzonden",
   "service_health_disabled": "Service Health Bulletin is uitgeschakeld",
   "service_health_disabled_message": "Dit is de Service Health Bulletin -pagina, u kunt deze pagina instellingen inschakelen -> Privacy",
+  "set_a_pin": "Zet een speld",
   "settings": "Instellingen",
   "settings_all": "ALLE",
   "settings_allow_biometrical_authentication": "Biometrische authenticatie toestaan",
@@ -891,6 +893,7 @@
   "voting_weight": "Stemgewicht",
   "waitFewSecondForTxUpdate": "Wacht een paar seconden totdat de transactie wordt weergegeven in de transactiegeschiedenis",
   "waiting_payment_confirmation": "In afwachting van betalingsbevestiging",
+  "wallet": "Portemonnee",
   "wallet_group": "Portemonnee",
   "wallet_group_description_four": "om een ​​portemonnee te maken met een geheel nieuw zaadje.",
   "wallet_group_description_one": "In cakeballet kun je een",
@@ -923,6 +926,8 @@
   "wallets": "Portefeuilles",
   "warning": "Waarschuwing",
   "welcome": "Welkom bij",
+  "welcome_subtitle_new_wallet": "Als u opnieuw wilt beginnen, tikt u op de nieuwe portemonnee hieronder en u bent op weg naar de races.",
+  "welcome_subtitle_restore_wallet": "Als je een bestaande portemonnee hebt die je in cake wilt brengen, kies dan gewoon om de bestaande portemonnee te herstellen en we zullen je door het proces leiden.",
   "welcome_to_cakepay": "Welkom bij Cake Pay!",
   "what_is_silent_payments": "Wat zijn stille betalingen?",
   "widgets_address": "Adres",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index ed54624bf..c7cf09cd8 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Wybierz nowego przedstawiciela",
   "nanogpt_subtitle": "Wszystkie najnowsze modele (GPT-4, Claude). \\ Nno subskrypcja, płacą za pomocą kryptografii.",
   "narrow": "Wąski",
-  "new_first_wallet_text": "Łatwo zapewnić bezpieczeństwo kryptowalut",
+  "new_first_wallet_text": "Zachowanie bezpieczeństwa kryptograficznego jest kawałkiem ciasta",
   "new_node_testing": "Testowanie nowych węzłów",
   "new_subaddress_create": "Stwórz",
   "new_subaddress_label_name": "Etykieta nazwy adresu",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Przywróć swój portfel z kluczy prywatnych",
   "restore_description_from_seed": "Przywróć swój portfel z 25 lub 13-słownej frazy seed",
   "restore_description_from_seed_keys": "Odzyskaj swój portfel z seedów / kluczy, które zapisałeś w bezpiecznym miejscu",
+  "restore_existing_wallet": "Przywróć istniejący portfel",
   "restore_from_date_or_blockheight": "Wprowadź datę na kilka dni przed utworzeniem tego portfela, lub jeśli znasz wysokość bloku, wprowadź go zamiast daty",
   "restore_from_seed_placeholder": "Wpisz lub wklej tutaj swoją frazę seed",
   "restore_new_seed": "Nowy seed",
@@ -670,6 +671,7 @@
   "sent": "Wysłano",
   "service_health_disabled": "Biuletyn zdrowia usług jest wyłączony",
   "service_health_disabled_message": "To jest strona Biuletynu Zdrowie Service, możesz włączyć tę stronę w Ustawieniach -> Prywatność",
+  "set_a_pin": "Ustaw szpilkę",
   "settings": "Ustawienia",
   "settings_all": "Wszystkie",
   "settings_allow_biometrical_authentication": "Zezwalaj na uwierzytelnianie biometryczne",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Zobacz transakcje na ",
   "voting_weight": "Waga głosu",
   "waitFewSecondForTxUpdate": "Poczekaj kilka sekund, aż transakcja zostanie odzwierciedlona w historii transakcji",
+  "wallet": "Portfel",
   "wallet_group": "Grupa portfela",
   "wallet_group_description_four": "Aby stworzyć portfel z zupełnie nowym ziarnem.",
   "wallet_group_description_one": "W portfelu ciasta możesz stworzyć",
@@ -922,6 +925,8 @@
   "wallets": "Portfele",
   "warning": "Ostrzeżenie",
   "welcome": "Witamy w",
+  "welcome_subtitle_new_wallet": "Jeśli chcesz zacząć od nowa, dotknij Utwórz nowy portfel poniżej, a będziesz na wyścigach.",
+  "welcome_subtitle_restore_wallet": "Jeśli masz istniejący portfel, który chcesz wnieść do ciasta, po prostu wybierz przywróć istniejący portfel, a my przeprowadzimy Cię przez proces.",
   "welcome_to_cakepay": "Witamy w Cake Pay!",
   "what_is_silent_payments": "Co to są ciche płatności?",
   "widgets_address": "Adres",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 7b43b5b12..50c7f4d6c 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -428,7 +428,7 @@
   "nano_pick_new_rep": "Escolha um novo representante",
   "nanogpt_subtitle": "Todos os modelos mais recentes (GPT-4, Claude). \\ Nno assinatura, pagam com criptografia.",
   "narrow": "Estreito",
-  "new_first_wallet_text": "Mantenha sua criptomoeda facilmente segura",
+  "new_first_wallet_text": "Manter sua cripto segura é um pedaço de bolo",
   "new_node_testing": "Teste de novo nó",
   "new_subaddress_create": "Criar",
   "new_subaddress_label_name": "Nome",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "Restaure sua carteira a partir de suas chaves privadas",
   "restore_description_from_seed": "Restaure sua carteira a partir de semente com 25 palavras ou 13 palavras",
   "restore_description_from_seed_keys": "Restaure a sua carteira a partir de sementes/chaves que você salvou em um local seguro",
+  "restore_existing_wallet": "Restaure a carteira existente",
   "restore_from_date_or_blockheight": "Insira uma data alguns dias antes de criar esta carteira. Ou se você souber a altura do bloco, insira-o",
   "restore_from_seed_placeholder": "Digite ou cole sua frase de código aqui",
   "restore_new_seed": "Nova semente",
@@ -672,6 +673,7 @@
   "sent": "Enviada",
   "service_health_disabled": "O Boletim de Saúde de Serviço está desativado",
   "service_health_disabled_message": "Esta é a página do Boletim de Saúde de Serviço, você pode ativar esta página em Configurações -> Privacidade",
+  "set_a_pin": "Defina um pino",
   "settings": "Configurações",
   "settings_all": "Tudo",
   "settings_allow_biometrical_authentication": "Permitir autenticação biométrica",
@@ -893,6 +895,7 @@
   "voting_weight": "Peso de votação",
   "waitFewSecondForTxUpdate": "Aguarde alguns segundos para que a transação seja refletida no histórico de transações",
   "waiting_payment_confirmation": "Aguardando confirmação de pagamento",
+  "wallet": "Carteira",
   "wallet_group": "Grupo de carteira",
   "wallet_group_description_four": "Para criar uma carteira com uma semente totalmente nova.",
   "wallet_group_description_one": "Na carteira de bolo, você pode criar um",
@@ -925,6 +928,8 @@
   "wallets": "Carteiras",
   "warning": "Aviso",
   "welcome": "Bem-vindo ao",
+  "welcome_subtitle_new_wallet": "Se você quiser começar de novo, toque em criar uma nova carteira abaixo e você estará nas corridas.",
+  "welcome_subtitle_restore_wallet": "Se você tem uma carteira existente que deseja trazer para o bolo, basta escolher a carteira existente e nós o guiaremos pelo processo.",
   "welcome_to_cakepay": "Bem-vindo ao Cake Pay!",
   "what_is_silent_payments": "O que são pagamentos silenciosos?",
   "widgets_address": "Endereço",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 2795e1ffc..639ddfe63 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Выберите нового представителя",
   "nanogpt_subtitle": "Все новейшие модели (GPT-4, Claude). \\ Nno Подписка, платите с крипто.",
   "narrow": "Узкий",
-  "new_first_wallet_text": "Легко сохранить свою криптовалюту в безопасности",
+  "new_first_wallet_text": "Сохранение вашего криптографии - это кусок торта",
   "new_node_testing": "Тестирование новой ноды",
   "new_subaddress_create": "Создать",
   "new_subaddress_label_name": "Имя",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "Вы можете восстановить кошелёк с помощью приватных ключей",
   "restore_description_from_seed": "Вы можете восстановить кошелёк используя 25-ти значную мнемоническую фразу",
   "restore_description_from_seed_keys": "Вы можете восстановить кошелёк из мнемонической фразы/ключей, которые вы сохранили ранее",
+  "restore_existing_wallet": "Восстановите существующий кошелек",
   "restore_from_date_or_blockheight": "Пожалуйста, введите дату за несколько дней до создания этого кошелька. Или, если вы знаете высоту блока, введите ее значение",
   "restore_from_seed_placeholder": "Введите или вставьте мнемоническую фразу вашего кошелька",
   "restore_new_seed": "Новая мнемоническая фраза",
@@ -671,6 +672,7 @@
   "sent": "Отправленные",
   "service_health_disabled": "Бюллетень для здоровья обслуживания инвалид",
   "service_health_disabled_message": "Это страница бюллетени обслуживания услуг, вы можете включить эту страницу в соответствии с настройками -> Конфиденциальность",
+  "set_a_pin": "Установить булавку",
   "settings": "Настройки",
   "settings_all": "ВСЕ",
   "settings_allow_biometrical_authentication": "Включить биометрическую аутентификацию",
@@ -891,6 +893,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "Вес голоса",
   "waitFewSecondForTxUpdate": "Пожалуйста, подождите несколько секунд, чтобы транзакция отразилась в истории транзакций.",
+  "wallet": "Кошелек",
   "wallet_group": "Группа кошелька",
   "wallet_group_description_four": "создать кошелек с совершенно новым семенем.",
   "wallet_group_description_one": "В кошельке для торта вы можете создать",
@@ -923,6 +926,8 @@
   "wallets": "Кошельки",
   "warning": "Предупреждение",
   "welcome": "Приветствуем в",
+  "welcome_subtitle_new_wallet": "Если вы хотите начать Fresh, нажмите «Создать новый кошелек» ниже, и вы отправитесь на гонки.",
+  "welcome_subtitle_restore_wallet": "Если у вас есть существующий кошелек, который вы хотите принести в торт, просто выберите «Восстановить существующий кошелек», и мы проведем вас через процесс.",
   "welcome_to_cakepay": "Добро пожаловать в Cake Pay!",
   "what_is_silent_payments": "Что такое молчаливые платежи?",
   "widgets_address": "Адрес",
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index 596861646..e0b352fea 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "เลือกตัวแทนใหม่",
   "nanogpt_subtitle": "รุ่นใหม่ล่าสุดทั้งหมด (GPT-4, Claude). การสมัครสมาชิก \\ nno, จ่ายด้วย crypto",
   "narrow": "แคบ",
-  "new_first_wallet_text": "ทำให้สกุลเงินดิจิตอลของคุณปลอดภัยได้อย่างง่ายดาย",
+  "new_first_wallet_text": "การรักษา crypto ของคุณให้ปลอดภัยเป็นเค้กชิ้นหนึ่ง",
   "new_node_testing": "การทดสอบโหนดใหม่",
   "new_subaddress_create": "สร้าง",
   "new_subaddress_label_name": "ชื่อป้ายกำกับ",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "กู้กระเป๋าของคุณจากการกดปุ่มที่สร้างขึ้นจาก private keys ของคุณที่บันทึกไว้",
   "restore_description_from_seed": "กู้กระเป๋าของคุณจากรหัสผสมของ 25 คำหรือ 13 คำ",
   "restore_description_from_seed_keys": "เรียกกระเป๋าของคุณกลับมาจาก seed/keys ที่คุณได้บันทึกไว้ในที่ปลอดภัย",
+  "restore_existing_wallet": "คืนค่ากระเป๋าเงินที่มีอยู่",
   "restore_from_date_or_blockheight": "โปรดป้อนวันที่หลายวันก่อนที่คุณสร้างกระเป๋านี้ หรือหากคุณรู้ความสูงของบล็อก (blockheight) โปรดป้อนมันแทน",
   "restore_from_seed_placeholder": "โปรดป้อนหรือวาง seed ของคุณที่นี่",
   "restore_new_seed": "ซีดใหม่",
@@ -670,6 +671,7 @@
   "sent": "ส่ง",
   "service_health_disabled": "Service Health Bulletin ถูกปิดใช้งาน",
   "service_health_disabled_message": "นี่คือหน้า Service Health Bulletin คุณสามารถเปิดใช้งานหน้านี้ภายใต้การตั้งค่า -> ความเป็นส่วนตัว",
+  "set_a_pin": "ตั้งพิน",
   "settings": "การตั้งค่า",
   "settings_all": "ทั้งหมด",
   "settings_allow_biometrical_authentication": "อนุญาตให้ใช้การยืนยันตัวตนทางระบบชีวภาพ",
@@ -890,6 +892,7 @@
   "view_transaction_on": "ดูการทำธุรกรรมบน ",
   "voting_weight": "น้ำหนักโหวต",
   "waitFewSecondForTxUpdate": "กรุณารอสักครู่เพื่อให้ธุรกรรมปรากฏในประวัติการทำธุรกรรม",
+  "wallet": "กระเป๋าสตางค์",
   "wallet_group": "กลุ่มกระเป๋าเงิน",
   "wallet_group_description_four": "เพื่อสร้างกระเป๋าเงินที่มีเมล็ดพันธุ์ใหม่ทั้งหมด",
   "wallet_group_description_one": "ในกระเป๋าเงินเค้กคุณสามารถสร้างไฟล์",
@@ -922,6 +925,8 @@
   "wallets": "กระเป๋า",
   "warning": "คำเตือน",
   "welcome": "ยินดีต้อนรับสู่",
+  "welcome_subtitle_new_wallet": "หากคุณต้องการเริ่มต้นใหม่ให้แตะสร้างกระเป๋าเงินใหม่ด้านล่างและคุณจะออกจากการแข่งขัน",
+  "welcome_subtitle_restore_wallet": "หากคุณมีกระเป๋าเงินที่มีอยู่ที่คุณต้องการนำเข้าเค้กให้เลือกคืนกระเป๋าเงินที่มีอยู่แล้วเราจะพาคุณผ่านกระบวนการ",
   "welcome_to_cakepay": "ยินดีต้อนรับสู่ Cake Pay!",
   "what_is_silent_payments": "การชำระเงินเงียบคืออะไร?",
   "widgets_address": "ที่อยู่",
diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb
index f4678e00d..5f05e3d51 100644
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Pumili ng isang bagong representative",
   "nanogpt_subtitle": "Ang lahat ng mga pinakabagong modelo (GPT-4, Claude). \nNo subscription, magbayad gamit ang crypto.",
   "narrow": "Makitid",
-  "new_first_wallet_text": "Panatilihing ligtas ang iyong crypto, piraso ng cake",
+  "new_first_wallet_text": "Ang pagpapanatiling ligtas sa iyong crypto ay isang piraso ng cake",
   "new_node_testing": "Bagong node testing",
   "new_subaddress_create": "Lumikha",
   "new_subaddress_label_name": "Pangalan ng label",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Ibalik ang iyong wallet mula sa nabuong mga keystrokes na na-save mula sa iyong mga private key",
   "restore_description_from_seed": "Ibalik ang iyong wallet mula sa alinman sa 25 na salita o 13 na salita na seed",
   "restore_description_from_seed_keys": "Ibalik ang inyong wallet mula sa inyong seed/keys na iyong na-save sa ligtas na lugar",
+  "restore_existing_wallet": "Ibalik ang umiiral na pitaka",
   "restore_from_date_or_blockheight": "Mangyaring maglagay ng petsa ilang araw bago mo ginawa ang wallet na ito. O kung alam mo ang block height pwede ilagay ito sa halip",
   "restore_from_seed_placeholder": "Mangyaring ipasok o idikit ang iyong seed dito",
   "restore_new_seed": "Bagong seed",
@@ -670,6 +671,7 @@
   "sent": "Ipinadala",
   "service_health_disabled": "Hindi pinagana ang Service Health Bulletin",
   "service_health_disabled_message": "Ito ang pahina ng Service Health Bulletin, maaari mong paganahin ang pahinang ito sa ilalim ng Mga Setting -> Pagkapribado",
+  "set_a_pin": "Magtakda ng isang pin",
   "settings": "Mga Setting",
   "settings_all": "LAHAT",
   "settings_allow_biometrical_authentication": "Payagan ang biometrical authentication",
@@ -890,6 +892,7 @@
   "view_transaction_on": "Tingnan ang transaksyon sa ",
   "voting_weight": "Bigat ng pagboto",
   "waitFewSecondForTxUpdate": "Mangyaring maghintay ng ilang segundo para makita ang transaksyon sa history ng mga transaksyon",
+  "wallet": "Wallet",
   "wallet_group": "Group ng Wallet",
   "wallet_group_description_four": "Upang lumikha ng isang pitaka na may ganap na bagong binhi.",
   "wallet_group_description_one": "Sa cake wallet, maaari kang lumikha ng isang",
@@ -922,6 +925,8 @@
   "wallets": "Mga Wallet",
   "warning": "Babala",
   "welcome": "Maligayang pagdating sa",
+  "welcome_subtitle_new_wallet": "Kung nais mong simulan ang sariwa, tapikin ang Lumikha ng Bagong Wallet sa ibaba at pupunta ka sa mga karera.",
+  "welcome_subtitle_restore_wallet": "Kung mayroon kang isang umiiral na pitaka na nais mong dalhin sa cake, piliin lamang ang ibalik ang umiiral na pitaka at lalakad ka namin sa proseso.",
   "welcome_to_cakepay": "Maligayang pagdating sa Cake Pay!",
   "what_is_silent_payments": "Ano ang tahimik na pagbabayad?",
   "widgets_address": "Address",
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index d8b3ae3cf..80990ae2d 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Yeni bir temsilci seçin",
   "nanogpt_subtitle": "En yeni modeller (GPT-4, Claude). \\ Nno aboneliği, kripto ile ödeme yapın.",
   "narrow": "Dar",
-  "new_first_wallet_text": "Kripto para biriminizi kolayca güvende tutun",
+  "new_first_wallet_text": "Kripto'nuzu güvende tutmak bir parça kek",
   "new_node_testing": "Yeni düğüm test ediliyor",
   "new_subaddress_create": "Oluştur",
   "new_subaddress_label_name": "Etiket ismi",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "Cüzdanınızı özel anahtarlarınızdan kaydedilen oluşturulmuş tuş vuruşlarından geri yükleyin",
   "restore_description_from_seed": "Cüzdanınızı 25 veya 13 kelimelik kombinasyon kodundan geri döndürün",
   "restore_description_from_seed_keys": "Güvenli bir yere kaydettiğin tohumdan/anahtarlardan cüzdanını geri döndür",
+  "restore_existing_wallet": "Mevcut cüzdanı geri yükleyin",
   "restore_from_date_or_blockheight": "Lütfen bu cüzdanı oluşturmadan birkaç gün önceki bir tarihi girin. Veya blok yüksekliğini biliyorsan, lütfen bunu gir",
   "restore_from_seed_placeholder": "Lütfen tohumunu buraya gir veya yapıştır",
   "restore_new_seed": "Yeni tohum",
@@ -670,6 +671,7 @@
   "sent": "Gönderildi",
   "service_health_disabled": "Service Health Bülten devre dışı bırakıldı",
   "service_health_disabled_message": "Bu Hizmet Sağlığı Bülten Sayfası, bu sayfayı Ayarlar -> Gizlilik altında etkinleştirebilirsiniz",
+  "set_a_pin": "Bir pim ayarlamak",
   "settings": "ayarlar",
   "settings_all": "HEPSİ",
   "settings_allow_biometrical_authentication": "Biyometrik doğrulamaya izin ver",
@@ -890,6 +892,7 @@
   "view_transaction_on": "İşlemi şurada görüntüle ",
   "voting_weight": "Oy kullanma",
   "waitFewSecondForTxUpdate": "İşlemin işlem geçmişine yansıması için lütfen birkaç saniye bekleyin",
+  "wallet": "Cüzdan",
   "wallet_group": "Cüzdan grubu",
   "wallet_group_description_four": "Tamamen yeni bir tohumla bir cüzdan oluşturmak için.",
   "wallet_group_description_one": "Kek cüzdanında bir",
@@ -922,6 +925,8 @@
   "wallets": "Cüzdanlar",
   "warning": "Uyarı",
   "welcome": "Hoş Geldiniz",
+  "welcome_subtitle_new_wallet": "Taze başlamak istiyorsanız, aşağıda yeni cüzdan oluşturun ve yarışlara gidersiniz.",
+  "welcome_subtitle_restore_wallet": "Mevcut bir cüzdanınız varsa, kek içine getirmek istediğiniz, mevcut cüzdanı geri yüklemeyi seçin ve bu süreç boyunca size yol gösterelim.",
   "welcome_to_cakepay": "Cake Pay'e Hoş Geldiniz!",
   "what_is_silent_payments": "Sessiz ödemeler nedir?",
   "widgets_address": "Adres",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index f27300c18..b2d7a22e5 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "Виберіть нового представника",
   "nanogpt_subtitle": "Усі найновіші моделі (GPT-4, Claude). \\ Nno підписка, оплата криптовалютою.",
   "narrow": "вузькі",
-  "new_first_wallet_text": "Легко зберігайте свою криптовалюту в безпеці",
+  "new_first_wallet_text": "Зберігання вашої криптовалюти це просто як шматок торта",
   "new_node_testing": "Тестування нового вузла",
   "new_subaddress_create": "Створити",
   "new_subaddress_label_name": "Ім'я",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "Ви можете відновити гаманець за допомогою приватних ключів",
   "restore_description_from_seed": "Ви можете відновити гаманець використовуючи 25-ти слівну мнемонічну фразу",
   "restore_description_from_seed_keys": "Ви можете відновити гаманець з мнемонічної фрази/ключів, які ви зберегли раніше",
+  "restore_existing_wallet": "Відновити існуючий гаманець",
   "restore_from_date_or_blockheight": "Будь ласка, введіть дату за кілька днів до створення цього гаманця. Або, якщо ви знаєте висоту блоку, введіть її значення",
   "restore_from_seed_placeholder": "Введіть або вставте мнемонічну фразу вашого гаманця",
   "restore_new_seed": "Нова мнемонічна фраза",
@@ -671,6 +672,7 @@
   "sent": "Відправлені",
   "service_health_disabled": "Вісник охорони здоров'я інвалідів",
   "service_health_disabled_message": "Це сторінка бюлетеня Health Service, ви можете включити цю сторінку в налаштуваннях -> конфіденційність",
+  "set_a_pin": "Встановити PIN",
   "settings": "Налаштування",
   "settings_all": "ВСІ",
   "settings_allow_biometrical_authentication": "Включити біометричну аутентифікацію",
@@ -891,6 +893,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "Вага голосування",
   "waitFewSecondForTxUpdate": "Будь ласка, зачекайте кілька секунд, поки транзакція відобразиться в історії транзакцій",
+  "wallet": "Гаманець",
   "wallet_group": "Група гаманців",
   "wallet_group_description_four": "створити гаманець з абсолютно новим насінням.",
   "wallet_group_description_one": "У гаманці тортів ви можете створити a",
@@ -923,6 +926,8 @@
   "wallets": "Гаманці",
   "warning": "УВАГА",
   "welcome": "Вітаємо в",
+  "welcome_subtitle_new_wallet": "Якщо ви хочете почати спочатку, торкніться Створити новий гаманець нижче, і ви будете поза конкуренціею.",
+  "welcome_subtitle_restore_wallet": "Якщо у вас є існуючий гаманець, який ви хочете ввести в торт, просто виберіть Відновити існуючий гаманець, і ми проведемо вас через процес.",
   "welcome_to_cakepay": "Ласкаво просимо до Cake Pay!",
   "what_is_silent_payments": "Що таке мовчазні платежі?",
   "widgets_address": "Адреса",
diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb
index 00f336d72..289bfb958 100644
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "ایک نیا نمائندہ منتخب کریں",
   "nanogpt_subtitle": "تمام تازہ ترین ماڈل (GPT-4 ، کلاڈ)۔ n n no سبسکرپشن ، کریپٹو کے ساتھ ادائیگی کریں۔",
   "narrow": "تنگ",
-  "new_first_wallet_text": "آسانی سے اپنے cryptocurrency محفوظ رکھیں",
+  "new_first_wallet_text": "اپنے کریپٹو کو محفوظ رکھنا کیک کا ایک ٹکڑا ہے",
   "new_node_testing": "نیا نوڈ ٹیسٹنگ",
   "new_subaddress_create": "بنانا",
   "new_subaddress_label_name": "لیبل کا نام",
@@ -572,6 +572,7 @@
   "restore_description_from_keys": "اپنے بٹوے کو اپنی نجی کلیدوں سے محفوظ کردہ کی اسٹروکس سے بحال کریں۔",
   "restore_description_from_seed": "اپنے بٹوے کو 25 لفظ یا 13 الفاظ کے مجموعہ کوڈ سے بحال کریں۔",
   "restore_description_from_seed_keys": "اپنے بٹوے کو بیج / چابیاں سے واپس حاصل کریں جنہیں آپ نے محفوظ جگہ پر محفوظ کیا ہے۔",
+  "restore_existing_wallet": "موجودہ پرس کو بحال کریں",
   "restore_from_date_or_blockheight": "براہ کرم یہ پرس بنانے سے چند دن پہلے کی تاریخ درج کریں۔ یا اگر آپ کو بلاک ہائیٹ معلوم ہے تو براہ کرم اس کی بجائے اسے درج کریں۔",
   "restore_from_seed_placeholder": "براہ کرم اپنا بیج یہاں درج کریں یا پیسٹ کریں۔",
   "restore_new_seed": "نیا بیج",
@@ -672,6 +673,7 @@
   "sent": "بھیجا",
   "service_health_disabled": "سروس ہیلتھ بلیٹن غیر فعال ہے",
   "service_health_disabled_message": "یہ سروس ہیلتھ بلیٹن پیج ہے ، آپ اس صفحے کو ترتیبات کے تحت اہل بنا سکتے ہیں -> رازداری",
+  "set_a_pin": "ایک پن مرتب کریں",
   "settings": "ترتیبات",
   "settings_all": "تمام",
   "settings_allow_biometrical_authentication": "بایومیٹریکل تصدیق کی اجازت دیں۔",
@@ -892,6 +894,7 @@
   "view_transaction_on": "لین دین دیکھیں آن",
   "voting_weight": "ووٹ کا وزن",
   "waitFewSecondForTxUpdate": "۔ﮟﯾﺮﮐ ﺭﺎﻈﺘﻧﺍ ﺎﮐ ﮉﻨﮑﯿﺳ ﺪﻨﭼ ﻡﺮﮐ ﮦﺍﺮﺑ ﮯﯿﻟ ﮯﮐ ﮯﻧﺮﮐ ﯽﺳﺎﮑﻋ ﯽﮐ ﻦﯾﺩ ﻦﯿﻟ ﮟﯿﻣ ﺦﯾﺭﺎﺗ ﯽﮐ ﻦ",
+  "wallet": "پرس",
   "wallet_group": "پرس گروپ",
   "wallet_group_description_four": "مکمل طور پر نئے بیج کے ساتھ پرس بنانے کے ل.",
   "wallet_group_description_one": "کیک پرس میں ، آپ بنا سکتے ہیں",
@@ -924,6 +927,8 @@
   "wallets": "بٹوے",
   "warning": "وارننگ",
   "welcome": "میں خوش آمدید",
+  "welcome_subtitle_new_wallet": "اگر آپ تازہ شروع کرنا چاہتے ہیں تو ، نیچے نیا پرس بنائیں پر تھپتھپائیں اور آپ ریسوں پر جائیں گے۔",
+  "welcome_subtitle_restore_wallet": "اگر آپ کے پاس موجودہ پرس ہے تو آپ کیک میں لانا چاہتے ہیں تو ، موجودہ بٹوے کو بحال کریں کا انتخاب کریں اور ہم آپ کو اس عمل میں چلیں گے۔",
   "welcome_to_cakepay": "Cake پے میں خوش آمدید!",
   "what_is_silent_payments": "خاموش ادائیگی کیا ہے؟",
   "widgets_address": "پتہ",
diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb
index 1291b505e..e7c95b8ec 100644
--- a/res/values/strings_vi.arb
+++ b/res/values/strings_vi.arb
@@ -426,7 +426,7 @@
   "nano_pick_new_rep": "Chọn đại diện mới",
   "nanogpt_subtitle": "Tất cả các mẫu mới nhất (GPT-4, Claude).\\nKhông cần đăng ký, thanh toán bằng tiền điện tử.",
   "narrow": "Hẹp",
-  "new_first_wallet_text": "Giữ an toàn cho tiền điện tử của bạn, dễ dàng như ăn bánh",
+  "new_first_wallet_text": "Giữ tiền điện tử của bạn an toàn là một miếng bánh",
   "new_node_testing": "Đang thử nghiệm nút mới",
   "new_subaddress_create": "Tạo",
   "new_subaddress_label_name": "Tên nhãn",
@@ -569,6 +569,7 @@
   "restore_description_from_keys": "Khôi phục ví của bạn từ các thao tác nhập được lưu từ khóa riêng của bạn",
   "restore_description_from_seed": "Khôi phục ví của bạn từ mã kết hợp 25 từ hoặc 13 từ",
   "restore_description_from_seed_keys": "Khôi phục ví của bạn từ hạt giống/khóa mà bạn đã lưu ở nơi an toàn",
+  "restore_existing_wallet": "Khôi phục ví hiện có",
   "restore_from_date_or_blockheight": "Vui lòng nhập một ngày vài ngày trước khi bạn tạo ví này. Hoặc nếu bạn biết chiều cao khối, hãy nhập nó thay thế",
   "restore_from_seed_placeholder": "Vui lòng nhập hoặc dán hạt giống của bạn vào đây",
   "restore_new_seed": "Hạt giống mới",
@@ -669,6 +670,7 @@
   "sent": "Đã gửi",
   "service_health_disabled": "Thông báo sức khỏe dịch vụ bị vô hiệu hóa",
   "service_health_disabled_message": "Đây là trang thông báo sức khỏe dịch vụ, bạn có thể kích hoạt trang này trong Cài đặt -> Quyền riêng tư",
+  "set_a_pin": "Đặt một pin",
   "settings": "Cài đặt",
   "settings_all": "TẤT CẢ",
   "settings_allow_biometrical_authentication": "Cho phép xác thực sinh trắc học",
@@ -889,6 +891,7 @@
   "view_transaction_on": "Xem giao dịch trên",
   "voting_weight": "Trọng số bỏ phiếu",
   "waitFewSecondForTxUpdate": "Vui lòng đợi vài giây để giao dịch được phản ánh trong lịch sử giao dịch",
+  "wallet": "Cái ví",
   "wallet_group": "Nhóm ví",
   "wallet_group_description_four": "Để tạo ra một ví với một hạt giống hoàn toàn mới.",
   "wallet_group_description_one": "Trong ví bánh, bạn có thể tạo",
@@ -921,6 +924,8 @@
   "wallets": "Các ví",
   "warning": "Cảnh báo",
   "welcome": "Chào mừng đến với",
+  "welcome_subtitle_new_wallet": "Nếu bạn muốn bắt đầu mới, hãy nhấn Tạo ví mới bên dưới và bạn sẽ rời khỏi các cuộc đua.",
+  "welcome_subtitle_restore_wallet": "Nếu bạn có một ví hiện có mà bạn muốn mang vào bánh, chỉ cần chọn khôi phục ví hiện có và chúng tôi sẽ hướng dẫn bạn qua quá trình này.",
   "welcome_to_cakepay": "Chào mừng đến với Cake Pay!",
   "what_is_silent_payments": "Thanh toán im lặng là gì?",
   "widgets_address": "Địa chỉ",
diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb
index c9275b018..c9b8c4cbd 100644
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@@ -428,7 +428,7 @@
   "nano_pick_new_rep": "Mu aṣoju tuntun kan",
   "nanogpt_subtitle": "Gbogbo awọn awoṣe tuntun (GPT-4, Claude). \\ Nno alabapin kan, sanwo pẹlu Crypto.",
   "narrow": "Taara",
-  "new_first_wallet_text": "Ni rọọrun jẹ ki o jẹ ki o jẹ ki o jẹ ki a mu",
+  "new_first_wallet_text": "Tọju ẹrọ ti o ni aabo rẹ jẹ nkan ti akara oyinbo kan",
   "new_node_testing": "A ń dán apẹka títun wò",
   "new_subaddress_create": "Ṣe é",
   "new_subaddress_label_name": "Orúkọ",
@@ -571,6 +571,7 @@
   "restore_description_from_keys": "Mú àpamọ́wọ́ yín padà láti àwọn àtẹ̀ nípamọ́ láti àwọn kọ́kọ́rọ́ àdáni yín",
   "restore_description_from_seed": "Ẹ mú àpamọ́wọ́ yín padà láti àkànpọ̀ ọlọ́rọ̀ ẹ̀ẹ̀marùndínlọgbọ̀n tàbí ti mẹ́talá.",
   "restore_description_from_seed_keys": "Mú àpamọ́wọ́ yín padà láti hóró/kọ́kọ́rọ́ t'ẹ́ ti pamọ́ sí ibi láìléwu",
+  "restore_existing_wallet": "Mu pada apamọwọ to wa tẹlẹ",
   "restore_from_date_or_blockheight": "Ẹ jọ̀wọ́, tẹ̀ ìgbà ọjọ́ díẹ̀ k'ẹ́ tó ti dá àpamọ́wọ́ yìí. Tàbí ẹ lè tẹ̀ ẹ́ t'ẹ́ bá mọ gíga àkójọpọ̀.",
   "restore_from_seed_placeholder": "Ẹ jọ̀wọ́ tẹ̀ hóró yín tàbí fikún ẹ̀dà hóró ḿbí.",
   "restore_new_seed": "Hóró títun",
@@ -671,6 +672,7 @@
   "sent": "Owó t'á ti ránṣẹ́",
   "service_health_disabled": "IPỌRỌ IWE TI AGBARA TI O LE RẸ",
   "service_health_disabled_message": "Eyi ni oju-iwe Iwe itẹlera Iṣẹ Ile-iṣẹ Iṣẹ: O le mu oju-iwe yii ṣiṣẹ labẹ Eto -> Asiri",
+  "set_a_pin": "Ṣeto PIN kan",
   "settings": "Awọn aseṣe",
   "settings_all": "Gbogbo",
   "settings_allow_biometrical_authentication": "Fi àyè gba ìfẹ̀rílàdí biometrical",
@@ -891,6 +893,7 @@
   "view_transaction_on": "Wo pàṣípààrọ̀ lórí ",
   "voting_weight": "Idibo iwuwo",
   "waitFewSecondForTxUpdate": "Fi inurere duro fun awọn iṣeju diẹ fun idunadura lati ṣe afihan ninu itan-akọọlẹ iṣowo",
+  "wallet": "Ohun apamọwọwọ",
   "wallet_group": "Ẹgbẹ apamọwọ",
   "wallet_group_description_four": "Lati ṣẹda apamọwọ kan pẹlu irugbin tuntun tuntun.",
   "wallet_group_description_one": "Ni apamọwọ akara oyinbo, o le ṣẹda a",
@@ -923,6 +926,8 @@
   "wallets": "Àwọn àpamọ́wọ́",
   "warning": "Ikilo",
   "welcome": "Ẹ káàbọ sí",
+  "welcome_subtitle_new_wallet": "Ti o ba fẹ bẹrẹ alabapade, tẹ Ṣẹda apamọwọ tuntun ni isalẹ iwọ yoo wa ni pipa si awọn ere-ije.",
+  "welcome_subtitle_restore_wallet": "Ti o ba ni apamọwọ ti o wa tẹlẹ ti o fẹ lati mu wa sinu akara oyinbo, yan omi apamọwọ wa tẹlẹ ati pe a yoo rin ọ nipasẹ ilana naa.",
   "welcome_to_cakepay": "Ẹ káàbọ̀ sí Cake Pay!",
   "what_is_silent_payments": "Kini awọn sisanwo ipalọlọ?",
   "widgets_address": "Àdírẹ́sì",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index e508d3c2c..37b35ea6d 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -427,7 +427,7 @@
   "nano_pick_new_rep": "选择新代表",
   "nanogpt_subtitle": "所有最新型号（GPT-4，Claude）。\\ nno订阅，用加密货币付款。",
   "narrow": "狭窄的",
-  "new_first_wallet_text": "轻松确保您的加密货币安全",
+  "new_first_wallet_text": "保持加密货币是一件小菜一碟",
   "new_node_testing": "新节点测试",
   "new_subaddress_create": "创建",
   "new_subaddress_label_name": "标签名称",
@@ -570,6 +570,7 @@
   "restore_description_from_keys": "使用私钥恢复钱包",
   "restore_description_from_seed": "从25个字中恢复您的钱包或13个字的组合码",
   "restore_description_from_seed_keys": "从保存到安全地方的种子/钥匙取回钱包",
+  "restore_existing_wallet": "恢复现有的钱包",
   "restore_from_date_or_blockheight": "请输入您创建这个钱包前几天的日期。或者如果您知道区块高度，请输入区块高度",
   "restore_from_seed_placeholder": "请在此处输入或粘贴您的代码短语",
   "restore_new_seed": "新种子",
@@ -670,6 +671,7 @@
   "sent": "已发送",
   "service_health_disabled": "服务健康公告被禁用",
   "service_health_disabled_message": "这是服务健康公告页面，您可以在设置 - >隐私下启用此页面",
+  "set_a_pin": "设置一个别针",
   "settings": "设置",
   "settings_all": "全部",
   "settings_allow_biometrical_authentication": "允许生物识别认证",
@@ -890,6 +892,7 @@
   "view_transaction_on": "View Transaction on ",
   "voting_weight": "投票权重",
   "waitFewSecondForTxUpdate": "请等待几秒钟，交易才会反映在交易历史记录中",
+  "wallet": "钱包",
   "wallet_group": "钱包组",
   "wallet_group_description_four": "创建一个带有全新种子的钱包。",
   "wallet_group_description_one": "在蛋糕钱包中，您可以创建一个",
@@ -922,6 +925,8 @@
   "wallets": "钱包",
   "warning": "警告",
   "welcome": "欢迎使用",
+  "welcome_subtitle_new_wallet": "如果您想开始新鲜，请点击下面的创建新钱包，您将参加比赛。",
+  "welcome_subtitle_restore_wallet": "如果您有一个现有的钱包要把蛋糕带入蛋糕，只需选择还原现有的钱包，我们将带您完成整个过程。",
   "welcome_to_cakepay": "欢迎来到 Cake Pay！",
   "what_is_silent_payments": "什么是无声付款？",
   "widgets_address": "地址",
diff --git a/run-android.sh b/run-android.sh
index 880d86b6f..cb0c34038 100755
--- a/run-android.sh
+++ b/run-android.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
 # Get the current git branch
 get_current_branch() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
@@ -15,9 +15,8 @@ get_current_branch() {
 update_app_properties() {
     local branch=$1
     local file_path="./android/app.properties"
-    
-    sed -i "s/^id=.*/id=com.cakewallet.$branch/" "$file_path"
-    sed -i "s/^name=.*/name=$branch-Cake Wallet/" "$file_path"
+    universal_sed "s/^id=.*/id=com.cakewallet.$branch/" "$file_path"
+    universal_sed "s/^name=.*/name=$branch-Cake Wallet/" "$file_path"
 }
 
 # only update app.properties if getting the current branch was successful
diff --git a/scripts/android/inject_app_details.sh b/scripts/android/inject_app_details.sh
index 2957b91e3..7b0d74798 100755
--- a/scripts/android/inject_app_details.sh
+++ b/scripts/android/inject_app_details.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
 if [ -z "$APP_ANDROID_TYPE" ]; then
         echo "Please set APP_ANDROID_TYPE"
         exit 1
@@ -7,9 +7,9 @@ fi
 
 cd ../..
 set -x
-sed -i "0,/version:/{s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/}" ./pubspec.yaml
-sed -i "0,/version:/{s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/}" ./android/app/src/main/AndroidManifest.xml
-sed -i "0,/__APP_SCHEME__/s/__APP_SCHEME__/${APP_ANDROID_SCHEME}/" ./android/app/src/main/AndroidManifest.xml
-sed -i "0,/version:/{s/__versionCode__/${APP_ANDROID_BUILD_NUMBER}/}" ./android/app/src/main/AndroidManifest.xml
-sed -i "0,/version:/{s/__versionName__/${APP_ANDROID_VERSION}/}" ./android/app/src/main/AndroidManifest.xml
+universal_sed "1,/version:/ {s/version:.*/version: ${APP_ANDROID_VERSION}+${APP_ANDROID_BUILD_NUMBER}/;}" ./pubspec.yaml
+universal_sed "1,/version:/ {s/__APP_PACKAGE__/${APP_ANDROID_PACKAGE}/;}" ./android/app/src/main/AndroidManifest.xml
+universal_sed "1,/__APP_SCHEME__/ {s/__APP_SCHEME__/${APP_ANDROID_SCHEME}/;}" ./android/app/src/main/AndroidManifest.xml
+universal_sed "1,/version:/ {s/__versionCode__/${APP_ANDROID_BUILD_NUMBER}/;}" ./android/app/src/main/AndroidManifest.xml
+universal_sed "1,/version:/ {s/__versionName__/${APP_ANDROID_VERSION}/;}" ./android/app/src/main/AndroidManifest.xml
 cd scripts/android
diff --git a/scripts/android/pubspec_gen.sh b/scripts/android/pubspec_gen.sh
index 468f548f3..febc4f9e9 100755
--- a/scripts/android/pubspec_gen.sh
+++ b/scripts/android/pubspec_gen.sh
@@ -23,7 +23,7 @@ esac
 cd ../..
 cp -rf pubspec_description.yaml pubspec.yaml
 flutter pub get
-flutter pub run tool/generate_pubspec.dart
+dart run tool/generate_pubspec.dart
 flutter pub get
-flutter packages pub run tool/configure.dart $CONFIG_ARGS
+dart run tool/configure.dart $CONFIG_ARGS
 cd scripts/android
\ No newline at end of file
diff --git a/scripts/ios/app_config.sh b/scripts/ios/app_config.sh
index 2232491a6..396ccd7f0 100755
--- a/scripts/ios/app_config.sh
+++ b/scripts/ios/app_config.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
+set -x -e
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
 HAVEN="haven"
@@ -22,7 +23,7 @@ cp -rf ./ios/Runner/InfoBase.plist ./ios/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:1:CFBundleURLName string ${APP_IOS_TYPE}" ./ios/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:1:CFBundleURLSchemes array" ./ios/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:1:CFBundleURLSchemes: string ${APP_IOS_TYPE}" ./ios/Runner/Info.plist
-sed -i '' "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $APP_IOS_BUNDLE_ID;/g" ./ios/Runner.xcodeproj/project.pbxproj
+universal_sed "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $APP_IOS_BUNDLE_ID;/g" ./ios/Runner.xcodeproj/project.pbxproj
 
 CONFIG_ARGS=""
 
@@ -45,8 +46,8 @@ esac
 
 cp -rf pubspec_description.yaml pubspec.yaml
 flutter pub get
-flutter pub run tool/generate_pubspec.dart
+dart run tool/generate_pubspec.dart
 flutter pub get
-flutter packages pub run tool/configure.dart $CONFIG_ARGS
+dart run tool/configure.dart $CONFIG_ARGS
 cd $DIR
 $DIR/app_icon.sh
diff --git a/scripts/linux/app_config.sh b/scripts/linux/app_config.sh
index b4ca1423c..0fc41bd0f 100755
--- a/scripts/linux/app_config.sh
+++ b/scripts/linux/app_config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
 CAKEWALLET="cakewallet"
 DIR=`pwd`
 
@@ -18,8 +18,8 @@ esac
 
 cp -rf pubspec_description.yaml pubspec.yaml
 flutter pub get
-flutter pub run tool/generate_pubspec.dart
+dart run tool/generate_pubspec.dart
 flutter pub get
-flutter packages pub run tool/configure.dart $CONFIG_ARGS
-sed -i '0,/version: 0.0.0/s//version: '"${APP_LINUX_VERSION}"'+'"${APP_LINUX_BUILD_NUMBER}"'/' pubspec.yaml
+dart run tool/configure.dart $CONFIG_ARGS
+universal_sed '0,/version: 0.0.0/s//version: '"${APP_LINUX_VERSION}"'+'"${APP_LINUX_BUILD_NUMBER}"'/' pubspec.yaml
 cd $DIR
diff --git a/scripts/macos/app_config.sh b/scripts/macos/app_config.sh
index 92a8636bd..452205dd9 100755
--- a/scripts/macos/app_config.sh
+++ b/scripts/macos/app_config.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
 
 MONERO_COM="monero.com"
 CAKEWALLET="cakewallet"
@@ -24,11 +25,11 @@ cp -rf ./macos/Runner/DebugProfileBase.entitlements ./macos/Runner/DebugProfile.
 cp -rf ./macos/Runner/ReleaseBase.entitlements ./macos/Runner/Release.entitlements
 cp -rf ./macos/Runner/RunnerBase.entitlements ./macos/Runner/Runner.entitlements
 cp -rf ./macos/Runner/Configs/AppInfoBase.xcconfig ./macos/Runner/Configs/AppInfo.xcconfig
-sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/DebugProfile.entitlements
-sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Release.entitlements
-sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Runner.entitlements
-sed -i '' "s/\${PRODUCT_NAME}/${APP_MACOS_NAME}/g" ./macos/Runner/Configs/AppInfo.xcconfig
-sed -i '' "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $APP_MACOS_BUNDLE_ID;/g" ./macos/Runner/Configs/AppInfo.xcconfig
+universal_sed "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/DebugProfile.entitlements
+universal_sed "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Release.entitlements
+universal_sed "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Runner.entitlements
+universal_sed "s/\${PRODUCT_NAME}/${APP_MACOS_NAME}/g" ./macos/Runner/Configs/AppInfo.xcconfig
+universal_sed "s/PRODUCT_BUNDLE_IDENTIFIER = .*;/PRODUCT_BUNDLE_IDENTIFIER = $APP_MACOS_BUNDLE_ID;/g" ./macos/Runner/Configs/AppInfo.xcconfig
 CONFIG_ARGS=""
 
 case $APP_MACOS_TYPE in
@@ -40,8 +41,8 @@ esac
 
 cp -rf pubspec_description.yaml pubspec.yaml
 flutter pub get
-flutter pub run tool/generate_pubspec.dart
+dart run tool/generate_pubspec.dart
 flutter pub get
-flutter packages pub run tool/configure.dart $CONFIG_ARGS
+dart run tool/configure.dart $CONFIG_ARGS
 cd $DIR
 $DIR/app_icon.sh
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index 8f3b68ab5..930a1e5ed 100755
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.8.0"
-MONERO_COM_BUILD_NUMBER=36
+MONERO_COM_VERSION="1.8.1"
+MONERO_COM_BUILD_NUMBER=37
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.14.0"
-CAKEWALLET_BUILD_NUMBER=95
+CAKEWALLET_VERSION="1.14.1"
+CAKEWALLET_BUILD_NUMBER=96
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
diff --git a/scripts/macos/gen_common.sh b/scripts/macos/gen_common.sh
index d75ac919e..d1d40edc9 100755
--- a/scripts/macos/gen_common.sh
+++ b/scripts/macos/gen_common.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/universal_sed.sh"
 gen_podspec() {
 	ARCH=$1
 	CW_PLUGIN_DIR="`pwd`/../../cw_monero/macos"
@@ -9,7 +9,7 @@ gen_podspec() {
 	DEFAULT_FILE_PATH="${CW_PLUGIN_DIR}/${DEFAULT_FILENAME}"
 	rm -f $DEFAULT_FILE_PATH
 	cp $BASE_FILE_PATH $DEFAULT_FILE_PATH
-	gsed -i "s/#___VALID_ARCHS___#/${ARCH}/g" $DEFAULT_FILE_PATH
+	universal_sed "s/#___VALID_ARCHS___#/${ARCH}/g" $DEFAULT_FILE_PATH
 }
 
 gen_project() {
@@ -17,7 +17,7 @@ gen_project() {
 	CW_DIR="`pwd`/../../macos/Runner.xcodeproj"
 	DEFAULT_FILENAME="project.pbxproj"
 	DEFAULT_FILE_PATH="${CW_DIR}/${DEFAULT_FILENAME}"
-	gsed -i "s/ARCHS =.*/ARCHS = \"${ARCH}\";/g" $DEFAULT_FILE_PATH
+	universal_sed "s/ARCHS =.*/ARCHS = \"${ARCH}\";/g" $DEFAULT_FILE_PATH
 }
 
 gen() {
diff --git a/scripts/universal_sed.sh b/scripts/universal_sed.sh
new file mode 100644
index 000000000..d8a95684e
--- /dev/null
+++ b/scripts/universal_sed.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+detect_sed() {
+    if sed --version 2>/dev/null | grep -q "GNU"; then
+        SED_TYPE="GNU"
+    else
+        SED_TYPE="BSD"
+    fi
+}
+
+universal_sed() {
+    local expression=$1
+    local file=$2
+
+    if [[ "$SED_TYPE" == "GNU" ]]; then
+        sed -i "$expression" "$file"
+    else
+        sed -i '' "$expression" "$file"
+    fi
+}
+
+detect_sed
diff --git a/tool/append_translation.dart b/tool/append_translation.dart
index d196421e9..5a3658cd0 100644
--- a/tool/append_translation.dart
+++ b/tool/append_translation.dart
@@ -2,7 +2,7 @@ import 'utils/translation/arb_file_utils.dart';
 import 'utils/translation/translation_constants.dart';
 import 'utils/translation/translation_utils.dart';
 
-/// flutter packages pub run tool/append_translation.dart "hello_world" "Hello World!"
+/// dart run tool/append_translation.dart "hello_world" "Hello World!"
 
 void main(List<String> args) async {
   if (args.length < 2) {
diff --git a/tool/configure.dart b/tool/configure.dart
index f0f79cfb1..7199b8a82 100644
--- a/tool/configure.dart
+++ b/tool/configure.dart
@@ -1424,8 +1424,7 @@ Future<void> generatePubspec({
     git:
       url: https://github.com/cake-tech/flutter_secure_storage.git
       path: flutter_secure_storage
-      ref: cake-8.1.0
-      version: 8.1.0
+      ref: ca897a08677edb443b366352dd7412735e098e7b
   """;
   const cwEthereum = """
   cw_ethereum:
diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart
index affe4017c..d67ab7605 100644
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@@ -62,7 +62,7 @@ class SecretKey {
     SecretKey('bitcoinTestWalletReceiveAddress', () => ''),
     SecretKey('ethereumTestWalletReceiveAddress', () => ''),
     SecretKey('litecoinTestWalletReceiveAddress', () => ''),
-    SecretKey('bitco inCashTestWalletReceiveAddress', () => ''),
+    SecretKey('bitcoinCashTestWalletReceiveAddress', () => ''),
     SecretKey('polygonTestWalletReceiveAddress', () => ''),
     SecretKey('solanaTestWalletReceiveAddress', () => ''),
     SecretKey('tronTestWalletReceiveAddress', () => ''),
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index ad540a359..4deae3420 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -7,6 +7,7 @@
 #include "generated_plugin_registrant.h"
 
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
 #include <flutter_local_authentication/flutter_local_authentication_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
@@ -17,6 +18,8 @@
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   ConnectivityPlusWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
   FlutterLocalAuthenticationPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterLocalAuthenticationPluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 92431a6fb..e0f2c11c0 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -4,6 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
+  flutter_inappwebview_windows
   flutter_local_authentication
   flutter_secure_storage_windows
   permission_handler_windows