Merge main into ATL-4496

hyperledger · Oct 16, 2023 · 1898ca8 · 1898ca8
2 parents 8bd9bb7 + 0549258
commit 1898ca8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/PolluxImpl.kt b/atala-prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/pollux/PolluxImpl.kt
@@ -192,7 +192,12 @@ class PolluxImpl(
     }
 
     override fun extractCredentialFormatFromMessage(formats: Array<AttachmentDescriptor>): CredentialType {
-        val desiredFormats = setOf(CredentialType.JWT.type, CredentialType.ANONCREDS_OFFER.type, CredentialType.ANONCREDS_REQUEST.type, CredentialType.ANONCREDS_ISSUE.type)
+        val desiredFormats = setOf(
+            CredentialType.JWT.type,
+            CredentialType.ANONCREDS_OFFER.type,
+            CredentialType.ANONCREDS_REQUEST.type,
+            CredentialType.ANONCREDS_ISSUE.type
+        )
         val foundFormat = formats.find { it.format in desiredFormats }
         return foundFormat?.format?.let { format ->
             when (format) {

diff --git a/...lin/io/iohk/atala/prism/walletsdk/prismagent/protocols/issueCredential/OfferCredential.kt b/...lin/io/iohk/atala/prism/walletsdk/prismagent/protocols/issueCredential/OfferCredential.kt
@@ -79,6 +79,9 @@ data class OfferCredential @JvmOverloads constructor(
 
             val fromDID = fromMessage.from
             val toDID = fromMessage.to
+            val json = Json {
+                ignoreUnknownKeys = true
+            }
             val body = Json.decodeFromString<Body>(fromMessage.body)
             return OfferCredential(
                 id = fromMessage.id,

diff --git a/gradle.properties b/gradle.properties
@@ -8,4 +8,4 @@ apollo_version = 1.0.2
 didpeer_version = 1.0.4-alpha
 kotlin.mpp.androidSourceSetLayoutVersion = 2
 kotlinx.atomicfu.enableJvmIrTransformation=true
-kotlinx.atomicfu.enableJsIrTransformation=true
+kotlinx.atomicfu.enableJsIrTransformation=true