diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
index 81be679bd..7286e9fb8 100644
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@@ -1,4 +1,4 @@
-Swap flow improvements
-Cakepay improvements
-UI enhancements
+Better support for embedded Tor
+Improve sending and swapping flow
+Enhance payment scanning
 Bug fixes
\ No newline at end of file
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
index 89a3d980d..d8ed1c16d 100644
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@@ -1,6 +1,5 @@
-Add Dogecoin to Cake Wallet
-Swap flow improvements
-Cakepay improvements
-Silent Payment enhancements
-UI enhancements
+Better support for embedded Tor
+Improve sending and swapping flow
+Enhance payment scanning
+Silent Payments enhancements and better reliability
 Bug fixes
\ No newline at end of file
diff --git a/lib/src/screens/dashboard/edit_token_page.dart b/lib/src/screens/dashboard/edit_token_page.dart
index f0f6e6370..777519f00 100644
--- a/lib/src/screens/dashboard/edit_token_page.dart
+++ b/lib/src/screens/dashboard/edit_token_page.dart
@@ -242,6 +242,11 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
 
                             // check if the token symbol is the same as any of the base currencies symbols (ETH, SOL, POL, TRX, etc):
                             // if it is, then it's probably a scam unless it's in the whitelist
+
+                            // ugh, should it be commented out?
+                            // because there are some tokens that has the name of original currencies
+                            // like: 0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6
+
                             final baseCurrencySymbols =
                                 CryptoCurrency.all.map((e) => e.title.toUpperCase()).toList();
                             if (baseCurrencySymbols.contains(tokenSymbol.trim().toUpperCase()) &&
diff --git a/lib/view_model/dashboard/home_settings_view_model.dart b/lib/view_model/dashboard/home_settings_view_model.dart
index 0953350e5..efc2b5598 100644
--- a/lib/view_model/dashboard/home_settings_view_model.dart
+++ b/lib/view_model/dashboard/home_settings_view_model.dart
@@ -1,8 +1,6 @@
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:cake_wallet/core/fiat_conversion_service.dart';
-import 'package:cake_wallet/entities/erc20_token_info_explorers.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/erc20_token_info_moralis.dart';
 import 'package:cake_wallet/entities/sort_balance_types.dart';
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index ece640922..bdf07b500 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.3.0"
-MONERO_COM_BUILD_NUMBER=134
+MONERO_COM_VERSION="5.4.0"
+MONERO_COM_BUILD_NUMBER=135
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.3.0"
-CAKEWALLET_BUILD_NUMBER=275
+CAKEWALLET_VERSION="5.4.0"
+CAKEWALLET_BUILD_NUMBER=276
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index 993944adb..3cc64b5bc 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.3.0"
-MONERO_COM_BUILD_NUMBER=136
+MONERO_COM_VERSION="5.4.0"
+MONERO_COM_BUILD_NUMBER=137
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.3.0"
-CAKEWALLET_BUILD_NUMBER=335
+CAKEWALLET_VERSION="5.4.0"
+CAKEWALLET_BUILD_NUMBER=336
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 
diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh
index 1d405aa7c..58c96556f 100755
--- a/scripts/linux/app_env.sh
+++ b/scripts/linux/app_env.sh
@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.3.0"
-CAKEWALLET_BUILD_NUMBER=65
+CAKEWALLET_VERSION="5.4.0"
+CAKEWALLET_BUILD_NUMBER=66
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index cd73d4449..0dccdb0fa 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="5.3.0"
-MONERO_COM_BUILD_NUMBER=62
+MONERO_COM_VERSION="5.4.0"
+MONERO_COM_BUILD_NUMBER=63
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.3.0"
-CAKEWALLET_BUILD_NUMBER=127
+CAKEWALLET_VERSION="5.4.0"
+CAKEWALLET_BUILD_NUMBER=128
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss
index 75f02b3be..350a10f20 100644
--- a/scripts/windows/build_exe_installer.iss
+++ b/scripts/windows/build_exe_installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "5.3.0"
+#define MyAppVersion "5.4.0"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"