react-native-smallcase-gateway 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.6.2](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.6.1...v1.6.2) (2022-11-11)
+
+
+### Features
+
+* added support for MF Holdings import fix ([0bf5388](https://github.com/smallcase/react-native-smallcase-gateway/commit/0bf5388e1ca6ee5534681dfa35bd3f69c3aefd7a))
+
+
+### Bug Fixes
+
+* Data in mf response is null ([bfca609](https://github.com/smallcase/react-native-smallcase-gateway/commit/bfca609a3075a9e45dc63c4fa9e4561ea3b6cd37))
+
+### [1.6.1](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.5.4...v1.6.1) (2022-10-19)
+
+
+### Features
+
+* 1014 err msg added ([04bc4de](https://github.com/smallcase/react-native-smallcase-gateway/commit/04bc4de8dcd3a7a37d6f0d15eee5aeeb34419195))
+* add bridge method for mf holdings ([b68b570](https://github.com/smallcase/react-native-smallcase-gateway/commit/b68b57062ed514dc46404f94191c3ee438f184dc))
+
 ## [1.6.0](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.5.4...v1.6.0) (2022-09-23)
 
 ### [1.5.4](https://github.com/smallcase/react-native-smallcase-gateway/compare/v1.5.2...v1.5.4) (2022-09-08)

package/android/build.gradle

@@ -81,7 +81,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.smallcase.gateway:sdk:3.6.1'
+    implementation 'com.smallcase.gateway:sdk:3.6.4'
     implementation "androidx.core:core-ktx:1.3.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package/android/src/main/java/com/smallcase/gateway/reactnative/SmallcaseGatewayModule.kt

@@ -115,30 +115,30 @@ class SmallcaseGatewayModule(reactContext: ReactApplicationContext?) : ReactCont
         }
     }
 
-    // @ReactMethod
-    // fun triggerMfTransaction(transactionId: String, promise: Promise) {
-
-    //     if(currentActivity !=  null) {
-
-    //         SmallcaseGatewaySdk.triggerMfTransaction(
-    //             activity = currentActivity!!,
-    //             transactionId = transactionId,
-    //             listener = object : MFHoldingsResponseListener {
-
-    //                 override fun onSuccess(transactionResult: TransactionResult) {
-    //                     val res = resultToWritableMap(transactionResult, true)
-    //                     promise.resolve(res)
-    //                 }
-
-    //                 override fun onError(errorCode: Int, errorMessage: String, data: String?) {
-    //                     val err = createErrorJSON(errorCode, errorMessage, data)
-    //                     promise.reject("error", err)
-    //                 }
-    //             })
-    //     } else {
-    //         promise.reject(Throwable("no activity"))
-    //     }
-    // }
+    @ReactMethod
+    fun triggerMfTransaction(transactionId: String, promise: Promise) {
+
+        if(currentActivity !=  null) {
+
+            SmallcaseGatewaySdk.triggerMfTransaction(
+                activity = currentActivity!!,
+                transactionId = transactionId,
+                listener = object : MFHoldingsResponseListener {
+
+                    override fun onSuccess(transactionResult: TransactionResult) {
+                        val res = resultToWritableMap(transactionResult, true)
+                        promise.resolve(res)
+                    }
+
+                    override fun onError(errorCode: Int, errorMessage: String, data: String?) {
+                        val err = createErrorJSON(errorCode, errorMessage, data)
+                        promise.reject("error", err)
+                    }
+                })
+        } else {
+            promise.reject(Throwable("no activity"))
+        }
+    }
 
     @ReactMethod
     fun showOrders(promise: Promise) {

package/ios/SmallcaseGateway.m

@@ -94,6 +94,50 @@ RCT_REMAP_METHOD(init,
     }];
 }
 
+//MARK: Trigger Transaction
+RCT_REMAP_METHOD(triggerMfTransaction,
+                 transactionId:(NSString *)transactionId
+                 triggerTransactionWithResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+dispatch_async(dispatch_get_main_queue(), ^(void) {
+    [SCGateway.shared
+         triggerMfTransactionWithPresentingController:
+         [[[UIApplication sharedApplication] keyWindow] rootViewController]
+         transactionId: transactionId
+         completion: ^(id response, NSError * error) {
+            if (error != nil) {
+                NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+                [responseDict setValue:[NSNumber numberWithInteger:error.code]  forKey:@"errorCode"];
+                [responseDict setValue:error.domain  forKey:@"errorMessage"];
+                [responseDict setValue:[error.userInfo objectForKey: @"data"] forKey:@"data"];
+
+                NSError *err = [[NSError alloc] initWithDomain:error.domain code:error.code userInfo:responseDict];
+
+                reject(@"triggerTransaction", @"Error during transaction", err);
+                return;
+            }
+
+            //MARK: intent - mf transaction
+            if ([response isKindOfClass: [ObjCTransactionIntentMfHoldingsImport class]]) {
+                NSMutableDictionary *responseDict = [[NSMutableDictionary alloc] init];
+                ObjCTransactionIntentMfHoldingsImport *trxResponse = response;
+                [responseDict setObject:@"TRANSACTION"  forKey:@"transaction"];
+
+                NSData *decodedStringData = [[NSData alloc] initWithBase64EncodedString:trxResponse.data options: 0];
+                NSString *decodedResponse = [[NSString alloc] initWithData:decodedStringData encoding:1];
+
+                [responseDict setObject:trxResponse.data forKey:@"data"];
+                resolve(responseDict);
+                return;
+            }
+
+            // no matching intent type
+            NSError *err = [[NSError alloc] initWithDomain:@"com.smallcase.gateway" code:0 userInfo:@{@"Error reason": @"no matching response type"}];
+            reject(@"triggerMfTransaction", @"no matching response type", err);
+         }];
+});
+                 }
+
 //MARK: Trigger Transaction
 RCT_REMAP_METHOD(triggerTransaction,
                  transactionId:(NSString *)transactionId

package/ios/SmallcaseGateway.xcodeproj/project.pbxproj

@@ -47,12 +47,20 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		158F56C62901D6B600238D90 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
 				134814211AA4EA7D00B7C361 /* Products */,
 				18B09301250F83460012829C /* SmallcaseGateway.h */,
 				18B09300250F83460012829C /* SmallcaseGateway.m */,
+				158F56C62901D6B600238D90 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};

package/package.json

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

package/react-native-smallcase-gateway.podspec

@@ -18,11 +18,11 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => "11.0" }
   # s.source       = { :git => "https://github.com/mobile/react-native-smallcase-gateway.git", :tag => "#{s.version}" }
   s.source       = { :git => "https://github.com/smallcase/react-native-smallcase-gateway.git", :tag => "#{s.version}" }
-
+  s.vendored_frameworks = 'SCGateway.xcframework'
   s.source_files = "ios/**/*.{h,c,m,swift}"
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency 'SCGateway', '3.6.1'
+  s.dependency 'SCGateway', '3.7.2'
 end
 

package/src/SmallcaseGateway.js

@@ -110,13 +110,13 @@ const triggerTransaction = async (transactionId, utmParams, brokerList) => {
  * @param {string} transactionId
  * @returns {Promise<transactionRes>}
  */
-// const triggerMfTransaction = async (transactionId) => {
-//   const safeTransactionId = typeof transactionId === "string" ? transactionId : "";
+const triggerMfTransaction = async (transactionId) => {
+  const safeTransactionId = typeof transactionId === "string" ? transactionId : "";
 
-//   return SmallcaseGatewayNative.triggerMfTransaction(
-//     safeTransactionId
-//   );
-// }
+  return SmallcaseGatewayNative.triggerMfTransaction(
+    safeTransactionId
+  );
+}
 
 /**
  * launches smallcases module
@@ -267,6 +267,7 @@ const SmallcaseGateway = {
   triggerLeadGenWithLoginCta,
   archiveSmallcase,
   triggerTransaction,
+  triggerMfTransaction,
   setConfigEnvironment,
   launchSmallplug,
   launchSmallplugWithBranding,

package/src/constants.js

@@ -31,4 +31,5 @@ export const ERROR_MSG = {
   invalid_transactionId: "invalid_transactionId",
   insufficient_holdings: "insufficient_holdings",
   transaction_in_process: "transaction_in_process",
+  no_compatible_browser: "no_compatible_browser"
 };