judokit-react-native 3.4.7 → 3.5.0

package/ios/Classes/RNJudo.m

@@ -128,13 +128,19 @@ RCT_REMAP_METHOD(fetchTransactionDetails,
                  properties:(NSDictionary *)properties
                  fetchTransactionDetailsWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject) {
+    @try {
+        self.apiService = [RNWrappers apiServiceFromProperties:properties];
+        self.completionBlock = [self completionBlockWithResolve:resolve andReject:reject];
 
-    self.apiService = [RNWrappers apiServiceFromProperties:properties];
-    self.completionBlock = [self completionBlockWithResolve:resolve andReject:reject];
-
-    NSString *receiptId = [RNWrappers receiptIdFromProperties:properties];
+        NSString *receiptId = [RNWrappers receiptIdFromProperties:properties];
 
-    [self.apiService fetchTransactionWithReceiptId:receiptId completion:self.completionBlock];
+        [self.apiService fetchTransactionWithReceiptId:receiptId completion:self.completionBlock];
+    } @catch (NSException *exception) {
+        NSError *error = [[NSError alloc] initWithDomain:RNJudoErrorDomain
+                                                    code:0
+                                                userInfo:exception.userInfo];
+        reject(kJudoPromiseRejectionCode, exception.reason, error);
+    }
 }
 
 //----------------------------------------------
@@ -204,7 +210,17 @@ RCT_REMAP_METHOD(fetchTransactionDetails,
                 message = description;
             }
             
-            reject(kJudoPromiseRejectionCode, message, error);
+            // TODO: RCTJSErrorFromCodeMessageAndNSError expects an NSError instane in userInfo[NSUnderlyingErrorKey]
+            // which in case of a 3DS SDK error is a NSString ('JP3DSSDKRuntimeException') - so it crashes
+            // ! this should be fixed in JudoKit-iOS, and the folowing workaround removed ASAP
+            NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:error.userInfo];
+            [userInfo removeObjectForKey:NSUnderlyingErrorKey];
+            NSError *myError = [[NSError alloc] initWithDomain:error.domain
+                                                          code:error.code
+                                                      userInfo:[NSDictionary dictionaryWithDictionary:userInfo]];
+            
+            
+            reject(kJudoPromiseRejectionCode, message, myError);
         } else {
             NSDictionary *mappedResponse = [RNWrappers dictionaryFromResponse:response];
             resolve(mappedResponse);

package/ios/Classes/Wrappers/RNWrappers.m

@@ -28,6 +28,7 @@
 #import "RNTypes.h"
 #import "NSDictionary+JudoConvert.h"
 #import "UIColor+RNAdditions.h"
+#import <Judo3DS2_iOS/Judo3DS2_iOS.h>
 
 static NSString *const kCardSchemeVISA = @"visa";
 static NSString *const kCardSchemeMasterCard = @"mastercard";
@@ -129,6 +130,7 @@ static NSString *const kCardSchemeAMEX = @"amex";
 
     NSString *judoId = [configurationDict stringForKey:@"judoId"];
     NSNumber *isInitialRecurringPayment = [configurationDict optionalBoolForKey:@"isInitialRecurringPayment"];
+    NSNumber *isDelayedAuthorisation = [configurationDict optionalBoolForKey:@"isDelayedAuthorisation"];
 
     JPAmount *amount = [RNWrappers amountFromConfiguration:configurationDict];
     JPReference *reference = [RNWrappers referenceFromConfiguration:configurationDict];
@@ -137,7 +139,14 @@ static NSString *const kCardSchemeAMEX = @"amex";
                                                                       amount:amount
                                                                    reference:reference];
 
-    configuration.isInitialRecurringPayment = isInitialRecurringPayment;
+    if (isInitialRecurringPayment) {
+        configuration.isInitialRecurringPayment = isInitialRecurringPayment.boolValue;
+    }
+
+    if (isDelayedAuthorisation) {
+        configuration.isDelayedAuthorisation = isDelayedAuthorisation.boolValue;
+    }
+
     configuration.uiConfiguration = [RNWrappers uiConfigurationFromConfiguration:configurationDict];
     configuration.supportedCardNetworks = [RNWrappers cardNetworksFromConfiguration:configurationDict];
     configuration.primaryAccountDetails = [RNWrappers accountDetailsFromConfiguration:configurationDict];
