fix(mobile): restore preview session CI checks

Author: szijpeter

waltid-applications/waltid-wallet-demo-compose/sharedUI/src/mobileUiTest/kotlin/id/walt/walletdemo/compose/ui/WalletDemoAppTestScenarios.kt

@@ -25,6 +25,7 @@ import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.compose.ui.test.performSemanticsAction
 import androidx.compose.ui.test.performTextInput
+import androidx.compose.ui.test.performTextReplacement
 import androidx.compose.ui.test.v2.runComposeUiTest
 import id.walt.walletdemo.compose.logic.DemoPinStore
 import id.walt.walletdemo.compose.logic.DemoWallet
@@ -292,6 +293,7 @@ class WalletDemoAppTestScenarios {
 
     fun invalidPresentationCanBeDismissedLocallyOrReportedToVerifier() = runComposeUiTest {
         val error = WalletDemoPresentationError(
+            previewHandle = samplePresentationPreview.previewHandle,
             verifier = VerifierDetails(name = "Example Verifier", clientId = "https://verifier.example"),
             errorCode = "invalid_transaction_data",
             message = "Unsupported transaction data type",
@@ -325,7 +327,7 @@ class WalletDemoAppTestScenarios {
         waitUntil(timeoutMillis = 5_000) { controller.state.value.presentationError == null }
 
         assertEquals(null, wallet.rejectedRequestUrl)
-        onNodeWithTag(WalletUiTestTags.PresentationInput).assertIsEnabled().performTextInput("openid4vp://invalid")
+        onNodeWithTag(WalletUiTestTags.PresentationInput).assertIsEnabled().performTextReplacement("openid4vp://invalid")
         onNodeWithTag(WalletUiTestTags.PresentButton).performClick()
         waitUntil(timeoutMillis = 5_000) { controller.state.value.presentationError == error }
         onNodeWithTag(WalletUiTestTags.PresentationErrorNotifyButton).performScrollTo().performClick()
@@ -375,8 +377,8 @@ class WalletDemoAppTestScenarios {
         onNodeWithTag("wallet.tab.present").performClick()
         onNodeWithTag("wallet.status").assertTextContains("Presentation sent")
         onNodeWithTag("wallet.presentationInput").assertIsNotEnabled()
-        assertPresentationNewActionPrecedesReadOnlyReview()
-        onNodeWithTag(WalletUiTestTags.credentialCard(samplePresentationCredentialOption.selection.id)).performScrollTo().assertIsDisplayed()
+        onNodeWithTag(WalletUiTestTags.PresentationNewButton).performScrollTo().assertIsDisplayed()
+        onAllNodesWithTag(WalletUiTestTags.PresentationReview).assertCountEquals(0)
         onAllNodesWithTag("wallet.presentationSubmitButton").assertCountEquals(0)
         onAllNodesWithTag("wallet.presentationRejectButton").assertCountEquals(0)
         onNodeWithTag("wallet.presentationNewButton").performScrollTo().performClick()
@@ -780,28 +782,6 @@ class WalletDemoAppTestScenarios {
         onNodeWithText("nonce-456").performScrollTo().assertIsDisplayed()
     }
 
-    private fun ComposeUiTest.assertPresentationNewActionPrecedesReadOnlyReview() {
-        val presentTabLandmarkTags = onAllNodes(
-            matcher = hasAnyAncestor(hasTestTag("wallet.presentTabContent")) and (
-                hasTestTag("wallet.presentationNewButton") or
-                    hasTestTag("wallet.presentationReview")
-                ),
-            useUnmergedTree = true,
-        )
-            .fetchSemanticsNodes()
-            .mapNotNull { it.config.getOrElseNullable(SemanticsProperties.TestTag) { null } }
-
-        val newActionIndex = presentTabLandmarkTags.indexOf("wallet.presentationNewButton")
-        val reviewIndex = presentTabLandmarkTags.indexOf("wallet.presentationReview")
-
-        assertTrue(newActionIndex >= 0, "New presentation action is missing: $presentTabLandmarkTags")
-        assertTrue(reviewIndex >= 0, "Read-only presentation review is missing: $presentTabLandmarkTags")
-        assertTrue(
-            newActionIndex < reviewIndex,
-            "New presentation action should precede the read-only review so starting over stays easy: $presentTabLandmarkTags",
-        )
-    }
-
     companion object {
         val sampleCredential = WalletDemoCredential(
             id = "cred-1",
@@ -919,6 +899,7 @@ private class FakeDemoWallet(
     var presentedRequestUrl: String? = null
     var previewedRequestUrl: String? = null
     var submittedRequestUrl: String? = null
+    var rejectedRequestUrl: String? = null
     private val issuanceSources = mutableMapOf<WalletDemoIssuancePreviewHandle, String>()
     private val presentationSources = mutableMapOf<WalletDemoPresentationPreviewHandle, String>()
 
@@ -976,8 +957,8 @@ private class FakeDemoWallet(
     override suspend fun rejectPresentation(
         previewHandle: WalletDemoPresentationPreviewHandle,
     ): WalletDemoOperationResult {
-        submittedRequestUrl = presentationSources[previewHandle]
-        return presentationResult
+        rejectedRequestUrl = presentationSources[previewHandle]
+        return WalletDemoOperationResult.Success("Presentation declined")
     }
 
     override suspend fun discardPresentationPreview(previewHandle: WalletDemoPresentationPreviewHandle) {

waltid-libraries/protocols/waltid-wallet-sdk-ios/Sources/WalletSDK/WalletModels.swift

@@ -660,6 +660,7 @@ public struct PresentationPreviewError: Equatable, Sendable {
     /// Creates a presentation preview error.
     ///
     /// - Parameters:
+    ///   - previewHandle: Opaque handle required to reject or discard this reviewed request.
     ///   - request: Validated response destination and request context shown before responding.
     ///   - code: OpenID4VP or OAuth authorization error code selected by the wallet.
     ///   - message: Local diagnostic that is not sent to the verifier automatically.