From e1d3a82acb9f38bcfad523e9e26ada99f5b302b5 Mon Sep 17 00:00:00 2001 From: polstianka Date: Thu, 24 Oct 2024 15:57:02 -0700 Subject: [PATCH] remove promo --- .../com/tonapps/signer/deeplink/entities/SignRequestEntity.kt | 4 ++-- .../src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt | 4 ++-- .../main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/signer/src/main/java/com/tonapps/signer/deeplink/entities/SignRequestEntity.kt b/apps/signer/src/main/java/com/tonapps/signer/deeplink/entities/SignRequestEntity.kt index 153b1c1ec..008659e6f 100644 --- a/apps/signer/src/main/java/com/tonapps/signer/deeplink/entities/SignRequestEntity.kt +++ b/apps/signer/src/main/java/com/tonapps/signer/deeplink/entities/SignRequestEntity.kt @@ -2,7 +2,7 @@ package com.tonapps.signer.deeplink.entities import android.net.Uri import com.tonapps.blockchain.ton.TonNetwork -import com.tonapps.blockchain.ton.extensions.parseCell +import com.tonapps.blockchain.ton.extensions.cellFromHex import com.tonapps.blockchain.ton.extensions.safePublicKey import com.tonapps.extensions.getMultipleQuery import com.tonapps.signer.Key @@ -27,7 +27,7 @@ data class SignRequestEntity( private val tonNetwork: String = uri.getMultipleQuery("tn", "network") ?: "mainnet" - val body: Cell = uri.getQueryParameter(Key.BODY)?.parseCell() ?: throw IllegalArgumentException("body is required") + val body: Cell = uri.getQueryParameter(Key.BODY)?.cellFromHex() ?: throw IllegalArgumentException("body is required") val publicKey: PublicKeyEd25519 = uri.getQueryParameter(Key.PK)?.safePublicKey() ?: throw IllegalArgumentException("pk is required") val network: TonNetwork = if (tonNetwork == "mainnet" || tonNetwork == "-239") { diff --git a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt index fec19f1e0..d4efc4c3d 100644 --- a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt +++ b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignArgs.kt @@ -2,8 +2,8 @@ package com.tonapps.signer.screen.sign import android.os.Bundle import com.tonapps.blockchain.ton.TonNetwork +import com.tonapps.blockchain.ton.extensions.cellFromHex import com.tonapps.blockchain.ton.extensions.hex -import com.tonapps.blockchain.ton.extensions.parseCell import com.tonapps.signer.Key import com.tonapps.signer.deeplink.entities.ReturnResultEntity import com.tonapps.signer.extensions.getEnum @@ -33,7 +33,7 @@ data class SignArgs(private val args: Bundle) { } val id = args.getLong(Key.ID) - val body: Cell = args.getString(Key.BODY)!!.parseCell() + val body: Cell = args.getString(Key.BODY)!!.cellFromHex() val v: String = args.getString(Key.V)!! val returnResult = args.getObject(Key.RETURN) val seqno = args.getInt(Key.SEQNO) diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt index f6479668a..e23c559e8 100644 --- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt +++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt @@ -93,7 +93,7 @@ data class ConfigEntity( batteryReservedAmount = json.optString("batteryReservedAmount", "0.3"), batteryMaxInputAmount = json.optString("batteryMaxInputAmount", "3"), batteryRefundEndpoint = json.optString("batteryRefundEndpoint", "https://battery-refund-app.vercel.app"), - batteryPromoDisable = json.optBoolean("disable_battery_promo_module", true), + batteryPromoDisable = false, // json.optBoolean("disable_battery_promo_module", true), stakingInfoUrl = json.getString("stakingInfoUrl"), tonapiSSEEndpoint = json.optString("tonapi_sse_endpoint", "https://rt.tonapi.io"), tonapiSSETestnetEndpoint = json.optString("tonapi_sse_testnet_endpoint", "https://rt-testnet.tonapi.io"),