Merge pull request #93 from ShortboxedInc/fix-ios

fix: Fix build issue with both iOS and Android
ekreative · Aug 16, 2024 · e52aeaa · e52aeaa
2 parents d6170dd + b2669f9
commit e52aeaa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/android/src/main/java/com/ekreative/reactnativebraintree/RNBraintreeModule.java b/android/src/main/java/com/ekreative/reactnativebraintree/RNBraintreeModule.java
@@ -143,16 +143,16 @@ public void showPayPalModule(final ReadableMap parameters, final Promise promise
             if (parameters.hasKey("currencyCode")) {
                 currency = parameters.getString("currencyCode");
             }
-            if (parameters.hasKey("userAction") && PayPalCheckoutRequest.USER_ACTION_COMMIT.equals(parameters.getString("userAction"))) {
-                request.setUserAction(PayPalCheckoutRequest.USER_ACTION_COMMIT);
-            }
             if (mCurrentActivity != null) {
                 mPayPalClient = new PayPalClient(mBraintreeClient);
                 PayPalCheckoutRequest request = new PayPalCheckoutRequest(
                         parameters.getString("amount")
                 );
                 request.setCurrencyCode(currency);
                 request.setIntent(PayPalPaymentIntent.AUTHORIZE);
+                if (parameters.hasKey("userAction") && PayPalCheckoutRequest.USER_ACTION_COMMIT.equals(parameters.getString("userAction"))) {
+                       request.setUserAction(PayPalCheckoutRequest.USER_ACTION_COMMIT);
+                }
                 mPayPalClient.tokenizePayPalAccount(
                         mCurrentActivity,
                         request,

diff --git a/ios/RNBraintree.m b/ios/RNBraintree.m
@@ -21,13 +21,17 @@ @implementation RNBraintree
     NSString *clientToken = options[@"clientToken"];
     NSString *amount = options[@"amount"];
     NSString *currencyCode = options[@"currencyCode"];
+    NSString *userAction = options[@"userAction"];
 
     self.apiClient = [[BTAPIClient alloc] initWithAuthorization: clientToken];
     self.dataCollector = [[BTDataCollector alloc] initWithAPIClient:self.apiClient];
     BTPayPalDriver *payPalDriver = [[BTPayPalDriver alloc] initWithAPIClient: self.apiClient];
 
     BTPayPalCheckoutRequest *request= [[BTPayPalCheckoutRequest alloc] initWithAmount:amount];
     request.currencyCode = currencyCode;
+    if (userAction && [@"commit" isEqualToString:userAction]) {
+        request.userAction = BTPayPalRequestUserActionCommit;
+    }
     [payPalDriver tokenizePayPalAccountWithPayPalRequest:request completion:^(BTPayPalAccountNonce * _Nullable tokenizedPayPalAccount, NSError * _Nullable error) {
         if (error) {
             reject(@"ONE_TIME_PAYMENT_FAILED", error.localizedDescription, nil);
@@ -50,7 +54,6 @@ @implementation RNBraintree
                   rejecter: (RCTPromiseRejectBlock)reject) {
     NSString *clientToken = options[@"clientToken"];
     NSString *description = options[@"description"];
-    NSString *userAction = options[@"userAction"];
 
     self.apiClient = [[BTAPIClient alloc] initWithAuthorization: clientToken];
     self.dataCollector = [[BTDataCollector alloc] initWithAPIClient:self.apiClient];
@@ -60,9 +63,6 @@ @implementation RNBraintree
     if (description) {
         request.billingAgreementDescription = description;
     }
-    if (userAction && [@"commit" isEqualToString:userAction]) {
-        request.userAction = BTPayPalRequestUserActionCommit;
-    }
     [payPalDriver tokenizePayPalAccountWithPayPalRequest:request completion:^(BTPayPalAccountNonce * _Nullable tokenizedPayPalAccount, NSError * _Nullable error) {
         if (error) {
             reject(@"REQUEST_BILLING_AGREEMENT_FAILED", error.localizedDescription, nil);