judokit-react-native 3.4.6 → 3.4.8

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

package/android/build.gradle

@@ -9,7 +9,7 @@ import groovy.json.JsonSlurper
 
 def DEFAULT_COMPILE_SDK_VERSION = 31
 def DEFAULT_BUILD_TOOLS_VERSION = "30.0.3"
-def DEFAULT_MIN_SDK_VERSION = 19
+def DEFAULT_MIN_SDK_VERSION = 21
 def DEFAULT_TARGET_SDK_VERSION = 31
 
 def safeExtGet(prop, fallback) {
@@ -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.10'
+    implementation 'com.judopay:judokit-android:3.0.11'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"

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

@@ -170,6 +170,15 @@ internal val ReadableMap.cardAddressCountryCode: Int?
         return null
     }
 
+internal val ReadableMap.cardAddressState: String?
+    get() {
+        if (cardAddress.hasKey("state")) {
+            return cardAddress?.getString("state")
+        }
+
+        return null
+    }
+
 internal val ReadableMap.networkConnectTimeout: Long?
     get() = networkTimeout?.getDouble("connectTimeout")?.toLong()
 

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

@@ -148,6 +148,7 @@ internal fun getAddress(options: ReadableMap): Address? {
             .setTown(options.cardAddressTown)
             .setPostCode(options.cardAddressPostCode)
             .setCountryCode(options.cardAddressCountryCode)
+            .setState(options.cardAddressState)
             .build()
     }
     return null

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

@@ -37,6 +37,7 @@ class JudoReactNativeModule internal constructor(val context: ReactApplicationCo
 
     private val listener = JudoReactNativeActivityEventListener()
     internal var transactionPromise: Promise? = null
+    private var isSubscribedToCardTransactionResults = false
 
     /**
      * A broadcast receiver to catch Pay by Bank app /order/bank/sale response event.
@@ -107,6 +108,8 @@ class JudoReactNativeModule internal constructor(val context: ReactApplicationCo
     @ReactMethod
     fun performTokenTransaction(options: ReadableMap, promise: Promise) {
         try {
+            ensureIsSubscribedToCardTransactionResults()
+
             val activity = context.currentActivity as FragmentActivity
             val manager = CardTransactionManager.getInstance(activity)
 
@@ -147,18 +150,34 @@ class JudoReactNativeModule internal constructor(val context: ReactApplicationCo
         }
     }
 
+    private fun ensureIsSubscribedToCardTransactionResults() {
+        if (isSubscribedToCardTransactionResults) {
+            return
+        }
+
+        val activity =  context.currentActivity
+        activity?.let {
+            isSubscribedToCardTransactionResults = true
+            CardTransactionManager.getInstance(activity as FragmentActivity).registerResultListener(this)
+        }
+    }
+
+    private fun unsubscribeFromCardTransactionResults() {
+        val activity =  context.currentActivity
+        activity?.let {
+            isSubscribedToCardTransactionResults = false
+            CardTransactionManager.getInstance(activity as FragmentActivity).unRegisterResultListener(this)
+        }
+    }
+
     override fun initialize() {
         super.initialize()
-
-        val activity =  context.currentActivity as FragmentActivity
-        CardTransactionManager.getInstance(activity).registerResultListener(this)
+        ensureIsSubscribedToCardTransactionResults()
     }
 
     override fun invalidate() {
         super.invalidate()
-
-        val activity =  context.currentActivity as FragmentActivity
-        CardTransactionManager.getInstance(activity).unRegisterResultListener(this)
+        unsubscribeFromCardTransactionResults()
     }
 
     override fun onCardTransactionResult(result: JudoPaymentResult) {

package/ios/Classes/Wrappers/RNWrappers.m

@@ -328,7 +328,8 @@ static NSString *const kCardSchemeAMEX = @"amex";
                                       address3:[addressDictionary optionalStringForKey:@"line3"]
                                           town:[addressDictionary optionalStringForKey:@"town"]
                                       postCode:[addressDictionary optionalStringForKey:@"postCode"]
-                                   countryCode:[addressDictionary optionalNumberForKey:@"countryCode"]];
+                                   countryCode:[addressDictionary optionalNumberForKey:@"countryCode"]
+                                         state:[addressDictionary optionalStringForKey:@"state"]];
 }
 
 + (JPUIConfiguration *)uiConfigurationFromConfiguration:(NSDictionary *)configuration {
@@ -435,9 +436,25 @@ static NSString *const kCardSchemeAMEX = @"amex";
         result = @1;
     }
     
+    NSNumber *type = @0;
+
+    switch (response.type) {
+        case JPTransactionTypePreAuth:
+            type = @1;
+            break;
+        case JPTransactionTypeCheckCard:
+            type = @3;
+            break;
+        case JPTransactionTypeSaveCard:
+            type = @4;
+            break;
+        default:
+            break;
+    }
+    
     [mappedResponse setValue:response.receiptId forKey:@"receiptId"];
     [mappedResponse setValue:response.paymentReference forKey:@"yourPaymentReference"];
-    [mappedResponse setValue:@(response.type) forKey:@"type"];
+    [mappedResponse setValue:type forKey:@"type"];
     [mappedResponse setValue:response.createdAt forKey:@"createdAt"];
     [mappedResponse setValue:result forKey:@"result"];
     [mappedResponse setValue:response.message forKey:@"message"];

package/ios/Podfile

@@ -19,7 +19,7 @@ target 'RNJudo' do
   # use_frameworks!
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "3.1.6"
+  pod "JudoKit-iOS", "3.1.8"
   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,13 +21,13 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Judo3DS2_iOS (1.1.2)
-  - JudoKit-iOS (3.1.6):
+  - Judo3DS2_iOS (1.1.3)
+  - JudoKit-iOS (3.1.7):
     - DeviceDNA (~> 2.0.0)
-    - Judo3DS2_iOS (~> 1.1.2)
+    - Judo3DS2_iOS (~> 1.1.3)
     - TrustKit
     - ZappMerchantLib
-  - OpenSSL-Universal (1.1.1700)
+  - OpenSSL-Universal (1.1.1900)
   - RCTRequired (0.61.5)
   - RCTTypeSafety (0.61.5):
     - FBLazyVector (= 0.61.5)
@@ -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.1.6)
+  - JudoKit-iOS (= 3.1.7)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -331,9 +331,9 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Judo3DS2_iOS: 90b820a50035cb08ccc1b2e22900b856132c79a5
-  JudoKit-iOS: eabd569f41993ddd46273a63aa5c255cef473308
-  OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
+  Judo3DS2_iOS: b2396a1f0aa3e8d428fdd887c8b6eae5d3aa4f79
+  JudoKit-iOS: 9bdb404617132df3a22ce0713b610258fbc9a817
+  OpenSSL-Universal: 84efb8a29841f2764ac5403e0c4119a28b713346
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -357,6 +357,6 @@ SPEC CHECKSUMS:
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: 697d0d38cedb02c077c830bd5d3dab848ad81c11
+PODFILE CHECKSUM: b43fb77cd20fdc9f4c3ce03edc13aa92f131243b
 
 COCOAPODS: 1.11.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "judokit-react-native",
     "title": "Judopay React Native Module",
-    "version": "3.4.6",
+    "version": "3.4.8",
     "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,6 +82,7 @@ export interface JudoAddress {
     postCode?: string
     town?: string
     countryCode?: number
+    state?: string
 }
 
 export interface JudoUIConfiguration {