judokit-react-native 3.4.0 → 3.4.3

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.0.2"
+  s.dependency "JudoKit-iOS", "3.1.2"
 
   s.test_spec 'RNJudoTests' do |test_spec|
     test_spec.source_files = 'ios/RNJudoTests/**/*.{h,m}'

package/android/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation 'com.judopay:judokit-android:3.0.3'
+    implementation 'com.judopay:judokit-android:3.0.9'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"

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

@@ -164,16 +164,7 @@ internal val ReadableMap.cardAddressTown: String?
 internal val ReadableMap.cardAddressCountryCode: Int?
     get() {
         if (cardAddress.hasKey("countryCode")) {
-            return cardAddress?.getString("countryCode")?.toInt()
-        }
-
-        return null
-    }
-
-internal val ReadableMap.cardAddressBillingCountry: String?
-    get() {
-        if (cardAddress.hasKey("billingCountry")) {
-            return cardAddress?.getString("billingCountry")
+            return cardAddress?.getInt("countryCode")
         }
 
         return null
@@ -231,7 +222,7 @@ internal val ReadableMap.emailAddress: String?
 internal val ReadableMap.threeDSTwoMaxTimeout: Int?
     get() {
         if (configuration.hasKey("threeDSTwoMaxTimeout")) {
-            return configuration?.getString("threeDSTwoMaxTimeout")?.toInt()
+            return configuration?.getInt("threeDSTwoMaxTimeout")
         }
         return null
     }

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

@@ -147,7 +147,6 @@ internal fun getAddress(options: ReadableMap): Address? {
             .setLine3(options.cardAddressLine3)
             .setTown(options.cardAddressTown)
             .setPostCode(options.cardAddressPostCode)
-            .setBillingCountry(options.cardAddressBillingCountry)
             .setCountryCode(options.cardAddressCountryCode)
             .build()
     }
@@ -166,15 +165,9 @@ internal fun getNetworkTimeout(options: ReadableMap): NetworkTimeout? {
     return null
 }
 
-internal fun getChallengeRequestIndicator(options: ReadableMap): ChallengeRequestIndicator? {
-    val challengeRequestIndicator = ChallengeRequestIndicator.values().firstOrNull { it.value == options.challengeRequestIndicator }
-    return challengeRequestIndicator ?: ChallengeRequestIndicator.CHALLENGE_AS_MANDATE
-}
+internal fun getChallengeRequestIndicator(options: ReadableMap): ChallengeRequestIndicator? = ChallengeRequestIndicator.values().firstOrNull { it.value == options.challengeRequestIndicator }
 
-internal fun getScaExemption(options: ReadableMap): ScaExemption {
-    val scaExemption = ScaExemption.values().firstOrNull { it.value == options.scaExemption }
-    return scaExemption ?: ScaExemption.LOW_VALUE
-}
+internal fun getScaExemption(options: ReadableMap): ScaExemption? = ScaExemption.values().firstOrNull { it.value == options.scaExemption }
 
 internal fun getAuthorization(options: ReadableMap): Authorization {
     val token = options.token

package/ios/Classes/RNJudo.m

@@ -192,7 +192,7 @@ RCT_REMAP_METHOD(fetchTransactionDetails,
                                       andReject:(RCTPromiseRejectBlock)reject {
     return ^(JPResponse *response, NSError *error) {
         if (error) {
-            if (error.code == JPError.judoUserDidCancelError.code) {
+            if (error.code == JPError.userDidCancelError.code) {
                 reject(kJudoPromiseRejectionCode, @"Transaction cancelled",  error);
                 return;
             }

package/ios/Classes/Wrappers/RNWrappers.m

@@ -327,7 +327,6 @@ static NSString *const kCardSchemeAMEX = @"amex";
                                       address2:[addressDictionary optionalStringForKey:@"line2"]
                                       address3:[addressDictionary optionalStringForKey:@"line3"]
                                           town:[addressDictionary optionalStringForKey:@"town"]
-                                billingCountry:[addressDictionary optionalStringForKey:@"billingCountry"]
                                       postCode:[addressDictionary optionalStringForKey:@"postCode"]
                                    countryCode:[addressDictionary optionalNumberForKey:@"countryCode"]];
 }

package/ios/Podfile

@@ -19,7 +19,7 @@ target 'RNJudo' do
   # use_frameworks!
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "3.0.2"
+  pod "JudoKit-iOS", "3.1.2"
   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"

package/ios/Podfile.lock

@@ -21,10 +21,10 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Judo3DS2_iOS (1.0.1)
-  - JudoKit-iOS (3.0.2):
+  - Judo3DS2_iOS (1.1.1)
+  - JudoKit-iOS (3.1.2):
     - DeviceDNA (~> 2.0.0)
-    - Judo3DS2_iOS (~> 1.0.1)
+    - Judo3DS2_iOS (~> 1.1.1)
     - TrustKit
     - ZappMerchantLib
   - OpenSSL-Universal (1.1.1700)
@@ -236,7 +236,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - JudoKit-iOS (= 3.0.2)
+  - JudoKit-iOS (= 3.1.2)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -331,8 +331,8 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Judo3DS2_iOS: c1ccf49ecacddb4559a73fb7eae6e680e2355b21
-  JudoKit-iOS: 4a96c63d4cfb45bb1a68a1891b2ebaeaa8a46be1
+  Judo3DS2_iOS: 1699474533e69b69593c6a76b42645cb240f618a
+  JudoKit-iOS: 1c1fc609b79cef170b3f914daf152f3712c494a9
   OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
@@ -357,6 +357,6 @@ SPEC CHECKSUMS:
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: bd8176c4a34cb7668ac5120fb4a4145962a52c2c
+PODFILE CHECKSUM: b26e88a3a3456f8ae48d5f44fe9bcd17a5a88e55
 
 COCOAPODS: 1.11.3

package/ios/RNJudo.xcodeproj/project.pbxproj

@@ -380,6 +380,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-RNJudo-RNJudoTests/Pods-RNJudo-RNJudoTests-resources.sh",
 				"${PODS_ROOT}/JudoKit-iOS/Resources/icons.bundle",
 				"${PODS_ROOT}/JudoKit-iOS/Resources/resources.bundle",
+				"${PODS_ROOT}/JudoKit-iOS/Resources/CountriesList.json",
 				"${PODS_CONFIGURATION_BUILD_DIR}/JudoKit-iOS/JudoKit_iOS.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/ZappMerchantLib/ZappMerchantLibResources.bundle",
 			);
@@ -387,6 +388,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/icons.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/resources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CountriesList.json",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/JudoKit_iOS.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": "3.4.0",
+    "version": "3.4.3",
     "description": "A React Native module for the Judopay native SDKs to take payments on iOS and Android.",
     "main": "JudoPay.tsx",
     "scripts": {

package/types/JudoTypes.tsx

@@ -82,7 +82,6 @@ export interface JudoAddress {
     postCode?: string
     town?: string
     countryCode?: number
-    billingCountry?: string
 }
 
 export interface JudoUIConfiguration {