judokit-react-native 4.0.0 → 4.1.0

package/JudoPay.tsx

@@ -1,5 +1,6 @@
 import { NativeModules } from 'react-native'
 import JudoPBBAButton from './components/JudoPBBAButton'
+import { version as packageVersion } from './package.json'
 
 import {
     JudoConfiguration,
@@ -142,10 +143,10 @@ class JudoPay {
         type: JudoTransactionType,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionTypeParameters(
-            type,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionTypeParameters(type, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeTransaction(params)
     }
 
@@ -155,7 +156,8 @@ class JudoPay {
         const params = {
             authorization: this.generateAuthorizationParameters(),
             sandboxed: this.isSandboxed,
-            receiptId
+            receiptId,
+            packageVersion
         }
 
         return NativeModules.RNJudo.fetchTransactionDetails(params)
@@ -188,7 +190,8 @@ class JudoPay {
                 securityCode,
                 cardholderName,
                 cardScheme
-            }
+            },
+            packageVersion
         }
         return NativeModules.RNJudo.performTokenTransaction(params)
     }
@@ -207,10 +210,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeApplePay(params)
     }
 
@@ -228,10 +231,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokeGooglePay(params)
     }
 
@@ -245,7 +248,10 @@ class JudoPay {
     public async invokePayByBankApp(
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateJudoParameters(configuration)
+        const params = {
+            ...this.generateJudoParameters(configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokePayByBankApp(params)
     }
 
@@ -262,10 +268,10 @@ class JudoPay {
         mode: JudoTransactionMode,
         configuration: JudoConfiguration
     ): Promise<JudoResponse> {
-        const params = this.generateTransactionModeParameters(
-            mode,
-            configuration
-        )
+        const params = {
+            ...this.generateTransactionModeParameters(mode, configuration),
+            packageVersion
+        }
         return NativeModules.RNJudo.invokePaymentMethodScreen(params)
     }
 

package/RNJudopay.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/Classes/**/*.{h,m}"
   s.requires_arc = true
   s.dependency "React"
-  s.dependency "JudoKit-iOS", "3.1.11"
+  s.dependency "JudoKit-iOS", "3.2.2"
 
   s.test_spec 'RNJudoTests' do |test_spec|
     test_spec.source_files = 'ios/RNJudoTests/**/*.{h,m}'

package/android/build.gradle

@@ -153,7 +153,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation 'com.judopay:judokit-android:4.0.1'
+    implementation 'com.judopay:judokit-android:4.1.0'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"

package/android/src/main/java/com/reactlibrary/Extensions.kt

@@ -13,43 +13,67 @@ const val CARD_SCHEME_VISA = "visa"
 const val CARD_SCHEME_MASTERCARD = "mastercard"
 const val CARD_SCHEME_AMEX = "amex"
 
-internal fun ReadableMap?.hasKey(key: String): Boolean {
-    if (this != null) {
-        return this.hasKey(key)
-    }
-    return false
+internal fun ReadableMap?.hasKey(key: String): Boolean = this?.hasKey(key) ?: false
+
+internal fun ReadableMap?.getOptionalString(key: String): String? = if (hasKey(key)) {
+    this?.getString(key)
+} else {
+    null
+}
+
+internal fun ReadableMap?.getOptionalBoolean(key: String): Boolean? = if (hasKey(key)) {
+    this?.getBoolean(key)
+} else {
+    null
+}
+
+internal fun ReadableMap?.getOptionalInt(key: String): Int? = if (hasKey(key)) {
+    this?.getInt(key)
+} else {
+    null
+}
+
+internal fun ReadableMap?.getOptionalDouble(key: String): Double? = if (hasKey(key)) {
+    this?.getDouble(key)
+} else {
+    null
+}
+
+internal fun ReadableMap?.getOptionalMap(key: String): ReadableMap? = if (hasKey(key)) {
+    this?.getMap(key)
+} else {
+    null
+}
+
+internal fun ReadableMap?.getOptionalArray(key: String): ReadableArray? = if (hasKey(key)) {
+    this?.getArray(key)
+} else {
+    null
 }
 
 internal val ReadableMap.configuration: ReadableMap?
-    get() = getMap("configuration")
+    get() = getOptionalMap("configuration")
 
 internal val ReadableMap.transactionMode: Int?
-    get() = getInt("transactionMode")
+    get() = getOptionalInt("transactionMode")
 
 internal val ReadableMap.authorization: ReadableMap?
-    get() = getMap("authorization")
+    get() = getOptionalMap("authorization")
 
 internal val ReadableMap.isSandboxed: Boolean?
-    get() = getBoolean("sandboxed")
+    get() = getOptionalBoolean("sandboxed")
+
+internal val ReadableMap.packageVersion: String?
+    get() = getOptionalString("packageVersion")
 
 internal val ReadableMap.cardToken: String?
-    get() = getString("cardToken")
+    get() = getOptionalString("cardToken")
 
 internal val ReadableMap.securityCode: String?
-    get() {
-        if (hasKey("securityCode")) {
-            return getString("securityCode")
-        }
-        return null
-    }
+    get() = getOptionalString("securityCode")
 
 internal val ReadableMap.cardholderName: String?
-    get() {
-        if (hasKey("cardholderName")) {
-            return getString("cardholderName")
-        }
-        return null
-    }
+    get() = getOptionalString("cardholderName")
 
 internal val ReadableMap.cardType: CardNetwork
     get() {
@@ -60,7 +84,7 @@ internal val ReadableMap.cardType: CardNetwork
         }
 
         return when {
-            cardScheme.contains(CARD_SCHEME_VISA)  -> CardNetwork.VISA
+            cardScheme.contains(CARD_SCHEME_VISA) -> CardNetwork.VISA
             cardScheme.contains(CARD_SCHEME_MASTERCARD) -> CardNetwork.MASTERCARD
             cardScheme.contains(CARD_SCHEME_AMEX) -> CardNetwork.AMEX
             else -> CardNetwork.OTHER
@@ -68,537 +92,280 @@ internal val ReadableMap.cardType: CardNetwork
     }
 
 internal val ReadableMap.judoId: String?
-    get() = configuration?.getString("judoId")
+    get() = configuration?.getOptionalString("judoId")
 
 internal val ReadableMap.receiptId: String?
-    get() = getString("receiptId")
+    get() = getOptionalString("receiptId")
 
 internal val ReadableMap.token: String?
-    get() = authorization?.getString("token")
+    get() = authorization?.getOptionalString("token")
 
 internal val ReadableMap.secret: String?
-    get() = authorization?.getString("secret")
+    get() = authorization?.getOptionalString("secret")
 
 internal val ReadableMap.paymentSession: String?
-    get() = authorization?.getString("paymentSession")
+    get() = authorization?.getOptionalString("paymentSession")
 
 internal val ReadableMap.amount: ReadableMap?
-    get() = configuration?.getMap("amount")
+    get() = configuration?.getOptionalMap("amount")
 
 internal val ReadableMap.amountValue: String?
-    get() = amount?.getString("value")
+    get() = amount?.getOptionalString("value")
 
 internal val ReadableMap.currencyValue: String?
-    get() = amount?.getString("currency")
+    get() = amount?.getOptionalString("currency")
 
 internal val ReadableMap.reference: ReadableMap?
-    get() = configuration?.getMap("reference")
+    get() = configuration?.getOptionalMap("reference")
 
 internal val ReadableMap.consumerReference: String?
-    get() = reference?.getString("consumerReference")
+    get() = reference?.getOptionalString("consumerReference")
 
 internal val ReadableMap.paymentReference: String?
-    get() = reference?.getString("paymentReference")
+    get() = reference?.getOptionalString("paymentReference")
 
 internal val ReadableMap.isInitialRecurringPayment: Boolean?
-    get() = configuration?.getBoolean("isInitialRecurringPayment")
+    get() = configuration?.getOptionalBoolean("isInitialRecurringPayment")
 
 internal val ReadableMap.isDelayedAuthorisation: Boolean?
-    get() = configuration?.getBoolean("isDelayedAuthorisation")
+    get() = configuration?.getOptionalBoolean("isDelayedAuthorisation")
 
 internal val ReadableMap.networkTimeout: ReadableMap?
-    get() {
-        if (configuration.hasKey("networkTimeout")) {
-            return configuration?.getMap("networkTimeout")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("networkTimeout")
 
 internal val ReadableMap.cardAddress: ReadableMap?
-    get() {
-        if (configuration.hasKey("cardAddress")) {
-            return configuration?.getMap("cardAddress")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("cardAddress")
 
 internal val ReadableMap.cardAddressLine1: String?
-get() {
-    if (cardAddress.hasKey("line1")) {
-        return cardAddress?.getString("line1")
-    }
-
-    return null
-}
+    get() = cardAddress?.getOptionalString("line1")
 
 internal val ReadableMap.cardAddressLine2: String?
-    get() {
-        if (cardAddress.hasKey("line2")) {
-            return cardAddress?.getString("line2")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalString("line2")
 
 internal val ReadableMap.cardAddressLine3: String?
-    get() {
-        if (cardAddress.hasKey("line3")) {
-            return cardAddress?.getString("line3")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalString("line3")
 
 internal val ReadableMap.cardAddressPostCode: String?
-    get() {
-        if (cardAddress.hasKey("postCode")) {
-            return cardAddress?.getString("postCode")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalString("postCode")
 
 internal val ReadableMap.cardAddressTown: String?
-    get() {
-        if (cardAddress.hasKey("town")) {
-            return cardAddress?.getString("town")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalString("town")
 
 internal val ReadableMap.cardAddressCountryCode: Int?
-    get() {
-        if (cardAddress.hasKey("countryCode")) {
-            return cardAddress?.getInt("countryCode")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalInt("countryCode")
 
 internal val ReadableMap.cardAddressState: String?
-    get() {
-        if (cardAddress.hasKey("state")) {
-            return cardAddress?.getString("state")
-        }
-
-        return null
-    }
+    get() = cardAddress?.getOptionalString("state")
 
 internal val ReadableMap.networkConnectTimeout: Long?
-    get() = networkTimeout?.getDouble("connectTimeout")?.toLong()
+    get() = networkTimeout?.getOptionalDouble("connectTimeout")?.toLong()
 
 internal val ReadableMap.networkReadTimeout: Long?
-    get() = networkTimeout?.getDouble("readTimeout")?.toLong()
+    get() = networkTimeout?.getOptionalDouble("readTimeout")?.toLong()
 
 internal val ReadableMap.networkWriteTimeout: Long?
-    get() = networkTimeout?.getDouble("writeTimeout")?.toLong()
+    get() = networkTimeout?.getOptionalDouble("writeTimeout")?.toLong()
 
 internal val ReadableMap.challengeRequestIndicator: String?
-    get() {
-        if (configuration.hasKey("challengeRequestIndicator")) {
-            return configuration?.getString("challengeRequestIndicator")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("challengeRequestIndicator")
 
 internal val ReadableMap.scaExemption: String?
-    get() {
-        if (configuration.hasKey("scaExemption")) {
-            return configuration?.getString("scaExemption")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("scaExemption")
 
 internal val ReadableMap.mobileNumber: String?
-    get() {
-        if (configuration.hasKey("mobileNumber")) {
-            return configuration?.getString("mobileNumber")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("mobileNumber")
 
 internal val ReadableMap.phoneCountryCode: String?
-    get() {
-        if (configuration.hasKey("phoneCountryCode")) {
-            return configuration?.getString("phoneCountryCode")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("phoneCountryCode")
 
 internal val ReadableMap.emailAddress: String?
-    get() {
-        if (configuration.hasKey("emailAddress")) {
-            return configuration?.getString("emailAddress")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("emailAddress")
 
 internal val ReadableMap.threeDSTwoMaxTimeout: Int?
-    get() {
-        if (configuration.hasKey("threeDSTwoMaxTimeout")) {
-            return configuration?.getInt("threeDSTwoMaxTimeout")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalInt("threeDSTwoMaxTimeout")
 
 internal val ReadableMap.threeDSTwoMessageVersion: String?
-    get() {
-        if (configuration.hasKey("threeDSTwoMessageVersion")) {
-            return configuration?.getString("threeDSTwoMessageVersion")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalString("threeDSTwoMessageVersion")
 
 internal val ReadableMap.metadata: ReadableMap?
-    get() {
-        if (reference.hasKey("metadata")) {
-            return reference?.getMap("metadata")
-        }
-        return null
-    }
+    get() = reference?.getOptionalMap("metadata")
 
 internal val ReadableMap.cardNetworkValue: Int?
-    get() {
-        if (configuration.hasKey("supportedCardNetworks")) {
-            return configuration?.getInt("supportedCardNetworks")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalInt("supportedCardNetworks")
 
 internal val ReadableMap.paymentMethodValue: Int?
-    get() {
-        if (configuration.hasKey("paymentMethods")) {
-            return configuration?.getInt("paymentMethods")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalInt("paymentMethods")
 
 internal val ReadableMap.uiConfiguration: ReadableMap?
-    get() {
-        if (configuration.hasKey("uiConfiguration")) {
-            return configuration?.getMap("uiConfiguration")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("uiConfiguration")
 
 internal val ReadableMap.threeDSUIConfiguration: ReadableMap?
-    get() {
-        if (uiConfiguration.hasKey("threeDSUIConfiguration")) {
-            return uiConfiguration?.getMap("threeDSUIConfiguration")
-        }
-        return null
-    }
+    get() = uiConfiguration?.getOptionalMap("threeDSUIConfiguration")
 
 internal val ReadableMap.threeDSUITextBoxCustomization: ReadableMap?
-    get() {
-        if (threeDSUIConfiguration.hasKey("textBoxCustomization")) {
-            return threeDSUIConfiguration?.getMap("textBoxCustomization")
-        }
-        return null
-    }
+    get() = threeDSUIConfiguration?.getOptionalMap("textBoxCustomization")
 
 internal val ReadableMap.threeDSUIButtonCustomizations: ReadableMap?
-    get() {
-        if (threeDSUIConfiguration.hasKey("buttonCustomizations")) {
-            return threeDSUIConfiguration?.getMap("buttonCustomizations")
-        }
-        return null
-    }
+    get() = threeDSUIConfiguration?.getOptionalMap("buttonCustomizations")
 
 internal val ReadableMap.threeDSUISubmitButtonCustomization: ReadableMap?
-    get() {
-        if (threeDSUIButtonCustomizations.hasKey("SUBMIT")) {
-            return threeDSUIButtonCustomizations?.getMap("SUBMIT")
-        }
-        return null
-    }
+    get() = threeDSUIButtonCustomizations?.getOptionalMap("SUBMIT")
 
 internal val ReadableMap.threeDSUIContinueButtonCustomization: ReadableMap?
-    get() {
-        if (threeDSUIButtonCustomizations.hasKey("CONTINUE")) {
-            return threeDSUIButtonCustomizations?.getMap("CONTINUE")
-        }
-        return null
-    }
+    get() = threeDSUIButtonCustomizations?.getOptionalMap("CONTINUE")
 
 internal val ReadableMap.threeDSUINextButtonCustomization: ReadableMap?
-    get() {
-        if (threeDSUIButtonCustomizations.hasKey("NEXT")) {
-            return threeDSUIButtonCustomizations?.getMap("NEXT")
-        }
-        return null
-    }
+    get() = threeDSUIButtonCustomizations?.getOptionalMap("NEXT")
 
 internal val ReadableMap.threeDSUICancelButtonCustomization: ReadableMap?
-    get() {
-        if (threeDSUIButtonCustomizations.hasKey("CANCEL")) {
-            return threeDSUIButtonCustomizations?.getMap("CANCEL")
-        }
-        return null
-    }
+    get() = threeDSUIButtonCustomizations?.getOptionalMap("CANCEL")
 
 internal val ReadableMap.threeDSUIResendButtonCustomization: ReadableMap?
-    get() {
-        if (threeDSUIButtonCustomizations.hasKey("RESEND")) {
-            return threeDSUIButtonCustomizations?.getMap("RESEND")
-        }
-        return null
-    }
+    get() = threeDSUIButtonCustomizations?.getOptionalMap("RESEND")
 
 internal val ReadableMap.threeDSUIToolbarCustomization: ReadableMap?
-    get() {
-        if (threeDSUIConfiguration.hasKey("toolbarCustomization")) {
-            return threeDSUIConfiguration?.getMap("toolbarCustomization")
-        }
-        return null
-    }
+    get() = threeDSUIConfiguration?.getOptionalMap("toolbarCustomization")
 
 internal val ReadableMap.threeDSUILabelCustomization: ReadableMap?
-    get() {
-        if (threeDSUIConfiguration.hasKey("labelCustomization")) {
-            return threeDSUIConfiguration?.getMap("labelCustomization")
-        }
-        return null
-    }
+    get() = threeDSUIConfiguration?.getOptionalMap("labelCustomization")
 
 internal val ReadableMap.textFontName: String?
-    get() {
-        if (hasKey("textFontName")) {
-            return getString("textFontName")
-        }
-        return null
-    }
+    get() = getOptionalString("textFontName")
 
 internal val ReadableMap.textColor: String?
-    get() {
-        if (hasKey("textColor")) {
-            return getString("textColor")
-        }
-        return null
-    }
+    get() = getOptionalString("textColor")
 
 internal val ReadableMap.backgroundColor: String?
-    get() {
-        if (hasKey("backgroundColor")) {
-            return getString("backgroundColor")
-        }
-        return null
-    }
+    get() = getOptionalString("backgroundColor")
 
 internal val ReadableMap.headerText: String?
-    get() {
-        if (hasKey("headerText")) {
-            return getString("headerText")
-        }
-        return null
-    }
+    get() = getOptionalString("headerText")
 
 internal val ReadableMap.buttonText: String?
-    get() {
-        if (hasKey("buttonText")) {
-            return getString("buttonText")
-        }
-        return null
-    }
+    get() = getOptionalString("buttonText")
 
 internal val ReadableMap.headingTextFontName: String?
-    get() {
-        if (hasKey("headingTextFontName")) {
-            return getString("headingTextFontName")
-        }
-        return null
-    }
+    get() = getOptionalString("headingTextFontName")
 
 internal val ReadableMap.headingTextColor: String?
-    get() {
-        if (hasKey("headingTextColor")) {
-            return getString("headingTextColor")
-        }
-        return null
-    }
+    get() = getOptionalString("headingTextColor")
 
 internal val ReadableMap.borderColor: String?
-    get() {
-        if (hasKey("borderColor")) {
-            return getString("borderColor")
-        }
-        return null
-    }
+    get() = getOptionalString("borderColor")
 
 internal val ReadableMap.textFontSize: Int?
-    get() {
-        if (hasKey("textFontSize")) {
-            return getInt("textFontSize")
-        }
-        return null
-    }
+    get() = getOptionalInt("textFontSize")
 
 internal val ReadableMap.cornerRadius: Int?
-    get() {
-        if (hasKey("cornerRadius")) {
-            return getInt("cornerRadius")
-        }
-        return null
-    }
+    get() = getOptionalInt("cornerRadius")
 
 internal val ReadableMap.headingTextFontSize: Int?
-    get() {
-        if (hasKey("headingTextFontSize")) {
-            return getInt("headingTextFontSize")
-        }
-        return null
-    }
+    get() = getOptionalInt("headingTextFontSize")
 
 internal val ReadableMap.borderWidth: Int?
-    get() {
-        if (hasKey("borderWidth")) {
-            return getInt("borderWidth")
-        }
-        return null
-    }
+    get() = getOptionalInt("borderWidth")
 
 internal val ReadableMap.isAVSEnabled: Boolean?
-    get() = uiConfiguration?.getBoolean("isAVSEnabled")
+    get() = uiConfiguration?.getOptionalBoolean("isAVSEnabled")
 
 internal val ReadableMap.shouldPaymentMethodsDisplayAmount: Boolean?
-    get() = uiConfiguration?.getBoolean("shouldPaymentMethodsDisplayAmount")
+    get() = uiConfiguration?.getOptionalBoolean("shouldPaymentMethodsDisplayAmount")
 
 internal val ReadableMap.shouldPaymentButtonDisplayAmount: Boolean?
-    get() = uiConfiguration?.getBoolean("shouldPaymentButtonDisplayAmount")
+    get() = uiConfiguration?.getOptionalBoolean("shouldPaymentButtonDisplayAmount")
 
 internal val ReadableMap.shouldPaymentMethodsVerifySecurityCode: Boolean?
-    get() = uiConfiguration?.getBoolean("shouldPaymentMethodsVerifySecurityCode")
+    get() = uiConfiguration?.getOptionalBoolean("shouldPaymentMethodsVerifySecurityCode")
 
 internal val ReadableMap.shouldAskForBillingInformation: Boolean
-    get() {
-        if (uiConfiguration.hasKey("shouldAskForBillingInformation")) {
-            return uiConfiguration?.getBoolean("shouldAskForBillingInformation") ?: true
-        }
-        return true
-    }
+    get() = uiConfiguration?.getOptionalBoolean("shouldAskForBillingInformation") ?: true
 
 internal val ReadableMap.primaryAccountDetails: ReadableMap?
-    get() {
-        if (configuration.hasKey("primaryAccountDetails")) {
-            return configuration?.getMap("primaryAccountDetails")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("primaryAccountDetails")
 
 internal val ReadableMap.name: String?
-    get() {
-        if (primaryAccountDetails.hasKey("name")) {
-            return primaryAccountDetails?.getString("name")
-        }
-        return null
-    }
+    get() = primaryAccountDetails?.getOptionalString("name")
 
 internal val ReadableMap.accountNumber: String?
-    get() {
-        if (primaryAccountDetails.hasKey("accountNumber")) {
-            return primaryAccountDetails?.getString("accountNumber")
-        }
-        return null
-    }
+    get() = primaryAccountDetails?.getOptionalString("accountNumber")
 
 internal val ReadableMap.dateOfBirth: String?
-    get() {
-        if (primaryAccountDetails.hasKey("dateOfBirth")) {
-            return primaryAccountDetails?.getString("dateOfBirth")
-        }
-        return null
-    }
+    get() = primaryAccountDetails?.getOptionalString("dateOfBirth")
 
 internal val ReadableMap.postCode: String?
-    get() {
-        if (primaryAccountDetails.hasKey("postCode")) {
-            return primaryAccountDetails?.getString("postCode")
-        }
-        return null
-    }
+    get() = primaryAccountDetails?.getOptionalString("postCode")
 
 internal val ReadableMap.googlePayConfiguration: ReadableMap?
-    get() {
-        if (configuration.hasKey("googlePayConfiguration")) {
-            return configuration?.getMap("googlePayConfiguration")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("googlePayConfiguration")
 
 internal val ReadableMap.countryCode: String?
-    get() = googlePayConfiguration?.getString("countryCode")
+    get() = googlePayConfiguration?.getOptionalString("countryCode")
 
 internal val ReadableMap.environmentValue: Int?
-    get() = googlePayConfiguration?.getInt("environment")
+    get() = googlePayConfiguration?.getOptionalInt("environment")
+
+internal val ReadableMap.merchantName: String?
+    get() = googlePayConfiguration?.getOptionalString("merchantName")
+
+internal val ReadableMap.transactionId: String?
+    get() = googlePayConfiguration?.getOptionalString("transactionId")
+
+internal val ReadableMap.totalPriceStatus: Int?
+    get() = googlePayConfiguration?.getOptionalInt("totalPriceStatus")
+
+internal val ReadableMap.totalPriceLabel: String?
+    get() = googlePayConfiguration?.getOptionalString("totalPriceLabel")
+
+internal val ReadableMap.checkoutOption: Int?
+    get() = googlePayConfiguration?.getOptionalInt("checkoutOption")
 
 internal val ReadableMap.isEmailRequired: Boolean?
-    get() = googlePayConfiguration?.getBoolean("isEmailRequired")
+    get() = googlePayConfiguration?.getOptionalBoolean("isEmailRequired")
 
 internal val ReadableMap.isBillingAddressRequired: Boolean?
-    get() = googlePayConfiguration?.getBoolean("isBillingAddressRequired")
+    get() = googlePayConfiguration?.getOptionalBoolean("isBillingAddressRequired")
 
 internal val ReadableMap.isShippingAddressRequired: Boolean?
-    get() = googlePayConfiguration?.getBoolean("isShippingAddressRequired")
+    get() = googlePayConfiguration?.getOptionalBoolean("isShippingAddressRequired")
 
 internal val ReadableMap.billingAddressParameters: ReadableMap?
-    get() {
-        if (googlePayConfiguration.hasKey("billingAddressParameters")) {
-            return googlePayConfiguration?.getMap("billingAddressParameters")
-        }
-        return null
-    }
+    get() = googlePayConfiguration?.getOptionalMap("billingAddressParameters")
 
 internal val ReadableMap.shippingAddressParameters: ReadableMap?
-    get() {
-        if (googlePayConfiguration.hasKey("shippingAddressParameters")) {
-            return googlePayConfiguration?.getMap("shippingAddressParameters")
-        }
-        return null
-    }
+    get() = googlePayConfiguration?.getOptionalMap("shippingAddressParameters")
 
 internal val ReadableMap.isBillingPhoneNumberRequired: Boolean?
-    get() = billingAddressParameters?.getBoolean("isPhoneNumberRequired")
+    get() = billingAddressParameters?.getOptionalBoolean("isPhoneNumberRequired")
 
 internal val ReadableMap.addressFormat: Int?
-    get() = billingAddressParameters?.getInt("addressFormat")
+    get() = billingAddressParameters?.getOptionalInt("addressFormat")
 
 internal val ReadableMap.isShippingPhoneNumberRequired: Boolean?
-    get() = shippingAddressParameters?.getBoolean("isPhoneNumberRequired")
+    get() = shippingAddressParameters?.getOptionalBoolean("isPhoneNumberRequired")
 
 internal val ReadableMap.allowedCountryCodeList: ReadableArray?
-    get() {
-        if (shippingAddressParameters.hasKey("allowedCountryCodes")) {
-            return shippingAddressParameters?.getArray("allowedCountryCodes")
-        }
-        return null
-    }
+    get() = shippingAddressParameters?.getOptionalArray("allowedCountryCodes")
+
+internal val ReadableMap.allowPrepaidCards: Boolean?
+    get() = googlePayConfiguration?.getOptionalBoolean("allowPrepaidCards")
+
+internal val ReadableMap.allowCreditCards: Boolean?
+    get() = googlePayConfiguration?.getOptionalBoolean("allowCreditCards")
 
 internal val ReadableMap.pbbaConfiguration: ReadableMap?
-    get() {
-        if (configuration.hasKey("pbbaConfiguration")) {
-            return configuration?.getMap("pbbaConfiguration")
-        }
-        return null
-    }
+    get() = configuration?.getOptionalMap("pbbaConfiguration")
 
 internal val ReadableMap.pbbaMobileNumber: String?
-    get() = pbbaConfiguration?.getString("mobileNumber")
+    get() = pbbaConfiguration?.getOptionalString("mobileNumber")
 
 internal val ReadableMap.pbbaEmailAddress: String?
-    get() = pbbaConfiguration?.getString("emailAddress")
+    get() = pbbaConfiguration?.getOptionalString("emailAddress")
 
 internal val ReadableMap.deeplinkScheme: String?
-    get() = pbbaConfiguration?.getString("deeplinkScheme")
+    get() = pbbaConfiguration?.getOptionalString("deeplinkScheme")
 
 internal val ReadableMap.deeplinkURL: String?
-    get() {
-        return if (pbbaConfiguration.hasKey("deeplinkURL")) {
-            pbbaConfiguration?.getString("deeplinkURL")
-        } else {
-            null
-        }
-    }
+    get() = pbbaConfiguration?.getOptionalString("deeplinkURL")
 
 fun Judo.toJudoActivityIntent(packageContext: Context): Intent =
     Intent(packageContext, JudoActivity::class.java)

package/android/src/main/java/com/reactlibrary/Helpers.kt

@@ -16,10 +16,7 @@ import com.judopay.judokit.android.api.model.BasicAuthorization
 import com.judopay.judokit.android.api.model.PaymentSessionAuthorization
 import com.judopay.judokit.android.api.model.request.Address
 import com.judopay.judokit.android.model.*
-import com.judopay.judokit.android.model.googlepay.GooglePayAddressFormat
-import com.judopay.judokit.android.model.googlepay.GooglePayBillingAddressParameters
-import com.judopay.judokit.android.model.googlepay.GooglePayEnvironment
-import com.judopay.judokit.android.model.googlepay.GooglePayShippingAddressParameters
+import com.judopay.judokit.android.model.googlepay.*
 
 // For consistency with:
 // https://github.com/Judopay/JudoKit-iOS/blob/master/Source/Models/Response/JPResponse.m#L36
@@ -157,6 +154,7 @@ internal fun getJudoConfigurationForApiService(options: ReadableMap): Judo {
         .setAuthorization(authorization)
         .setAmount(amount)
         .setReference(reference)
+        .setSubProductInfo(getSubProductInfo(options))
         .build()
 }
 
@@ -198,6 +196,7 @@ internal fun getJudoConfiguration(type: PaymentWidgetType, options: ReadableMap)
         .setThreeDSTwoMessageVersion(options.threeDSTwoMessageVersion)
         .setPhoneCountryCode(options.phoneCountryCode)
         .setAddress(address)
+        .setSubProductInfo(getSubProductInfo(options))
         .build()
 }
 
@@ -277,6 +276,11 @@ internal fun getAmount(options: ReadableMap): Amount {
         .build()
 }
 
+internal fun getSubProductInfo(options: ReadableMap): SubProductInfo {
+    val version = options.packageVersion ?: ""
+    return SubProductInfo.ReactNative(version)
+}
+
 internal fun getReference(options: ReadableMap): Reference? {
 
     var builder = Reference.Builder()
@@ -517,19 +521,38 @@ internal fun getGooglePayConfiguration(options: ReadableMap): GooglePayConfigura
         0 -> GooglePayEnvironment.TEST
         else -> GooglePayEnvironment.PRODUCTION
     }
+    val totalPriceStatus = when (options.totalPriceStatus) {
+        0 -> GooglePayPriceStatus.FINAL
+        1 -> GooglePayPriceStatus.ESTIMATED
+        2 -> GooglePayPriceStatus.NOT_CURRENTLY_KNOWN
+        else -> null
+    }
+
+    val checkoutOption = when (options.checkoutOption) {
+        0 -> GooglePayCheckoutOption.DEFAULT
+        1 -> GooglePayCheckoutOption.COMPLETE_IMMEDIATE_PURCHASE
+        else -> null
+    }
 
     val billingParameters = getBillingParameters(options)
     val shippingParameters = getShippingParameters(options)
 
     return if (options.googlePayConfiguration != null) {
         GooglePayConfiguration.Builder()
-            .setTransactionCountryCode(options.countryCode)
             .setEnvironment(environment)
+            .setMerchantName(options.merchantName)
+            .setTransactionCountryCode(options.countryCode)
+            .setTransactionId(options.transactionId)
+            .setTotalPriceStatus(totalPriceStatus)
+            .setTotalPriceLabel(options.totalPriceLabel)
+            .setCheckoutOption(checkoutOption)
             .setIsEmailRequired(options.isEmailRequired)
             .setIsBillingAddressRequired(options.isBillingAddressRequired)
             .setBillingAddressParameters(billingParameters)
             .setIsShippingAddressRequired(options.isShippingAddressRequired)
             .setShippingAddressParameters(shippingParameters)
+            .setAllowPrepaidCards(options.allowPrepaidCards)
+            .setAllowCreditCards(options.allowCreditCards)
             .build()
     } else {
         null

package/ios/Classes/RNJudo.m

@@ -112,7 +112,7 @@ RCT_REMAP_METHOD(performTokenTransaction,
     
     JPCardTransactionDetails *details = [[JPCardTransactionDetails new] initWithConfiguration:configuration];
     details.cardToken = [RNWrappers cardTokenFromProperties:properties];
-    details.secureCode = [RNWrappers securityCodeFromProperties:properties];
+    details.securityCode = [RNWrappers securityCodeFromProperties:properties];
     details.cardholderName = [RNWrappers cardholderNameFromProperties:properties];
     details.cardType = [RNWrappers cardTypeFromProperties:properties];
     

package/ios/Classes/Wrappers/RNWrappers.m

@@ -44,6 +44,8 @@ static NSString *const kCardSchemeAMEX = @"amex";
     id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];
     JudoKit *judoKit = [[JudoKit alloc] initWithAuthorization:authorization];
     judoKit.isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
+    judoKit.subProductInfo = [RNWrappers subProductInfoFromProperties:properties];
+
     return judoKit;
 }
 
@@ -73,6 +75,11 @@ static NSString *const kCardSchemeAMEX = @"amex";
     return isSandboxed.boolValue;
 }
 
++ (JPSubProductInfo *)subProductInfoFromProperties:(NSDictionary *)properties {
+    NSString *version = [properties optionalStringForKey:@"packageVersion"];;
+    return [[JPSubProductInfo alloc] initWithSubProductType:JPSubProductTypeReactNative andVersion:version];
+}
+
 + (JPCardTransactionService *)cardTransactionServiceFromProperties:(NSDictionary *)properties {
     BOOL isSandboxed = [RNWrappers isSandboxedFromProperties:properties];
     id<JPAuthorization> authorization = [RNWrappers authorizationFromProperties:properties];

package/ios/Podfile

@@ -24,7 +24,7 @@ target 'RNJudo' do
   )
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "3.1.11"
+  pod "JudoKit-iOS", "3.2.2"
 
   target 'RNJudoTests' do
     inherit! :complete

package/ios/Podfile.lock

@@ -76,7 +76,7 @@ PODS:
   - fmt (6.2.1)
   - glog (0.3.5)
   - Judo3DS2_iOS (1.1.3)
-  - JudoKit-iOS (3.1.11):
+  - JudoKit-iOS (3.2.1):
     - DeviceDNA (~> 2.0.0)
     - Judo3DS2_iOS (~> 1.1.3)
     - TrustKit
@@ -359,7 +359,7 @@ PODS:
     - React-logger (= 0.69.7)
     - React-perflogger (= 0.69.7)
   - SocketRocket (0.6.0)
-  - TrustKit (2.0.1)
+  - TrustKit (3.0.2)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -392,7 +392,7 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
   - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - JudoKit-iOS (= 3.1.11)
+  - JudoKit-iOS (= 3.2.1)
   - OpenSSL-Universal (= 1.1.1100)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -532,7 +532,7 @@ SPEC CHECKSUMS:
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
   Judo3DS2_iOS: b2396a1f0aa3e8d428fdd887c8b6eae5d3aa4f79
-  JudoKit-iOS: 850a11112da024ee77be5f7a1ca61ef28cbd97d3
+  JudoKit-iOS: 6d12dc10d1d84fe020ecbfcca1ca986bf563f7e9
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a
@@ -562,11 +562,11 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: 65cd2782a57e1d59a68aa5d504edf94278578e41
   ReactCommon: 1e783348b9aa73ae68236271df972ba898560a95
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
-  TrustKit: dad4c3a08248c21fcb9a3b5be3c2e2b9d4f9b973
+  TrustKit: 55804401e9a95db0bbfff9a08373bfd91953071f
   Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: d320f26e9bc98ca902072b017dbfb26b64342d48
+PODFILE CHECKSUM: 5cbefa13df8faa29c30e02942d14115a357c82dc
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

package/ios/RNJudo.xcodeproj/project.pbxproj

@@ -384,18 +384,12 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RNJudo-RNJudoTests/Pods-RNJudo-RNJudoTests-resources.sh",
-				"${PODS_ROOT}/JudoKit-iOS/Resources/judokit-icons.bundle",
-				"${PODS_ROOT}/JudoKit-iOS/Resources/judokit-resources.bundle",
-				"${PODS_ROOT}/JudoKit-iOS/Resources/judokit-countries-list.json",
 				"${PODS_CONFIGURATION_BUILD_DIR}/JudoKit-iOS/JudoKit_iOS.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ZappMerchantLib/ZappMerchantLibResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/judokit-icons.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/judokit-resources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/judokit-countries-list.json",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JudoKit_iOS.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ZappMerchantLibResources.bundle",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "judokit-react-native",
     "title": "Judopay React Native Module",
-    "version": "4.0.0",
+    "version": "4.1.0",
     "description": "A React Native module for the Judopay native SDKs to take payments on iOS and Android.",
     "main": "JudoPay.tsx",
     "scripts": {

package/types/JudoGooglePayTypes.tsx

@@ -4,7 +4,7 @@ export enum JudoGooglePayEnvironment {
 }
 
 export enum JudoAddressFormat {
-    MINIMAL,
+    MIN,
     FULL
 }
 
@@ -18,12 +18,30 @@ export interface JudoShippingAddressParameters {
     isPhoneNumberRequired: boolean
 }
 
+export enum JudoGooglePayPriceStatus {
+    FINAL,
+    ESTIMATED,
+    NOT_CURRENTLY_KNOWN
+}
+
+export enum JudoCheckoutOption {
+    DEFAULT,
+    COMPLETE_IMMEDIATE_PURCHASE
+}
+
 export interface JudoGooglePayConfiguration {
-    countryCode: string
     environment: JudoGooglePayEnvironment
-    isEmailRequired: boolean
+    merchantName?: string
+    countryCode: string
+    transactionId?: string
+    totalPriceStatus: JudoGooglePayPriceStatus
+    totalPriceLabel?: string
+    checkoutOption?: JudoCheckoutOption
+    isEmailRequired?: boolean
     isBillingAddressRequired: boolean
     billingAddressParameters?: JudoBillingAddressParameters
     isShippingAddressRequired: boolean
     shippingAddressParameters?: JudoShippingAddressParameters
+    allowPrepaidCards?: boolean
+    allowCreditCards?: boolean
 }

package/types/JudoTypes.tsx

@@ -218,6 +218,7 @@ export interface JudoCardDetails {
     cardCountry?: string
     cardFunding?: string
     cardScheme?: string
+    cardHolderName?: string
 }
 
 export interface JudoConsumer {