diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
index 36314a2e25..b1a6774b38 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
@@ -77,6 +77,7 @@ class WalletConnectSdkHelper {
 
         val transactionData = TransactionData(
             amount = Amount(value, wallet.blockchain),
+            // TODO refactoring
             fee = Fee.Common(Amount(fee, wallet.blockchain)),
             sourceAddress = transaction.from,
             destinationAddress = transaction.to!!,
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
index 7caaabe6e1..aa62852b75 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt
@@ -8,17 +8,14 @@ import com.tangem.wallet.R
 object MultipleAddressUiHelper {
 
     fun typeToId(type: AddressType, blockchain: Blockchain): Int {
-        return when (blockchain) {
-            in blockchainsSupportingSplit -> {
-                if (type == AddressType.Legacy) {
-                    R.id.chip_legacy
-                } else {
-                    R.id.chip_default
-                }
-            }
-            else -> {
-                View.NO_ID
+        return if (blockchain in blockchainsSupportingSplit) {
+            if (type == AddressType.Legacy) {
+                R.id.chip_legacy
+            } else {
+                R.id.chip_default
             }
+        } else {
+            View.NO_ID
         }
     }
 
diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
index ddc2033b7b..5dc4db710d 100644
--- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json
@@ -1,7 +1,7 @@
 [
     {
         "name": "OPTIMISM_SWAP_FEATURE_ENABLED",
-        "version": "1.0.0"
+        "version": "4.3.1"
     },
     {
         "name": "REDESIGNED_CUSTOM_TOKEN_SCREEN_ENABLED",