Merge branch 'dev' of github.com:tonkeeper/android_private into dev

Author: polstianka

apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt

@@ -16,6 +16,7 @@ data class ConfigEntity(
     val supportLink: String,
     val nftExplorer: String,
     val transactionExplorer: String,
+    val accountExplorer: String,
     val mercuryoSecret: String,
     val tonapiMainnetHost: String,
     val tonapiTestnetHost: String,
@@ -38,6 +39,7 @@ data class ConfigEntity(
     val batteryBeta: Boolean,
     val batterySendDisabled: Boolean,
     val disableBatteryIapModule: Boolean,
+    val disableBatteryCryptoRechargeModule: Boolean,
     val batteryMaxInputAmount: String,
     val batteryRefundEndpoint: String,
     val batteryPromoDisable: Boolean,
@@ -59,6 +61,8 @@ data class ConfigEntity(
     val tronSwapUrl: String,
     val tronSwapTitle: String,
     val tronApiKey: String? = null,
+    val privacyPolicyUrl: String,
+    val termsOfUseUrl: String
 ): Parcelable {
 
     @IgnoredOnParcel
@@ -82,6 +86,7 @@ data class ConfigEntity(
         supportLink = json.getString("supportLink"),
         nftExplorer = json.getString("NFTOnExplorerUrl"),
         transactionExplorer = json.getString("transactionExplorer"),
+        accountExplorer = json.getString("accountExplorer"),
         mercuryoSecret = json.getString("mercuryoSecret"),
         tonapiMainnetHost = json.getString("tonapiMainnetHost"),
         tonapiTestnetHost = json.getString("tonapiTestnetHost"),
@@ -108,6 +113,7 @@ data class ConfigEntity(
         batteryBeta = json.optBoolean("battery_beta", true),
         batterySendDisabled = json.optBoolean("disable_battery_send", false),
         disableBatteryIapModule = json.optBoolean("disable_battery_iap_module", false),
+        disableBatteryCryptoRechargeModule = json.optBoolean("disable_battery_crypto_recharge_module", false),
         batteryMaxInputAmount = json.optString("batteryMaxInputAmount", "3"),
         batteryRefundEndpoint = json.optString("batteryRefundEndpoint", "https://battery-refund-app.vercel.app"),
         batteryPromoDisable = json.optBoolean("disable_battery_promo_module", true),
@@ -134,14 +140,17 @@ data class ConfigEntity(
         tonkeeperApiUrl = json.optString("tonkeeper_api_url", "https://api.tonkeeper.com"),
         tronSwapUrl = json.optString("tron_swap_url", "https://widget.letsexchange.io/en?affiliate_id=ffzymmunvvyxyypo&coin_from=ton&coin_to=USDT-TRC20&is_iframe=true"),
         tronSwapTitle = json.optString("tron_swap_title", "LetsExchange"),
-        tronApiKey = json.optString("tron_api_key")
+        tronApiKey = json.optString("tron_api_key"),
+        privacyPolicyUrl = json.getString("privacy_policy"),
+        termsOfUseUrl = json.getString("terms_of_use"),
     )
 
     constructor() : this(
         empty = true,
         supportLink = "mailto:support@tonkeeper.com",
         nftExplorer = "https://tonviewer.com/nft/%s",
         transactionExplorer = "https://tonviewer.com/transaction/%s",
+        accountExplorer = "https://tonviewer.com/%s",
         mercuryoSecret = "",
         tonapiMainnetHost = "https://keeper.tonapi.io",
         tonapiTestnetHost = "https://testnet.tonapi.io",
@@ -164,6 +173,7 @@ data class ConfigEntity(
         batteryBeta = true,
         batterySendDisabled = false,
         disableBatteryIapModule = false,
+        disableBatteryCryptoRechargeModule = false,
         batteryMaxInputAmount = "3",
         batteryRefundEndpoint = "https://battery-refund-app.vercel.app",
         batteryPromoDisable = true,
@@ -183,7 +193,9 @@ data class ConfigEntity(
         region = "US",
         tonkeeperApiUrl = "https://api.tonkeeper.com",
         tronSwapUrl = "https://widget.letsexchange.io/en?affiliate_id=ffzymmunvvyxyypo&coin_from=ton&coin_to=USDT-TRC20&is_iframe=true",
-        tronSwapTitle = "LetsExchange"
+        tronSwapTitle = "LetsExchange",
+        privacyPolicyUrl = "https://tonkeeper.com/privacy",
+        termsOfUseUrl = "https://tonkeeper.com/terms"
     )
 
     fun formatTransactionExplorer(testnet: Boolean, tron: Boolean, hash: String): String {

apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/FlagsEntity.kt

@@ -9,8 +9,6 @@ data class FlagsEntity(
     val disableSwap: Boolean,
     val disableExchangeMethods: Boolean,
     val disableDApps: Boolean,
-    val disableBlur: Boolean,
-    val disableLegacyBlur: Boolean,
     val disableSigner: Boolean,
     val safeModeEnabled: Boolean,
     val disableStaking: Boolean,
@@ -27,8 +25,6 @@ data class FlagsEntity(
         disableSwap = json.optBoolean("disable_swap", false),
         disableExchangeMethods = json.optBoolean("disable_exchange_methods", false),
         disableDApps = json.optBoolean("disable_dapps", false),
-        disableBlur = json.optBoolean("disable_blur", false),
-        disableLegacyBlur = json.optBoolean("disable_legacy_blur", false),
         disableSigner = json.optBoolean("disable_signer", false),
         safeModeEnabled = json.optBoolean("safe_mode_enabled", false),
         disableStaking = json.optBoolean("disable_staking", false),
@@ -45,8 +41,6 @@ data class FlagsEntity(
         disableSwap = false,
         disableExchangeMethods = false,
         disableDApps = false,
-        disableBlur = false,
-        disableLegacyBlur = false,
         disableSigner = false,
         safeModeEnabled = false,
         disableStaking = false,

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/ExternalUrl.kt

@@ -2,34 +2,12 @@ package com.tonapps.tonkeeper.helper
 
 object ExternalLinkHelper {
 
-    private fun getTonViewerPrefix(testnet: Boolean): String {
-        return if (testnet) "https://testnet.tonviewer.com/" else "https://tonviewer.com/"
-    }
-
     private fun getTronscanPrefix(testnet: Boolean): String {
         return if (testnet) "https://test.tronscan.org/" else "https://tronscan.org/"
     }
 
-    fun tonToken(walletAddress: String, tokenAddress: String, testnet: Boolean): String {
-        val prefix = getTonViewerPrefix(testnet)
-        if (tokenAddress.equals("ton", true)) {
-            return "$prefix$walletAddress"
-        }
-        return "$prefix$walletAddress/jetton/$tokenAddress"
-    }
-
     fun tronToken(walletAddress: String, testnet: Boolean): String {
         val prefix = getTronscanPrefix(testnet)
         return "$prefix#/address/$walletAddress"
     }
-
-    /*
-    val detailsUrl = if (token.isTon) {
-            "https://tonviewer.com/${screenContext.wallet.address}".toUri()
-        } else if (token.isTrc20) {
-            "https://tronscan.org/#/address/${viewModel.tronAddress}".toUri()
-        } else {
-            "https://tonviewer.com/${screenContext.wallet.address}/jetton/${token.address}".toUri()
-        }
-     */
 }

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/ExternalLinkHelper.kt

@@ -67,6 +67,9 @@ class BatteryRefillViewModel(
     private val isBatteryDisabled: Boolean
         get() = api.config.flags.disableBattery
 
+    private val isCryptoDisabled: Boolean
+        get() = api.config.disableBatteryCryptoRechargeModule
+
     private val _promoFlow = MutableStateFlow<String?>(null)
     private val promoFlow = _promoFlow.asStateFlow()
 
@@ -129,7 +132,7 @@ class BatteryRefillViewModel(
 
         val rechargeMethodsItems = uiItemsRechargeMethods(wallet)
 
-        if (!isBatteryDisabled && rechargeMethodsItems.isNotEmpty()) {
+        if (!isBatteryDisabled && !isCryptoDisabled && rechargeMethodsItems.isNotEmpty()) {
             uiItems.addAll(uiItemsRechargeMethods(wallet))
             uiItems.add(Item.Space)
         }

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt

@@ -105,7 +105,7 @@ class TxEventsViewModel(
         eventsRepository.hiddenTxIdsFlow,
     ) { paging, filterId, decryptedComment, hiddenTxIds ->
         paging.filter { item ->
-            !hiddenTxIds.contains(item.id) && (filterId == TxFilter.All.id || item.isMatch(filterId)) && !item.progress
+            !hiddenTxIds.contains(item.id) && (filterId == TxFilter.All.id || item.isMatch(filterId))
         }.map { item ->
             val decrypted = decryptedComment[item.id]
             if (decrypted.isNullOrEmpty()) {