Merge branch 'master' into fix/bitkit-not-responding

Author: jvsena42

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,71 @@
+name: Bug Report
+description: Report a bug in Bitkit Android
+title: ''
+type: bug
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Brief description of the issue or additional context
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      value: |
+        1. 
+        2. 
+        3. 
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Behavior
+      description: What actually happened
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: What you expected to happen
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs / Screenshots / Recordings
+      description: Attach relevant logs, screenshots, or screen recordings
+    validations:
+      required: false
+
+  - type: input
+    id: version
+    attributes:
+      label: Bitkit Version
+      placeholder: e.g., 2.0.0 or commit SHA
+    validations:
+      required: false
+
+  - type: input
+    id: platform
+    attributes:
+      label: Platform
+      placeholder: e.g., Pixel 7 / Emulator / Android 14
+    validations:
+      required: false
+
+  - type: input
+    id: network
+    attributes:
+      label: Network
+      placeholder: e.g., mainnet / regtest / local
+    validations:
+      required: false

.github/workflows/e2e_migration.yml

@@ -7,6 +7,8 @@ on:
         description: "Branch of synonymdev/bitkit-e2e-tests to use (main | default-feature-branch | custom branch name)"
         required: false
         default: "default-feature-branch"
+  schedule:
+    - cron: "0 2 * * *"
 
 env:
   TERM: xterm-256color
@@ -75,13 +77,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        rn_version:
+          - v1.1.6
+          - v1.1.4
+          - v1.1.3
         scenario:
-          - { name: migration_1, grep: "@migration_1" }
-          - { name: migration_2, grep: "@migration_2" }
-          - { name: migration_3, grep: "@migration_3" }
-          - { name: migration_4, grep: "@migration_4" }
+          - { name: migration_1-restore, grep: "@migration_1" }
+          - { name: migration_2-migration, grep: "@migration_2" }
+          - { name: migration_3-with-passphrase, grep: "@migration_3" }
+          - { name: migration_4-with-sweep, grep: "@migration_4" }
 
-    name: e2e-tests - ${{ matrix.scenario.name }}
+    name: e2e-tests - ${{ matrix.rn_version }} - ${{ matrix.scenario.name }}
 
     steps:
       - name: Show selected E2E branch
@@ -111,7 +117,7 @@ jobs:
       - name: Download RN app for migration
         run: |
           curl -L -o bitkit-e2e-tests/aut/bitkit_rn_regtest.apk \
-            https://github.com/synonymdev/bitkit-e2e-tests/releases/download/migration-rn-regtest/bitkit_rn_regtest.apk
+            https://github.com/synonymdev/bitkit-e2e-tests/releases/download/migration-rn-regtest/bitkit_rn_regtest_${{ matrix.rn_version }}.apk
 
       - name: List APK directory contents
         run: ls -l bitkit-e2e-tests/aut
@@ -189,5 +195,5 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: e2e-artifacts_${{ matrix.scenario.name }}_${{ github.run_number }}
+          name: e2e-artifacts_${{ matrix.scenario.name }}_${{ matrix.rn_version }}_${{ github.run_number }}
           path: bitkit-e2e-tests/artifacts/

app/src/main/java/to/bitkit/models/Network.kt

@@ -24,3 +24,10 @@ fun Network.toCoreNetworkType(): NetworkType = when (this) {
     Network.SIGNET -> NetworkType.SIGNET
     Network.REGTEST -> NetworkType.REGTEST
 }
+
+fun NetworkType.toLdkNetwork(): Network = when (this) {
+    NetworkType.BITCOIN -> Network.BITCOIN
+    NetworkType.TESTNET -> Network.TESTNET
+    NetworkType.SIGNET -> Network.SIGNET
+    NetworkType.REGTEST -> Network.REGTEST
+}

app/src/main/java/to/bitkit/ui/settings/advanced/sweep/SweepSettingsScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -224,7 +225,9 @@ private fun FoundFundsView(
         PrimaryButton(
             text = stringResource(R.string.sweep__to_wallet),
             onClick = onSweepToWallet,
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag("SweepToWalletButton")
         )
 
         VerticalSpacer(16.dp)

app/src/main/java/to/bitkit/utils/Bip21Utils.kt

@@ -4,6 +4,22 @@ import to.bitkit.models.SATS_IN_BTC
 
 object Bip21Utils {
 
+    private const val BIP21_PREFIX = "bitcoin:"
+
+    /**
+     * Checks if a BIP21 URI is duplicated (contains multiple bitcoin: prefixes).
+     * Workaround for https://github.com/synonymdev/bitkit-core/issues/63
+     * @return true if the input contains duplicated BIP21 URIs, false otherwise
+     */
+    fun isDuplicatedBip21(input: String): Boolean {
+        val lowercased = input.lowercase()
+        val firstIndex = lowercased.indexOf(BIP21_PREFIX)
+        if (firstIndex == -1) return false
+
+        val secondIndex = lowercased.indexOf(BIP21_PREFIX, firstIndex + BIP21_PREFIX.length)
+        return secondIndex != -1
+    }
+
     fun buildBip21Url(
         bitcoinAddress: String,
         amountSats: ULong? = null,

app/src/main/java/to/bitkit/utils/NetworkValidationHelper.kt

@@ -0,0 +1,25 @@
+package to.bitkit.utils
+
+import org.lightningdevkit.ldknode.Network
+
+/**
+ * Helper for validating Bitcoin network compatibility of addresses and invoices
+ */
+object NetworkValidationHelper {
+    /**
+     * Check if an address/invoice network mismatches the current app network
+     * @param addressNetwork The network detected from the address/invoice
+     * @param currentNetwork The app's current network (typically Env.network)
+     * @return true if there's a mismatch (address won't work on current network)
+     */
+    fun isNetworkMismatch(addressNetwork: Network?, currentNetwork: Network): Boolean {
+        if (addressNetwork == null) return false
+
+        // Special case: regtest uses testnet prefixes (m, n, 2, tb1)
+        if (currentNetwork == Network.REGTEST && addressNetwork == Network.TESTNET) {
+            return false
+        }
+
+        return addressNetwork != currentNetwork
+    }
+}