Merge branch 'main' into feat/issuer-signed

Author: chsavvaidis

gradle/libs.versions.toml

@@ -269,6 +269,7 @@ compose-material-icons-core = { module = "org.jetbrains.compose.material:materia
 easyqrscan = { module = "io.github.kalinjul.easyqrscan:scanner", version.ref = "easyqrscan" }
 compose-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "compose-navigation3" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
+coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
 androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" }

waltid-applications/waltid-wallet-demo-compose/androidApp/src/androidTest/java/id/walt/walletdemo/compose/android/PublicDemoBackendE2ETest.kt

@@ -16,8 +16,6 @@ import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.launchAndUnlock
 import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.latestStatus
 import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.sendDeepLink
 import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.setTextByTag
-import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.waitForResource
-import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.waitForResourceEnabled
 import id.walt.walletdemo.compose.android.WalletComposeE2EHelper.waitForStatus
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertTrue
@@ -51,15 +49,16 @@ class PublicDemoBackendE2ETest {
 
         clickByTag(device, "wallet.receiveButton")
         assertTrue(
-            "Transaction-code input did not appear in offer review. Latest status: ${latestStatus(device)}",
-            waitForResource(device, "wallet.txCodeInput", CREDENTIAL_OPERATION_TIMEOUT) != null,
+            "Offer preview did not appear. Latest status: ${latestStatus(device)}",
+            waitForStatus(
+                device = device,
+                timeoutMs = CREDENTIAL_OPERATION_TIMEOUT,
+                matcher = { it.startsWith("Review credential offer") },
+                failurePrefixes = listOf("Receive failed", "Bootstrap failed"),
+            ),
         )
 
         setTextByTag(device, "wallet.txCodeInput", incorrectCodeFor(transactionCode))
-        assertTrue(
-            "Accept button did not enable after entering a transaction code",
-            waitForResourceEnabled(device, "wallet.offerAcceptButton", UI_ELEMENT_TIMEOUT),
-        )
         clickByTag(device, "wallet.offerAcceptButton")
         assertTrue(
             "Incorrect transaction code was not rejected. Latest status: ${latestStatus(device)}",
@@ -73,10 +72,6 @@ class PublicDemoBackendE2ETest {
 
         // The reviewed offer remains active so the corrected code can be retried directly.
         setTextByTag(device, "wallet.txCodeInput", transactionCode)
-        assertTrue(
-            "Accept button did not re-enable after correcting the transaction code",
-            waitForResourceEnabled(device, "wallet.offerAcceptButton", UI_ELEMENT_TIMEOUT),
-        )
         clickByTag(device, "wallet.offerAcceptButton")
         assertTrue(
             "Receive did not succeed after correcting the transaction code. Latest status: ${latestStatus(device)}",

waltid-applications/waltid-wallet-demo-compose/androidApp/src/androidTest/java/id/walt/walletdemo/compose/android/WalletComposeE2EHelper.kt

@@ -130,21 +130,28 @@ internal object WalletComposeE2EHelper {
     }
 
     fun clickByTag(device: UiDevice, tag: String) {
-        val node = waitForResource(device, tag, CLICK_VISIBLE_TIMEOUT)
-            ?: findVisibleResource(device, tag)
+        val initialNode = waitForVisibleResource(device, tag, CLICK_VISIBLE_TIMEOUT)
             ?: findResourceAfterScrolling(device, tag)
-        if (node == null) {
+        if (initialNode == null) {
             fail("$tag not found.\n${visibleUiSnapshot(device)}")
+            return
+        }
+        var node: UiObject2 = initialNode
+        val deadline = System.currentTimeMillis() + CLICK_VISIBLE_TIMEOUT
+        while (!node.isEnabled && System.currentTimeMillis() < deadline) {
+            Thread.sleep(200)
+            node = findVisibleResource(device, tag) ?: node
+        }
+        if (!node.isEnabled) {
+            fail("$tag is disabled.\n${visibleUiSnapshot(device)}")
         }
-        assertTrue("$tag is disabled", node!!.isEnabled)
         device.waitForIdle()
         node.clickableAncestorOrSelf()?.click() ?: node.click()
         device.waitForIdle()
     }
 
     fun setTextByTag(device: UiDevice, tag: String, value: String) {
-        val node = waitForResource(device, tag, CLICK_VISIBLE_TIMEOUT)
-            ?: findVisibleResource(device, tag)
+        val node = waitForVisibleResource(device, tag, CLICK_VISIBLE_TIMEOUT)
             ?: findResourceAfterScrolling(device, tag)
         if (node == null) {
             fail("$tag not found.\n${visibleUiSnapshot(device)}")
@@ -178,21 +185,32 @@ internal object WalletComposeE2EHelper {
             fail("$message. Claim row $tag not found.\n${visibleUiSnapshot(device)}")
             return
         }
-        val visibleTexts = node.flatten()
-            .mapNotNull { it.text?.trim()?.takeIf(String::isNotEmpty) }
-        val missingValues = expectedValues.filter { expected -> expected !in visibleTexts }
-        if (label !in visibleTexts || missingValues.isNotEmpty()) {
-            fail(
-                """
-                    $message.
-                    claim=$tag
-                    expectedLabel=$label
-                    expectedValues=$expectedValues
-                    visibleTexts=$visibleTexts
-                    ${visibleUiSnapshot(device)}
-                """.trimIndent()
-            )
+        var visibleTexts = node.visibleTexts()
+        fun expectedContentIsVisible(): Boolean =
+            label in visibleTexts && expectedValues.all { expected -> expected in visibleTexts }
+
+        if (expectedContentIsVisible()) return
+        repeat(6) {
+            device.scrollDown()
+            findVisibleResource(device, tag)?.let { visibleTexts = it.visibleTexts() }
+            if (expectedContentIsVisible()) return
+        }
+        repeat(12) {
+            device.scrollUp()
+            findVisibleResource(device, tag)?.let { visibleTexts = it.visibleTexts() }
+            if (expectedContentIsVisible()) return
         }
+
+        fail(
+            """
+                $message.
+                claim=$tag
+                expectedLabel=$label
+                expectedValues=$expectedValues
+                visibleTexts=$visibleTexts
+                ${visibleUiSnapshot(device)}
+            """.trimIndent()
+        )
     }
 
     fun waitForResource(device: UiDevice, tag: String, timeoutMs: Long): UiObject2? {
@@ -206,14 +224,13 @@ internal object WalletComposeE2EHelper {
         return null
     }
 
-    fun waitForResourceEnabled(device: UiDevice, tag: String, timeoutMs: Long): Boolean {
+    private fun waitForVisibleResource(device: UiDevice, tag: String, timeoutMs: Long): UiObject2? {
         val deadline = System.currentTimeMillis() + timeoutMs
         while (System.currentTimeMillis() < deadline) {
-            val node = device.findObject(By.res(tag)) ?: findVisibleResource(device, tag)
-            if (node?.isEnabled == true) return true
+            findVisibleResource(device, tag)?.let { return it }
             Thread.sleep(200)
         }
-        return false
+        return null
     }
 
     private fun findTextAfterScrolling(device: UiDevice, texts: List<String>): UiObject2? {
@@ -233,30 +250,39 @@ internal object WalletComposeE2EHelper {
         device.findObjects(By.pkg("id.walt.walletdemo.compose"))
             .flatMap { it.flatten() }
             .firstOrNull { node ->
-                runCatching { node.text?.trim() in texts }.getOrDefault(false)
+                node.isVisibleOn(device) && runCatching { node.text?.trim() in texts }.getOrDefault(false)
             }
 
     private fun findVisibleResource(device: UiDevice, tag: String): UiObject2? =
         device.findObjects(By.pkg("id.walt.walletdemo.compose"))
             .flatMap { it.flatten() }
             .firstOrNull { node ->
-                runCatching { node.resourceName == tag }.getOrDefault(false)
+                node.isVisibleOn(device) && runCatching { node.resourceName == tag }.getOrDefault(false)
             }
 
     private fun findResourceAfterScrolling(device: UiDevice, tag: String): UiObject2? {
+        findVisibleResource(device, tag)?.let { return it }
         repeat(6) {
             device.scrollDown()
-            waitForResource(device, tag, 1_000L)?.let { return it }
             findVisibleResource(device, tag)?.let { return it }
         }
         repeat(12) {
             device.scrollUp()
-            waitForResource(device, tag, 1_000L)?.let { return it }
             findVisibleResource(device, tag)?.let { return it }
         }
         return null
     }
 
+    private fun UiObject2.isVisibleOn(device: UiDevice): Boolean = runCatching {
+        val bounds = visibleBounds
+        bounds.width() > 0 &&
+            bounds.height() > 0 &&
+            bounds.right > 0 &&
+            bounds.bottom > 0 &&
+            bounds.left < device.displayWidth &&
+            bounds.top < device.displayHeight
+    }.getOrDefault(false)
+
     private fun claimTag(path: String): String =
         "wallet.claim.${path.map { if (it.isLetterOrDigit()) it else '_' }.joinToString("")}"
 
@@ -340,6 +366,9 @@ internal object WalletComposeE2EHelper {
     private fun UiObject2.flatten(): List<UiObject2> =
         listOf(this) + runCatching { children.flatMap { it.flatten() } }.getOrDefault(emptyList())
 
+    private fun UiObject2.visibleTexts(): List<String> =
+        flatten().mapNotNull { it.text?.trim()?.takeIf(String::isNotEmpty) }
+
     private fun UiObject2.snapshotIdentity(): String =
         runCatching {
             listOf(

waltid-applications/waltid-wallet-demo-compose/androidApp/src/main/java/id/walt/walletdemo/compose/android/MainActivity.kt

@@ -1,8 +1,10 @@
 package id.walt.walletdemo.compose.android
 
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import id.walt.walletdemo.compose.logic.DemoWalletConfig
@@ -16,7 +18,10 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT),
+        )
 
         val config = DemoWalletConfig(
             attestationBaseUrl = BuildConfig.ATTESTATION_BASE_URL,

waltid-applications/waltid-wallet-demo-compose/iosApp/iosAppUITests/PublicDemoBackendE2ETests.swift

@@ -190,6 +190,11 @@ final class PublicDemoBackendE2ETests: XCTestCase {
 
         ui.replaceText(in: txCodeInput, value: incorrectCode(for: transactionCode))
         ui.tapButton(identifier: "wallet.offerAcceptButton", fallbackLabel: "Accept")
+        try await Task.sleep(for: .seconds(1))
+        if ui.button(identifier: "wallet.offerAcceptButton", fallbackLabel: "Accept").isEnabled {
+            // Compose iOS can consume the first activation after auto-dismissing a text input.
+            ui.tapButton(identifier: "wallet.offerAcceptButton", fallbackLabel: "Accept")
+        }
         let rejectedStatus = ui.waitForStatus(prefixes: ["Receive failed"], timeout: credentialOperationTimeout)
         guard rejectedStatus?.starts(with: "Receive failed") == true else {
             XCTFail("Incorrect transaction code was not rejected, status: \(rejectedStatus ?? "nil")")
@@ -262,7 +267,7 @@ final class PublicDemoBackendE2ETests: XCTestCase {
         )
         XCTAssertEqual(previewStatus, "Review presentation request", "Presentation preview did not load, status: \(previewStatus ?? "nil")")
 
-        XCTAssertTrue(app.staticTexts["PAYMENT AUTHORIZATION"].waitForExistence(timeout: 10))
+        XCTAssertTrue(app.staticTexts["Payment Authorization"].waitForExistence(timeout: 10))
         XCTAssertTrue(app.staticTexts["42.00"].waitForExistence(timeout: 10))
         XCTAssertTrue(app.staticTexts["EUR"].waitForExistence(timeout: 10))
         XCTAssertTrue(app.staticTexts["ACME Corp"].waitForExistence(timeout: 10))

waltid-applications/waltid-wallet-demo-compose/iosApp/iosAppUITests/WalletE2EHelpers.swift

@@ -237,7 +237,7 @@ final class WalletE2EUI {
         let doneButton = app.toolbars.buttons["Done"]
         if doneButton.exists && doneButton.isHittable {
             doneButton.tap()
-        } else if let focusedElement {
+        } else if let focusedElement, hasKeyboardFocus(in: focusedElement) {
             focusedElement.typeText(XCUIKeyboardKey.return.rawValue)
         } else {
             app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.1)).tap()

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/androidMain/kotlin/id/walt/walletdemo/compose/logic/AndroidDemoWallet.kt

@@ -1,6 +1,7 @@
 package id.walt.walletdemo.compose.logic
 
 import android.content.Context
+import android.os.LocaleList
 import id.walt.wallet2.mobile.MobileWalletConfig
 import id.walt.wallet2.mobile.MobileWalletFactory
 
@@ -17,6 +18,9 @@ fun createAndroidDemoWallet(
                     walletId = config.walletId,
                     attestationConfig = config.toWalletAttestationConfig(),
                     transactionDataProfiles = transactionDataProfiles.profiles,
+                    preferredLocales = LocaleList.getDefault().let { locales ->
+                        List(locales.size()) { index -> locales[index].toLanguageTag() }
+                    },
                 )
             ),
             warning = transactionDataProfiles.warning,

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/CredentialCardDisplayData.kt

@@ -5,7 +5,7 @@ data class CredentialCardDisplayData(
     val title: String,
     val credentialType: String?,
     val format: String,
-    val issuer: String?,
+    val issuer: String,
     val holderName: String?,
     val validity: String?,
     val portrait: DisplayValue.Image?,
@@ -27,7 +27,7 @@ fun CredentialDetails.toCardDisplayData(): CredentialCardDisplayData {
         title = summary.label,
         credentialType = allItems.firstCredentialTypeText(),
         format = summary.format,
-        issuer = summary.issuer,
+        issuer = summary.issuer?.takeIf { it.isNotBlank() } ?: CredentialDisplayText.Unknown,
         holderName = holderName,
         validity = expiryDate?.let { CredentialDisplayText.expires(it) }
             ?: fallbackAddedDate?.let { CredentialDisplayText.added(it) },

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/CredentialDisplayMapping.kt

@@ -3,16 +3,6 @@ package id.walt.walletdemo.compose.logic
 fun CredentialSummary.toCredentialDetails(): CredentialDetails =
     CredentialDisplayNormalizer.toDetails(this)
 
-fun WalletDemoPresentationPreview.toVerifierDetails(): VerifierDetails =
-    VerifierDetails(
-        name = verifierName,
-        clientId = clientId,
-        responseUri = responseUri,
-        state = state,
-        nonce = nonce,
-        transactionData = transactionData,
-    )
-
 fun WalletDemoPresentationCredentialOption.toCredentialDetails(): CredentialDetails {
     val summary = CredentialSummary(
         id = selection.id,

waltid-applications/waltid-wallet-demo-compose/sharedLogic/src/commonMain/kotlin/id/walt/walletdemo/compose/logic/CredentialDisplayModels.kt

@@ -8,6 +8,7 @@ data class CredentialDetails(
 data class ClaimGroup(
     val title: String,
     val items: List<ClaimItem>,
+    val initiallyExpanded: Boolean = true,
 )
 
 class ClaimItemPath private constructor(