Merge branch 'master' into claude/issue-655-20260122-1114

Author: ovitrif

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: [ "master" ]
   pull_request:
+    types: [ opened, synchronize, reopened, ready_for_review ]
 
   workflow_dispatch:
 

.github/workflows/e2e.yml

@@ -8,6 +8,12 @@ on:
         required: false
         default: "default-feature-branch"
   pull_request:
+    paths:
+      - 'app/**'
+      - 'gradle/**'
+      - '*.gradle.kts'
+      - 'gradle.properties'
+      - '.github/workflows/e2e.yml'
 
 env:
   TERM: xterm-256color

README.md

@@ -90,20 +90,34 @@ To pull the latest translations from Transifex:
    - Follow the installation instructions: [Transifex CLI Installation](https://developers.transifex.com/docs/cli)
 
 2. **Authenticate with Transifex** (if not already configured):
-   - Create a `.transifexrc` file in your home directory (`~/.transifexrc`) with your API token:
-     ```ini
-     [https://www.transifex.com]
-     rest_hostname = https://rest.api.transifex.com
-     token         = YOUR_API_TOKEN_HERE
+   - Set the `TX_TOKEN` environment variable with your API token:
+     ```sh
+     export TX_TOKEN="YOUR_API_TOKEN_HERE"
      ```
-   - You can get your API token from your [Transifex account settings](https://www.transifex.com/user/settings/api/)
-   - The CLI will prompt you for an API token if one is not configured
+   - You can get your API token from [Transifex account settings](https://www.transifex.com/user/settings/api/)
+   - Add it to `~/.zshrc` or other shell rc file to persist across sessions
 
 3. **Pull translations**:
    ```sh
    ./scripts/pull-translations.sh
    ```
 
+### Pushing Source Strings
+
+When you add or modify translation keys in the EN source file, push them to Transifex:
+
+```sh
+tx push --source
+```
+
+### Translation Workflow
+
+1. **Add/modify strings** in `app/src/main/res/values/strings.xml`
+2. **Push to Transifex:** `tx push --source`
+3. **Translators** work on translations in Transifex
+4. **Pull translations:** `./scripts/pull-translations.sh`
+5. **Commit** the updated translation files
+
 ## Build
 
 ### Bitcoin Networks

app/src/main/java/to/bitkit/ext/FileSystem.kt

@@ -4,7 +4,7 @@ import to.bitkit.utils.AppError
 import java.io.File
 import kotlin.io.path.exists
 
-fun File.ensureDir() = this.also {
+fun File.ensureDir(): File = this.also {
     if (toPath().exists()) return this
 
     val path = if (extension.isEmpty()) this else parentFile

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -7,6 +7,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
@@ -109,6 +110,11 @@ class WakeNodeWorker @AssistedInject constructor(
             .fold(
                 onSuccess = { Result.success() },
                 onFailure = { e ->
+                    if (e is CancellationException) {
+                        Logger.debug("Work cancelled", context = TAG)
+                        return@fold Result.failure(workDataOf("Reason" to "Cancelled"))
+                    }
+
                     val reason = e.message ?: appContext.getString(R.string.common__error_body)
 
                     bestAttemptContent = NotificationDetails(

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -8,7 +8,6 @@ import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.Scanner
 import com.synonym.bitkitcore.createChannelRequestUrl
 import com.synonym.bitkitcore.createWithdrawCallbackUrl
-import com.synonym.bitkitcore.decode
 import com.synonym.bitkitcore.lnurlAuth
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -552,7 +551,7 @@ class LightningRepo @Inject constructor(
         return runCatching {
             // TODO use bitkit-core getLnurlInvoice if it works with callbackUrl
             val bolt11 = lnurlService.fetchLnurlInvoice(callbackUrl, amountSats, comment).getOrThrow().pr
-            val decoded = (decode(bolt11) as Scanner.Lightning).invoice
+            val decoded = (coreService.decode(bolt11) as Scanner.Lightning).invoice
             return@runCatching decoded
         }.onFailure {
             Logger.error(

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -3,7 +3,6 @@ package to.bitkit.repositories
 import com.synonym.bitkitcore.AddressType
 import com.synonym.bitkitcore.PreActivityMetadata
 import com.synonym.bitkitcore.Scanner
-import com.synonym.bitkitcore.decode
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -137,7 +136,7 @@ class WalletRepo @Inject constructor(
     ) {
         val onChainAddress = getOnchainAddress()
         val paymentHash = runCatching {
-            when (val decoded = decode(bip21Url)) {
+            when (val decoded = coreService.decode(bip21Url)) {
                 is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
                 is Scanner.OnChain -> decoded.extractLightningHash()
                 else -> null
@@ -418,7 +417,7 @@ class WalletRepo @Inject constructor(
         if (bolt11.isEmpty()) return@withContext null
 
         runCatching {
-            when (val decoded = decode(bolt11)) {
+            when (val decoded = coreService.decode(bolt11)) {
                 is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
                 else -> null
             }
@@ -544,7 +543,7 @@ class WalletRepo @Inject constructor(
     private suspend fun Scanner.OnChain.extractLightningHash(): String? {
         val lightningInvoice: String = this.invoice.params?.get("lightning") ?: return null
 
-        return when (val decoded = decode(lightningInvoice)) {
+        return when (val decoded = coreService.decode(lightningInvoice)) {
             is Scanner.Lightning -> decoded.invoice.paymentHash.toHex()
             else -> null
         }

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -20,6 +20,7 @@ import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
 import com.synonym.bitkitcore.PreActivityMetadata
+import com.synonym.bitkitcore.Scanner
 import com.synonym.bitkitcore.SortDirection
 import com.synonym.bitkitcore.WordCount
 import com.synonym.bitkitcore.addTags
@@ -185,6 +186,12 @@ class CoreService @Inject constructor(
         com.synonym.bitkitcore.isAddressUsed(address = address)
     }
 
+    @Suppress("ForbiddenComment")
+    suspend fun decode(input: String): Scanner = ServiceQueue.CORE.background {
+        // TODO: Remove lowercase workaround when https://github.com/synonymdev/bitkit-core/issues/66 is fixed
+        com.synonym.bitkitcore.decode(input.lowercase())
+    }
+
     companion object {
         private const val TAG = "CoreService"
     }

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

@@ -34,6 +34,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -291,6 +292,8 @@ private fun DrawerItem(
                     fontFamily = InterFontFamily,
                     color = Colors.White,
                 ),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
                 modifier = Modifier.weight(1f)
             )
         }

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

@@ -8,6 +8,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -46,6 +47,7 @@ fun TextInput(
     supportingText: @Composable (() -> Unit)? = null,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     textStyle: TextStyle = AppTextStyles.BodySSB,
+    colors: TextFieldColors = AppTextFieldDefaults.semiTransparent,
 ) {
     var textFieldValue by remember { mutableStateOf(TextFieldValue(value)) }
 
@@ -75,7 +77,7 @@ fun TextInput(
         maxLines = maxLines,
         minLines = minLines,
         singleLine = singleLine,
-        colors = AppTextFieldDefaults.semiTransparent,
+        colors = colors,
         shape = AppShapes.small,
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,