react-native-smallcase-gateway 7.1.0 → 7.2.1

package/android/build.gradle

@@ -149,7 +149,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
    //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.smallcase.gateway:sdk:6.0.1'
+    implementation 'com.smallcase.gateway:sdk:6.0.3'
     implementation 'com.smallcase.loans:sdk:5.0.0'
     implementation "androidx.core:core-ktx:1.3.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

package/android/src/main/java/com/reactnativesmallcasegateway/SmallcaseGatewayModule.kt

@@ -97,7 +97,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
         }
 
 
-        val activity = currentActivity;
+        val activity = reactApplicationContext.currentActivity
         if (activity != null) {
             val utm = readableMapToStrHashMap(utmParams)
             SmallcaseGatewaySdk.triggerTransaction(utmParams = utm,
@@ -123,10 +123,11 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
     @ReactMethod
     fun triggerMfTransaction(transactionId: String, promise: Promise) {
 
-        if(currentActivity !=  null) {
+        val activity = reactApplicationContext.currentActivity
+        if(activity !=  null) {
 
             SmallcaseGatewaySdk.triggerMfTransaction(
-                activity = currentActivity!!,
+                activity = activity,
                 transactionId = transactionId,
                 listener = object : MFHoldingsResponseListener {
 
@@ -147,7 +148,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun showOrders(promise: Promise) {
-        val activity = currentActivity;
+        val activity = reactApplicationContext.currentActivity
         if (activity != null) {
             SmallcaseGatewaySdk.showOrders(activity = activity, showOrdersResponseListener = object : DataListener<Any> {
                 override fun onSuccess(response: Any) {
@@ -165,9 +166,14 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
     @ReactMethod
     fun launchSmallplug(targetEndpoint: String, params: String, promise: Promise) {
 
-        SmallcaseGatewaySdk.launchSmallPlug(currentActivity!!, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
-                override fun onFailure(errorCode: Int, errorMessage: String) {
+        val activity = reactApplicationContext.currentActivity ?: run {
+            promise.reject(Throwable("no activity"))
+            return
+        }
+        SmallcaseGatewaySdk.launchSmallPlug(activity, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
+            override fun onFailure(errorCode: Int, errorMessage: String) {
                 val err = createErrorJSON(errorCode, errorMessage, null)
+
                 promise.reject("error", err)
             }
 
@@ -213,7 +219,11 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
         } catch (e: Throwable) {
         }
 
-        SmallcaseGatewaySdk.launchSmallPlug(currentActivity!!, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
+        val activity = reactApplicationContext.currentActivity ?: run {
+            promise.reject(Throwable("no activity"))
+            return
+        }
+        SmallcaseGatewaySdk.launchSmallPlug(activity, SmallplugData(targetEndpoint, params), object : SmallPlugResponseListener {
             override fun onFailure(errorCode: Int, errorMessage: String) {
                 val err = createErrorJSON(errorCode, errorMessage, null)
                 promise.reject("error", err)
@@ -244,7 +254,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun logoutUser(promise: Promise) {
-        val activity = currentActivity;
+        val activity = reactApplicationContext.currentActivity
         if (activity != null) {
             SmallcaseGatewaySdk.logoutUser(activity = activity, logoutListener = object : SmallcaseLogoutListener {
                 override fun onLogoutSuccessfull() {
@@ -261,7 +271,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun triggerLeadGen(userDetails: ReadableMap, utmData: ReadableMap) {
-        val activity = currentActivity;
+        val activity = reactApplicationContext.currentActivity
         if (activity != null) {
             SmallcaseGatewaySdk.triggerLeadGen(activity = activity, utmParams = readableMapToStrHashMap(utmData), params = readableMapToStrHashMap(userDetails))
         }
@@ -269,7 +279,7 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun triggerLeadGenWithStatus(userDetails: ReadableMap, promise: Promise) {
-        val activity = currentActivity
+        val activity = reactApplicationContext.currentActivity
         if (activity != null) {
 
             SmallcaseGatewaySdk.triggerLeadGen(activity, readableMapToStrHashMap(userDetails), object : LeadGenResponseListener {
@@ -282,10 +292,11 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
      @ReactMethod
      fun triggerLeadGenWithLoginCta(userDetails: ReadableMap, utmData: ReadableMap, showLoginCta: Boolean, promise: Promise) {
-         if(currentActivity != null) {
+         val activity = reactApplicationContext.currentActivity
+         if(activity != null) {
 
              SmallcaseGatewaySdk.triggerLeadGen(
-                 activity = currentActivity!!,
+                 activity = activity,
                  params = readableMapToStrHashMap(userDetails),
                  utmParams = readableMapToStrHashMap(utmData),
                  retargeting = null,
@@ -300,7 +311,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun setupLoans(config: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(config)
       val gateway = hashMap["gatewayName"]
       val environment = hashMap["environment"]
@@ -328,7 +342,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
   @ReactMethod
     fun apply(loanConfig: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(loanConfig)
       val interactionToken = hashMap["interactionToken"]
       if(interactionToken == null) {
@@ -349,7 +366,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
   @ReactMethod
     fun pay(loanConfig: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(loanConfig)
       val interactionToken = hashMap["interactionToken"]
       if(interactionToken == null) {
@@ -370,7 +390,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
   @ReactMethod
     fun withdraw(loanConfig: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(loanConfig)
       val interactionToken = hashMap["interactionToken"]
       if(interactionToken == null) {
@@ -391,7 +414,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
   @ReactMethod
     fun service(loanConfig: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(loanConfig)
       val interactionToken = hashMap["interactionToken"]
       if(interactionToken == null) {
@@ -412,7 +438,10 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext) : ReactConte
 
     @ReactMethod
     fun triggerInteraction(loanConfig: ReadableMap, promise: Promise) {
-      val appCompatActivity = currentActivity as? AppCompatActivity ?: return
+      val appCompatActivity = reactApplicationContext.currentActivity as? AppCompatActivity ?: run {
+        promise.reject(Throwable("no activity"))
+        return
+      }
       val hashMap = readableMapToStrHashMap(loanConfig)
       val interactionToken = hashMap["interactionToken"]
       if(interactionToken == null) {

package/ios/SmallcaseGateway.m

@@ -234,6 +234,21 @@ RCT_REMAP_METHOD(triggerTransaction,
                 resolve(responseDict);
                 return;
             }
+            
+            //MARK: intent - mf holdings import
+            if ([response isKindOfClass: [ObjCTransactionIntentMfHoldingsImport class]]) {
+                ObjCTransactionIntentMfHoldingsImport *trxResponse = response;
+                // Use existing responseDict (already has success: true from line 169)
+                [responseDict setValue:@"MF_HOLDINGS_IMPORT"  forKey:@"transaction"];
+
+                if (trxResponse.data != nil && trxResponse.data.length > 0) {
+                    [responseDict setObject:trxResponse.data forKey:@"data"];
+                } else {
+                    [responseDict setObject:@"" forKey:@"data"];
+                }
+                resolve(responseDict);
+                return;
+            }
 
             //MARK: intent - fetch funds
             if([response isKindOfClass: [ObjcTransactionIntentFetchFunds class]]) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-smallcase-gateway",
   "title": "React Native Smallcase Gateway",
-  "version": "7.1.0",
+  "version": "7.2.1",
   "description": "smallcase gateway bindings for react native",
   "main": "src/index.js",
   "files": [

package/react-native-smallcase-gateway.podspec

@@ -27,12 +27,13 @@ Pod::Spec.new do |s|
     }
 
     s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
+    # RCT-Folly is provided by ReactNativeDependencies in RN 0.81+, so we don't need to declare it
+    # s.dependency "RCT-Folly"
     s.dependency "RCTRequired"
     s.dependency "RCTTypeSafety"
     s.dependency "ReactCommon/turbomodule/core"
   end
 
-  s.dependency 'SCGateway', '7.0.1'
+  s.dependency 'SCGateway', '7.1.1'
   s.dependency 'SCLoans', '7.0.0'
 end