@@ -246,15 +255,15 @@ static NSString *const kCardSchemeAMEX = @"amex";
 + (JPCardNetworkType)cardTypeFromProperties:(NSDictionary *)properties {
     NSString *cardScheme = [properties optionalStringForKey:@"cardScheme"].lowercaseString;
     
-    if ([kCardSchemeVISA isEqualToString:cardScheme]) {
+    if ([cardScheme containsString:kCardSchemeVISA]) {
         return JPCardNetworkTypeVisa;
     }
     
-    if ([kCardSchemeMasterCard isEqualToString:cardScheme]) {
+    if ([cardScheme containsString:kCardSchemeMasterCard]) {
         return JPCardNetworkTypeMasterCard;
     }
     
-    if ([kCardSchemeAMEX isEqualToString:cardScheme]) {
+    if ([cardScheme containsString:kCardSchemeAMEX]) {
         return JPCardNetworkTypeAMEX;
     }
     
@@ -328,7 +337,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 {
@@ -341,26 +351,334 @@ static NSString *const kCardSchemeAMEX = @"amex";
         return uiConfiguration;
     }
 
-    NSNumber *isAVSEnabled = [dictionary boolForKey:@"isAVSEnabled"];
-    NSNumber *shouldDisplayAmount = [dictionary boolForKey:@"shouldPaymentMethodsDisplayAmount"];
-    NSNumber *isPayButtonAmountVisible = [dictionary boolForKey:@"shouldPaymentButtonDisplayAmount"];
-    NSNumber *isSecureCodeCheckEnabled = [dictionary boolForKey:@"shouldPaymentMethodsVerifySecurityCode"];
+    NSNumber *isAVSEnabled = [dictionary optionalBoolForKey:@"isAVSEnabled"];
+    NSNumber *shouldDisplayAmount = [dictionary optionalBoolForKey:@"shouldPaymentMethodsDisplayAmount"];
+    NSNumber *isPayButtonAmountVisible = [dictionary optionalBoolForKey:@"shouldPaymentButtonDisplayAmount"];
+    NSNumber *isSecureCodeCheckEnabled = [dictionary optionalBoolForKey:@"shouldPaymentMethodsVerifySecurityCode"];
     NSNumber *shouldAskForBillingInformation = [dictionary optionalBoolForKey:@"shouldAskForBillingInformation"];
     
-    uiConfiguration.isAVSEnabled = isAVSEnabled.boolValue;
-    uiConfiguration.shouldPaymentMethodsDisplayAmount = shouldDisplayAmount.boolValue;
-    uiConfiguration.shouldPaymentButtonDisplayAmount = isPayButtonAmountVisible.boolValue;
-    uiConfiguration.shouldPaymentMethodsVerifySecurityCode = isSecureCodeCheckEnabled.boolValue;
+    if (isAVSEnabled) {
+        uiConfiguration.isAVSEnabled = isAVSEnabled.boolValue;
+    }
+
+    if (shouldDisplayAmount) {
+        uiConfiguration.shouldPaymentMethodsDisplayAmount = shouldDisplayAmount.boolValue;
+    }
+
+    if (isPayButtonAmountVisible) {
+        uiConfiguration.shouldPaymentButtonDisplayAmount = isPayButtonAmountVisible.boolValue;
+    }
+
+    if (isSecureCodeCheckEnabled) {
+        uiConfiguration.shouldPaymentMethodsVerifySecurityCode = isSecureCodeCheckEnabled.boolValue;
+    }
     
     if (shouldAskForBillingInformation) {
         uiConfiguration.shouldAskForBillingInformation = shouldAskForBillingInformation.boolValue;
     }
     
     uiConfiguration.theme = [self themeFromUIConfiguration:dictionary];
+    uiConfiguration.threeDSUICustomization = [self threeDSUICustomization:dictionary];
 
     return uiConfiguration;
 }
 
++ (JP3DSUICustomization *)threeDSUICustomization:(NSDictionary *)uiCustomization {
+    NSDictionary *dictionary = [uiCustomization optionalDictionaryForKey:@"threeDSUIConfiguration"];
+
+    if (!dictionary) {
+        return nil;
+    }
+
+    NSDictionary *buttonCustomizations = [dictionary optionalDictionaryForKey:@"buttonCustomizations"];
+    NSDictionary *toolbarCustomizations = [dictionary optionalDictionaryForKey:@"toolbarCustomization"];
+    NSDictionary *labelCustomizations = [dictionary optionalDictionaryForKey:@"labelCustomization"];
+    NSDictionary *textBoxCustomizations = [dictionary optionalDictionaryForKey:@"textBoxCustomization"];
+
+    JP3DSUICustomization *customization = [JP3DSUICustomization new];
+
+    if (buttonCustomizations) {
+        NSDictionary *submitButtonCustomization = [buttonCustomizations optionalDictionaryForKey:@"SUBMIT"];
+        NSDictionary *continueButtonCustomization = [buttonCustomizations optionalDictionaryForKey:@"CONTINUE"];
+        NSDictionary *nextButtonCustomization = [buttonCustomizations optionalDictionaryForKey:@"NEXT"];
+        NSDictionary *cancelButtonCustomization = [buttonCustomizations optionalDictionaryForKey:@"CANCEL"];
+        NSDictionary *resendButtonCustomization = [buttonCustomizations optionalDictionaryForKey:@"RESEND"];
+
+        if (submitButtonCustomization) {
+            JP3DSButtonCustomization *submitCustomization = [JP3DSButtonCustomization new];
+
+            NSString *textFontName = [submitButtonCustomization optionalStringForKey:@"textFontName"];
+            NSString *textColor = [submitButtonCustomization optionalStringForKey:@"textColor"];
+            NSString *backgroundColor = [submitButtonCustomization optionalStringForKey:@"backgroundColor"];
+            NSNumber *cornerRadius = [submitButtonCustomization optionalNumberForKey:@"cornerRadius"];
+            NSNumber *textFontSize = [submitButtonCustomization optionalNumberForKey:@"textFontSize"];
+
+            if (textFontName) {
+                [submitCustomization setTextFontName:textFontName];
+            }
+
+            if (textColor) {
+                [submitCustomization setTextColor:textColor];
+            }
+
+            if (backgroundColor) {
+                [submitCustomization setBackgroundColor:backgroundColor];
+            }
+
+            if (cornerRadius) {
+                [submitCustomization setCornerRadius:cornerRadius.integerValue];
+            }
+
+            if (textFontSize) {
+                [submitCustomization setTextFontSize:textFontSize.integerValue];
+            }
+
+            [customization setButtonCustomization:submitCustomization ofType:JP3DSButtonTypeSubmit];
+        }
+
+        if (continueButtonCustomization) {
+            JP3DSButtonCustomization *continueCustomization = [JP3DSButtonCustomization new];
+
+            NSString *textFontName = [continueButtonCustomization optionalStringForKey:@"textFontName"];
+            NSString *textColor = [continueButtonCustomization optionalStringForKey:@"textColor"];
+            NSString *backgroundColor = [continueButtonCustomization optionalStringForKey:@"backgroundColor"];
+            NSNumber *cornerRadius = [continueButtonCustomization optionalNumberForKey:@"cornerRadius"];
+            NSNumber *textFontSize = [continueButtonCustomization optionalNumberForKey:@"textFontSize"];
+
+            if (textFontName) {
+                [continueCustomization setTextFontName:textFontName];
+            }
+
+            if (textColor) {
+                [continueCustomization setTextColor:textColor];
+            }
+
+            if (backgroundColor) {
+                [continueCustomization setBackgroundColor:backgroundColor];
+            }
+
+            if (cornerRadius) {
+                [continueCustomization setCornerRadius:cornerRadius.integerValue];
+            }
+
+            if (textFontSize) {
+                [continueCustomization setTextFontSize:textFontSize.integerValue];
+            }
+
+            [customization setButtonCustomization:continueCustomization ofType:JP3DSButtonTypeContinue];
+        }
+
+        if (nextButtonCustomization) {
+            JP3DSButtonCustomization *nextCustomization = [JP3DSButtonCustomization new];
+
+            NSString *textFontName = [nextButtonCustomization optionalStringForKey:@"textFontName"];
+            NSString *textColor = [nextButtonCustomization optionalStringForKey:@"textColor"];
+            NSString *backgroundColor = [nextButtonCustomization optionalStringForKey:@"backgroundColor"];
+            NSNumber *cornerRadius = [nextButtonCustomization optionalNumberForKey:@"cornerRadius"];
+            NSNumber *textFontSize = [nextButtonCustomization optionalNumberForKey:@"textFontSize"];
+
+            if (textFontName) {
+                [nextCustomization setTextFontName:textFontName];
+            }
+
+            if (textColor) {
+                [nextCustomization setTextColor:textColor];
+            }
+
+            if (backgroundColor) {
+                [nextCustomization setBackgroundColor:backgroundColor];
+            }
+
+            if (cornerRadius) {
+                [nextCustomization setCornerRadius:cornerRadius.integerValue];
+            }
+
+            if (textFontSize) {
+                [nextCustomization setTextFontSize:textFontSize.integerValue];
+            }
+
+            [customization setButtonCustomization:nextCustomization ofType:JP3DSButtonTypeNext];
+        }
+
+        if (cancelButtonCustomization) {
+            JP3DSButtonCustomization *cancelCustomization = [JP3DSButtonCustomization new];
+
+            NSString *textFontName = [cancelButtonCustomization optionalStringForKey:@"textFontName"];
+            NSString *textColor = [cancelButtonCustomization optionalStringForKey:@"textColor"];
+            NSString *backgroundColor = [cancelButtonCustomization optionalStringForKey:@"backgroundColor"];
+            NSNumber *cornerRadius = [cancelButtonCustomization optionalNumberForKey:@"cornerRadius"];
+            NSNumber *textFontSize = [cancelButtonCustomization optionalNumberForKey:@"textFontSize"];
+
+            if (textFontName) {
+                [cancelCustomization setTextFontName:textFontName];
+            }
+
+            if (textColor) {
+                [cancelCustomization setTextColor:textColor];
+            }
+
+            if (backgroundColor) {
+                [cancelCustomization setBackgroundColor:backgroundColor];
+            }
+
+            if (cornerRadius) {
+                [cancelCustomization setCornerRadius:cornerRadius.integerValue];
+            }
+
+            if (textFontSize) {
+                [cancelCustomization setTextFontSize:textFontSize.integerValue];
+            }
+
+            [customization setButtonCustomization:cancelCustomization ofType:JP3DSButtonTypeCancel];
+        }
+
+        if (resendButtonCustomization) {
+            JP3DSButtonCustomization *resendCustomization = [JP3DSButtonCustomization new];
+
+            NSString *textFontName = [resendButtonCustomization optionalStringForKey:@"textFontName"];
+            NSString *textColor = [resendButtonCustomization optionalStringForKey:@"textColor"];
+            NSString *backgroundColor = [resendButtonCustomization optionalStringForKey:@"backgroundColor"];
+            NSNumber *cornerRadius = [resendButtonCustomization optionalNumberForKey:@"cornerRadius"];
+            NSNumber *textFontSize = [resendButtonCustomization optionalNumberForKey:@"textFontSize"];
+
+            if (textFontName) {
+                [resendCustomization setTextFontName:textFontName];
+            }
+
+            if (textColor) {
+                [resendCustomization setTextColor:textColor];
+            }
+
+            if (backgroundColor) {
+                [resendCustomization setBackgroundColor:backgroundColor];
+            }
+
+            if (cornerRadius) {
+                [resendCustomization setCornerRadius:cornerRadius.integerValue];
+            }
+
+            if (textFontSize) {
+                [resendCustomization setTextFontSize:textFontSize.integerValue];
+            }
+
+            [customization setButtonCustomization:resendCustomization ofType:JP3DSButtonTypeResend];
+        }
+    }
+
+    if (labelCustomizations) {
+        JP3DSLabelCustomization *labelCustomization = [JP3DSLabelCustomization new];
+
+        NSString *textFontName = [labelCustomizations optionalStringForKey:@"textFontName"];
+        NSString *textColor = [labelCustomizations optionalStringForKey:@"textColor"];
+        NSString *headingTextFontName = [labelCustomizations optionalStringForKey:@"headingTextFontName"];
+        NSString *headingTextColor = [labelCustomizations optionalStringForKey:@"headingTextColor"];
+        NSNumber *headingTextFontSize = [labelCustomizations optionalNumberForKey:@"headingTextFontSize"];
+        NSNumber *textFontSize = [labelCustomizations optionalNumberForKey:@"textFontSize"];
+
+        if (textFontName) {
+            [labelCustomization setTextFontName:textFontName];
+        }
+
+        if (textColor) {
+            [labelCustomization setTextColor:textColor];
+        }
+
+        if (headingTextFontName) {
+            [labelCustomization setHeadingTextFontName:headingTextFontName];
+        }
+
+        if (headingTextColor) {
+            [labelCustomization setHeadingTextColor:headingTextColor];
+        }
+
+        if (headingTextFontSize) {
+            [labelCustomization setHeadingTextFontSize:headingTextFontSize.integerValue];
+        }
+
+        if (textFontSize) {
+            [labelCustomization setTextFontSize:textFontSize.integerValue];
+        }
+
+        [customization setLabelCustomization:labelCustomization];
+    }
+
+    if (toolbarCustomizations) {
+        JP3DSToolbarCustomization *toolbarCustomization = [JP3DSToolbarCustomization new];
+
+        NSNumber *textFontSize = [toolbarCustomizations optionalNumberForKey:@"textFontSize"];
+        NSString *textFontName = [toolbarCustomizations optionalStringForKey:@"textFontName"];
+        NSString *textColor = [toolbarCustomizations optionalStringForKey:@"textColor"];
+        NSString *backgroundColor = [toolbarCustomizations optionalStringForKey:@"backgroundColor"];
+        NSString *headerText = [toolbarCustomizations optionalStringForKey:@"headerText"];
+        NSString *buttonText = [toolbarCustomizations optionalStringForKey:@"buttonText"];
+
+        if (textFontName) {
+            [toolbarCustomization setTextFontName:textFontName];
+        }
+
+        if (textColor) {
+            [toolbarCustomization setTextColor:textColor];
+        }
+
+        if (backgroundColor) {
+            [toolbarCustomization setBackgroundColor:backgroundColor];
+        }
+
+        if (headerText) {
+            [toolbarCustomization setHeaderText:headerText];
+        }
+
+        if (buttonText) {
+            [toolbarCustomization setButtonText:buttonText];
+        }
+
+        if (textFontSize) {
+            [toolbarCustomization setTextFontSize:textFontSize.integerValue];
+        }
+
+        [customization setToolbarCustomization:toolbarCustomization];
+    }
+
+    if (textBoxCustomizations) {
+        JP3DSTextBoxCustomization *textBoxCustomization = [JP3DSTextBoxCustomization new];
+
+        NSString *textFontName = [textBoxCustomizations optionalStringForKey:@"textFontName"];
+        NSString *textColor = [textBoxCustomizations optionalStringForKey:@"textColor"];
+        NSString *borderColor = [textBoxCustomizations optionalStringForKey:@"borderColor"];
+        NSNumber *borderWidth = [textBoxCustomizations optionalNumberForKey:@"borderWidth"];
+        NSNumber *cornerRadius = [textBoxCustomizations optionalNumberForKey:@"cornerRadius"];
+        NSNumber *textFontSize = [textBoxCustomizations optionalNumberForKey:@"textFontSize"];
+
+        if (textFontName) {
+            [textBoxCustomization setTextFontName:textFontName];
+        }
+
+        if (textColor) {
+            [textBoxCustomization setTextColor:textColor];
+        }
+
+        if (borderColor) {
+            [textBoxCustomization setBorderColor:borderColor];
+        }
+
+        if (borderWidth) {
+            [textBoxCustomization setBorderWidth:borderWidth.integerValue];
+        }
+
+        if (cornerRadius) {
+            [textBoxCustomization setCornerRadius:cornerRadius.integerValue];
+        }
+
+        if (textFontSize) {
+            [textBoxCustomization setTextFontSize:textFontSize.integerValue];
+        }
+
+        [customization setTextBoxCustomization:textBoxCustomization];
+    }
+
+    return customization;
+}
+
 + (JPTheme *)themeFromUIConfiguration:(NSDictionary *)uiConfiguration {
     JPTheme *theme = [JPTheme new];
 
@@ -462,38 +780,108 @@ static NSString *const kCardSchemeAMEX = @"amex";
     [mappedResponse setValue:response.appearsOnStatementAs forKey:@"appearsOnStatementAs"];
     [mappedResponse setValue:response.originalAmount forKey:@"originalAmount"];
     [mappedResponse setValue:response.netAmount forKey:@"netAmount"];
-    [mappedResponse setValue:response.amount.amount forKey:@"amount"];
-    [mappedResponse setValue:response.amount.currency forKey:@"currency"];
-
-    NSMutableDictionary *cardDetailsResponse = [NSMutableDictionary new];
-    [cardDetailsResponse setValue:response.cardDetails.cardLastFour forKey:@"cardLastFour"];
-    [cardDetailsResponse setValue:response.cardDetails.endDate forKey:@"endDate"];
-    [cardDetailsResponse setValue:response.cardDetails.cardToken forKey:@"cardToken"];
-    [cardDetailsResponse setValue:@(response.cardDetails.cardNetwork) forKey:@"cardNetwork"];
-    [cardDetailsResponse setValue:response.cardDetails.bank forKey:@"bank"];
-    [cardDetailsResponse setValue:response.cardDetails.cardCategory forKey:@"cardCategory"];
-    [cardDetailsResponse setValue:response.cardDetails.cardCountry forKey:@"cardCountry"];
-    [cardDetailsResponse setValue:response.cardDetails.cardFunding forKey:@"cardFunding"];
-    [cardDetailsResponse setValue:response.cardDetails.cardScheme forKey:@"cardScheme"];
-
-    [mappedResponse setValue:cardDetailsResponse forKey:@"cardDetails"];
-
-    NSMutableDictionary *consumerResponse = [NSMutableDictionary new];
-    [consumerResponse setValue:response.consumer.consumerToken forKey:@"consumerToken"];
-    [consumerResponse setValue:response.consumer.consumerReference forKey:@"consumerReference"];
-
-    [mappedResponse setValue:consumerResponse forKey:@"consumerResponse"];
-
-    NSMutableDictionary *orderDetailsResponse = [NSMutableDictionary new];
-    [orderDetailsResponse setValue:response.orderDetails.orderId forKey:@"orderId"];
-    [orderDetailsResponse setValue:response.orderDetails.orderStatus forKey:@"orderStatus"];
-    [orderDetailsResponse setValue:response.orderDetails.orderFailureReason forKey:@"orderFailureReason"];
-    [orderDetailsResponse setValue:response.orderDetails.timestamp forKey:@"timestamp"];
-    [orderDetailsResponse setValue:@(response.orderDetails.amount) forKey:@"amount"];
-
-    [mappedResponse setValue:orderDetailsResponse forKey:@"orderDetails"];
-
-    return mappedResponse;
-}
+
+    JPAmount *amount = response.amount;
+
+    if (amount) {
+        [mappedResponse setValue:amount.amount forKey:@"amount"];
+        [mappedResponse setValue:amount.currency forKey:@"currency"];
+    }
+
+    JPCardDetails *cardDetails = response.cardDetails;
+
+    if (cardDetails) {
+        NSMutableDictionary *cardDetailsDictionary = [NSMutableDictionary new];
+
+        if (cardDetails.cardLastFour) {
+            cardDetailsDictionary[@"cardLastFour"] = cardDetails.cardLastFour;
+        }
+
+        if (cardDetails.endDate) {
+            cardDetailsDictionary[@"endDate"] = cardDetails.endDate;
+        }
+
+        if (cardDetails.cardToken) {
+            cardDetailsDictionary[@"cardToken"] = cardDetails.cardToken;
+        }
+
+        cardDetailsDictionary[@"cardNetwork"] = @(cardDetails.cardNetwork);
+
+        if (cardDetails.bank) {
+            cardDetailsDictionary[@"bank"] = cardDetails.bank;
+        }
+
+        if (cardDetails.cardCategory) {
+            cardDetailsDictionary[@"cardCategory"] = cardDetails.cardCategory;
+        }
+
+        if (cardDetails.cardCountry) {
+            cardDetailsDictionary[@"cardCountry"] = cardDetails.cardCountry;
+        }
+
+        if (cardDetails.cardFunding) {
+            cardDetailsDictionary[@"cardFunding"] = cardDetails.cardFunding;
+        }
+
+        if (cardDetails.cardScheme) {
+            cardDetailsDictionary[@"cardScheme"] = cardDetails.cardScheme;
+        }
+
+        if (cardDetails.cardHolderName) {
+            cardDetailsDictionary[@"cardHolderName"] = cardDetails.cardHolderName;
+        }
+
+        [mappedResponse setValue:[NSDictionary dictionaryWithDictionary:cardDetailsDictionary]
+                          forKey:@"cardDetails"];
+    }
+
+    JPConsumer *consumer = response.consumer;
+
+    if (consumer) {
+        NSMutableDictionary *consumerDictionary = [NSMutableDictionary new];
+
+        if (consumer.consumerToken) {
+            consumerDictionary[@"consumerToken"] = consumer.consumerToken;
+        }
+
+        if (consumer.consumerReference) {
+            consumerDictionary[@"consumerReference"] = consumer.consumerReference;
+        }
+
+        if (consumerDictionary.count > 0) {
+            [mappedResponse setValue:[NSDictionary dictionaryWithDictionary:consumerDictionary]
+                              forKey:@"consumerResponse"];
+        }
+    }
+
+    JPOrderDetails *orderDetails = response.orderDetails;
+
+    if (orderDetails) {
+        NSMutableDictionary *orderDetailsDictionary = [NSMutableDictionary new];
+
+        if (orderDetails.orderId) {
+            orderDetailsDictionary[@"orderId"] = orderDetails.orderId;
+        }
+
+        if (orderDetails.orderStatus) {
+            orderDetailsDictionary[@"orderStatus"] = orderDetails.orderStatus;
+        }
+
+        if (orderDetails.orderFailureReason) {
+            orderDetailsDictionary[@"orderFailureReason"] = orderDetails.orderFailureReason;
+        }
+
+        if (orderDetails.timestamp) {
+            orderDetailsDictionary[@"timestamp"] = orderDetails.timestamp;
+        }
+
+        orderDetailsDictionary[@"amount"] = @(orderDetails.amount);
+
+        [mappedResponse setValue:[NSDictionary dictionaryWithDictionary:orderDetailsDictionary]
+                          forKey:@"orderDetails"];
+    }
+
+    return [NSDictionary dictionaryWithDictionary:mappedResponse];
+    }
 
 @end

package/ios/Podfile

@@ -19,7 +19,9 @@ target 'RNJudo' do
   # use_frameworks!
 
   # Pods for RNJudo
-  pod "JudoKit-iOS", "3.1.6"
+  pod "JudoKit-iOS", "3.1.10"
+  pod "Judo3DS2_iOS", "1.1.3"
+
   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.10):
     - 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,8 @@ 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)
