Merge pull request #37 from BlakeWilliams/bmw-phone-fix

Check if phone is nil before adding it to args
kraffslol · Apr 1, 2017 · 11fe781 · 11fe781
2 parents 90789f7 + 6f7c3e3
commit 11fe781
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ios/RCTBraintree/RCTBraintree.m b/ios/RCTBraintree/RCTBraintree.m
@@ -104,9 +104,13 @@ - (instancetype)init
         payPalDriver.viewControllerPresentingDelegate = self;
 
         [payPalDriver authorizeAccountWithCompletion:^(BTPayPalAccountNonce *tokenizedPayPalAccount, NSError *error) {
-            NSArray *args = @[[NSNull null]];
+            NSMutableArray *args = @[[NSNull null]];
             if ( error == nil && tokenizedPayPalAccount != nil ) {
-                args = @[[NSNull null], tokenizedPayPalAccount.nonce, tokenizedPayPalAccount.email, tokenizedPayPalAccount.firstName, tokenizedPayPalAccount.lastName, tokenizedPayPalAccount.phone];   
+                args = [@[[NSNull null], tokenizedPayPalAccount.nonce, tokenizedPayPalAccount.email, tokenizedPayPalAccount.firstName, tokenizedPayPalAccount.lastName] mutableCopy];
+
+                if (tokenizedPayPalAccount.phone != nil) {
+                    [args addObject:tokenizedPayPalAccount.phone];
+                }
             } else if ( error != nil ) {
                 args = @[error.description, [NSNull null]];
             }