Remove Tor from premium features

horizontalsystems · Feb 3, 2025 · 82f2e0b · 82f2e0b
1 parent 25c8e12
commit 82f2e0b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 27 deletions.
diff --git a/.../java/io/horizontalsystems/bankwallet/modules/settings/privacy/PrivacySettingsFragment.kt b/.../java/io/horizontalsystems/bankwallet/modules/settings/privacy/PrivacySettingsFragment.kt
@@ -48,6 +48,7 @@ import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer
 import io.horizontalsystems.bankwallet.ui.compose.components.body_leah
 import io.horizontalsystems.bankwallet.ui.compose.components.cell.CellUniversal
 import io.horizontalsystems.bankwallet.ui.compose.components.cell.SectionPremiumUniversalLawrence
+import io.horizontalsystems.bankwallet.ui.compose.components.cell.SectionUniversalLawrence
 import io.horizontalsystems.bankwallet.ui.extensions.ConfirmationDialog
 import io.horizontalsystems.subscriptions.core.PrivacyMode
 import kotlin.system.exitProcess
@@ -179,12 +180,8 @@ fun PrivacyScreen(
             )
 
             VSpacer(20.dp)
-            SectionPremiumUniversalLawrence {
-                TorBlock(
-                    torViewModel,
-                    navController,
-                    showAppRestartAlert,
-                )
+            SectionUniversalLawrence {
+                TorBlock(torViewModel, showAppRestartAlert)
             }
             InfoText(
                 text = stringResource(R.string.SettingsSecurity_TorConnectionDescription),

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/ui/TorBlock.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/settings/security/ui/TorBlock.kt
@@ -8,20 +8,16 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
 import io.horizontalsystems.bankwallet.R
-import io.horizontalsystems.bankwallet.core.paidAction
 import io.horizontalsystems.bankwallet.modules.settings.privacy.tor.SecurityTorSettingsViewModel
 import io.horizontalsystems.bankwallet.modules.settings.security.SecurityCenterCell
 import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme
 import io.horizontalsystems.bankwallet.ui.compose.components.HsSwitch
 import io.horizontalsystems.bankwallet.ui.compose.components.body_leah
-import io.horizontalsystems.subscriptions.core.Tor
 
 @Composable
 fun TorBlock(
     viewModel: SecurityTorSettingsViewModel,
-    navController: NavController,
     showAppRestartAlert: () -> Unit,
 ) {
     if (viewModel.showRestartAlert) {
@@ -34,7 +30,7 @@ fun TorBlock(
             Icon(
                 modifier = Modifier.size(24.dp),
                 painter = painterResource(R.drawable.ic_tor_connection_24),
-                tint = ComposeAppTheme.colors.jacob,
+                tint = ComposeAppTheme.colors.grey,
                 contentDescription = null,
             )
         },
@@ -49,9 +45,7 @@ fun TorBlock(
             HsSwitch(
                 checked = viewModel.torCheckEnabled,
                 onCheckedChange = { checked ->
-                    navController.paidAction(Tor) {
-                        viewModel.setTorEnabledWithChecks(checked)
-                    }
+                    viewModel.setTorEnabledWithChecks(checked)
                 }
             )
         }

diff --git a/...ain/java/io/horizontalsystems/bankwallet/modules/usersubscription/BuySubscriptionModel.kt b/...ain/java/io/horizontalsystems/bankwallet/modules/usersubscription/BuySubscriptionModel.kt
@@ -10,7 +10,6 @@ import io.horizontalsystems.subscriptions.core.IPaidAction
 import io.horizontalsystems.subscriptions.core.PricingPhase
 import io.horizontalsystems.subscriptions.core.PrivacyMode
 import io.horizontalsystems.subscriptions.core.TokenInsights
-import io.horizontalsystems.subscriptions.core.Tor
 import io.horizontalsystems.subscriptions.core.TradeSignals
 import io.horizontalsystems.subscriptions.core.TransactionSpeedTools
 import io.horizontalsystems.subscriptions.core.VIPClub
@@ -26,7 +25,6 @@ object BuySubscriptionModel {
             TransactionSpeedTools -> R.string.Premium_UpgradeFeature_TxSpeedTools
             DuressMode -> R.string.Premium_UpgradeFeature_DuressMode
             AddressVerification -> R.string.Premium_UpgradeFeature_AddressVerification
-            Tor -> R.string.Premium_UpgradeFeature_Tor
             PrivacyMode -> R.string.Premium_UpgradeFeature_PrivacyMode
             VIPSupport -> R.string.Premium_UpgradeFeature_VipSupport
             VIPClub -> R.string.Premium_UpgradeFeature_VipClub
@@ -41,7 +39,6 @@ object BuySubscriptionModel {
             TransactionSpeedTools -> R.string.Premium_UpgradeFeature_TxSpeedTools_Description
             DuressMode -> R.string.Premium_UpgradeFeature_DuressMode_Description
             AddressVerification -> R.string.Premium_UpgradeFeature_AddressVerification_Description
-            Tor -> R.string.Premium_UpgradeFeature_Tor_Description
             PrivacyMode -> R.string.Premium_UpgradeFeature_PrivacyMode_Description
             VIPSupport -> R.string.Premium_UpgradeFeature_VipSupport_Description
             VIPClub -> R.string.Premium_UpgradeFeature_VipClub_Description
@@ -56,7 +53,6 @@ object BuySubscriptionModel {
             TransactionSpeedTools -> R.string.Premium_UpgradeFeature_TxSpeedTools_BigDescription
             DuressMode -> R.string.Premium_UpgradeFeature_DuressMode_BigDescription
             AddressVerification -> R.string.Premium_UpgradeFeature_AddressVerification_BigDescription
-            Tor -> R.string.Premium_UpgradeFeature_Tor_BigDescription
             PrivacyMode -> R.string.Premium_UpgradeFeature_PrivacyMode_BigDescription
             VIPSupport -> R.string.Premium_UpgradeFeature_VipSupport_BigDescription
             VIPClub -> R.string.Premium_UpgradeFeature_VipClub_BigDescription
@@ -71,7 +67,6 @@ object BuySubscriptionModel {
             TransactionSpeedTools -> R.drawable.prem_outgoingraw_24
             DuressMode -> R.drawable.prem_duress_24
             AddressVerification -> R.drawable.prem_shield_24
-            Tor -> R.drawable.prem_tor_24
             PrivacyMode -> R.drawable.prem_fraud_24
             VIPSupport -> R.drawable.prem_vip_support_24
             VIPClub -> R.drawable.prem_chat_support_24

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -929,7 +929,6 @@
     <string name="Premium_UpgradeFeature_TxSpeedTools">Transaction Speed Tools</string>
     <string name="Premium_UpgradeFeature_DuressMode">Duress Mode</string>
     <string name="Premium_UpgradeFeature_AddressVerification">Address Verification</string>
-    <string name="Premium_UpgradeFeature_Tor">TOR</string>
     <string name="Premium_UpgradeFeature_PrivacyMode">Privacy Mode</string>
 
     <string name="Premium_UpgradeFeature_VipSupport_Description">Fast response support.</string>
@@ -940,7 +939,6 @@
     <string name="Premium_UpgradeFeature_TxSpeedTools_Description">Speed up and cancel transactions.</string>
     <string name="Premium_UpgradeFeature_DuressMode_Description">Hides main wallets in case of coercion.</string>
     <string name="Premium_UpgradeFeature_AddressVerification_Description">Additional address check for fraud prevention.</string>
-    <string name="Premium_UpgradeFeature_Tor_Description">Secure connection.</string>
     <string name="Premium_UpgradeFeature_PrivacyMode_Description">Full disconnection from data collection.</string>
 
     <string name="Premium_UpgradeFeature_VipSupport_BigDescription">Fast response support.</string>
@@ -951,7 +949,6 @@
     <string name="Premium_UpgradeFeature_TxSpeedTools_BigDescription">Speed up and cancel transactions.</string>
     <string name="Premium_UpgradeFeature_DuressMode_BigDescription">Hides main wallets in case of coercion.</string>
     <string name="Premium_UpgradeFeature_AddressVerification_BigDescription">Additional address check for fraud prevention.</string>
-    <string name="Premium_UpgradeFeature_Tor_BigDescription">Secure connection.</string>
     <string name="Premium_UpgradeFeature_PrivacyMode_BigDescription">Full disconnection from data collection.</string>
 
     <string name="Premium_HighlyRatedSecurity">Highly rated security, exceptional privacy, and a truly non-custodial wallet.</string>

diff --git a/subscriptions-core/src/main/java/io/horizontalsystems/subscriptions/core/IPaidAction.kt b/subscriptions-core/src/main/java/io/horizontalsystems/subscriptions/core/IPaidAction.kt
@@ -23,9 +23,6 @@ object DuressMode : IPaidAction
 @Parcelize
 object AddressVerification : IPaidAction
 
-@Parcelize
-object Tor : IPaidAction
-
 @Parcelize
 object PrivacyMode : IPaidAction
 

diff --git a/...ons-core/src/main/java/io/horizontalsystems/subscriptions/core/UserSubscriptionManager.kt b/...ons-core/src/main/java/io/horizontalsystems/subscriptions/core/UserSubscriptionManager.kt
@@ -23,7 +23,6 @@ object UserSubscriptionManager {
                 TransactionSpeedTools,
                 DuressMode,
                 AddressVerification,
-                Tor,
                 PrivacyMode,
             )
         ),
@@ -40,7 +39,6 @@ object UserSubscriptionManager {
                 TransactionSpeedTools,
                 DuressMode,
                 AddressVerification,
-                Tor,
                 PrivacyMode,
             )
         ),