+  - Judo3DS2_iOS (= 1.1.3)
+  - JudoKit-iOS (= 3.1.10)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
@@ -331,9 +332,9 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Judo3DS2_iOS: 90b820a50035cb08ccc1b2e22900b856132c79a5
-  JudoKit-iOS: eabd569f41993ddd46273a63aa5c255cef473308
-  OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
+  Judo3DS2_iOS: b2396a1f0aa3e8d428fdd887c8b6eae5d3aa4f79
+  JudoKit-iOS: c45f288b94eef55d779b4e61028b9bf04aa334b2
+  OpenSSL-Universal: 84efb8a29841f2764ac5403e0c4119a28b713346
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -357,6 +358,6 @@ SPEC CHECKSUMS:
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: 697d0d38cedb02c077c830bd5d3dab848ad81c11
+PODFILE CHECKSUM: f04f2f5cb9ebec38d61aa9e7bdf575cf58376fdd
 
 COCOAPODS: 1.11.3

package/package.json

@@ -1,12 +1,13 @@
 {
     "name": "judokit-react-native",
     "title": "Judopay React Native Module",
-    "version": "3.4.7",
+    "version": "3.5.0",
     "description": "A React Native module for the Judopay native SDKs to take payments on iOS and Android.",
     "main": "JudoPay.tsx",
     "scripts": {
         "test": "jest --coverage",
-        "lint": "tsc && eslint '*/**/*.{js,ts,tsx}' --quiet"
+        "lint": "tsc && eslint '*/**/*.{ts,tsx}' --quiet",
+        "format": "prettier --write \"**/*.+(tsx|ts)\""
     },
     "files": [
         "JudoPay.tsx",
@@ -52,6 +53,7 @@
         "eslint-plugin-react": "^7.19.0",
         "eslint-plugin-react-hooks": "^2.5.0",
         "jest": "^25.3.0",
+        "prettier": "^2.7.1",
         "react": "16.9.0",
         "react-native": "0.61.5"
     },