Skip to content

Commit f43c091

Browse files
committed
fix: split pubky homegate env
1 parent 12b0516 commit f43c091

3 files changed

Lines changed: 29 additions & 5 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ val bcp47Locales = listOf(
4747
"en", "ar", "es-419", "ca", "cs", "de", "el", "es", "es-ES", "fr", "it", "nl", "pl", "pt", "pt-BR", "ru"
4848
)
4949
val e2eBackendEnv = System.getenv("E2E_BACKEND") ?: "local"
50+
val e2eHomegateUrlEnv = System.getenv("E2E_HOMEGATE_URL") ?: "http://127.0.0.1:6288"
5051

5152
android {
5253
namespace = "to.bitkit"
@@ -63,6 +64,7 @@ android {
6364
}
6465
buildConfigField("boolean", "E2E", System.getenv("E2E")?.toBoolean()?.toString() ?: "false")
6566
buildConfigField("String", "E2E_BACKEND", "\"$e2eBackendEnv\"")
67+
buildConfigField("String", "E2E_HOMEGATE_URL", "\"$e2eHomegateUrlEnv\"")
6668
buildConfigField("boolean", "GEO", System.getenv("GEO")?.toBoolean()?.toString() ?: "true")
6769
buildConfigField("String", "LOCALES", "\"${bcp47Locales.joinToString(",")}\"")
6870
}

app/src/main/java/to/bitkit/env/Env.kt

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ internal object Env {
2020
const val isE2eTest = BuildConfig.E2E
2121
const val isGeoblockingEnabled = BuildConfig.GEO
2222
val e2eBackend = BuildConfig.E2E_BACKEND.lowercase()
23+
val isLocalE2eBackend = isE2eTest && e2eBackend == "local"
24+
const val e2eHomegateUrl = BuildConfig.E2E_HOMEGATE_URL
2325
val network = Network.valueOf(BuildConfig.NETWORK)
2426
val locales = BuildConfig.LOCALES.split(",")
2527
const val walletSyncIntervalSecs = 10_uL
@@ -53,10 +55,11 @@ internal object Env {
5355

5456
val electrumServerUrl: String
5557
get() {
56-
val isE2eLocal = isE2eTest && e2eBackend == "local"
5758
return when (network) {
5859
Network.BITCOIN -> ElectrumServers.MAINNET.ESPLORA
59-
Network.REGTEST -> if (isE2eLocal) ElectrumServers.REGTEST.LOCAL else ElectrumServers.REGTEST.STAG
60+
Network.REGTEST -> {
61+
if (isLocalE2eBackend) ElectrumServers.REGTEST.LOCAL else ElectrumServers.REGTEST.STAG
62+
}
6063
Network.TESTNET -> ElectrumServers.TESTNET
6164
else -> TODO("${network.name} network not implemented")
6265
}
@@ -169,8 +172,12 @@ internal object Env {
169172
return "/pub/$pubkyDomain/:rw,/pub/${prefix}pubky.app/:r,/pub/${prefix}paykit/v0/:rw"
170173
}
171174

172-
// Switch to production for mainnet once available
173-
const val homegateUrl = "https://homegate.staging.pubky.app"
175+
val homegateUrl: String
176+
get() = homegateUrlFor(
177+
network = network,
178+
isLocalE2eBackend = isLocalE2eBackend,
179+
e2eHomegateUrl = e2eHomegateUrl,
180+
)
174181

175182
val profilePath: String
176183
get() = "/pub/$pubkyDomain/profile.json"
@@ -231,6 +238,21 @@ internal object Env {
231238
// endregion
232239
}
233240

241+
internal fun homegateUrlFor(
242+
network: Network,
243+
isLocalE2eBackend: Boolean,
244+
e2eHomegateUrl: String,
245+
): String {
246+
if (isLocalE2eBackend) {
247+
return e2eHomegateUrl
248+
}
249+
250+
return when (network) {
251+
Network.BITCOIN -> "https://homegate.pubky.app"
252+
else -> "https://homegate.staging.pubky.app"
253+
}
254+
}
255+
234256
@Suppress("ConstPropertyName")
235257
object Defaults {
236258
/** Recommended transaction base fee in sats */

app/src/main/java/to/bitkit/ui/components/SheetHost.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.graphics.Color
2424
import androidx.compose.ui.unit.dp
2525
import kotlinx.coroutines.launch
26-
import to.bitkit.ui.shared.modifiers.clickableAlpha
2726
import to.bitkit.ui.screens.wallets.receive.ReceiveRoute
27+
import to.bitkit.ui.shared.modifiers.clickableAlpha
2828
import to.bitkit.ui.sheets.BackupRoute
2929
import to.bitkit.ui.sheets.PinRoute
3030
import to.bitkit.ui.sheets.SendRoute

0 commit comments

Comments
 (0)