Skip to content

Conversation

@MattFoley
Copy link
Owner

Resolves: #1 by bringing in PR from Android PayPal wrapper library: Vizir/react-native-paypal#1

cartolari and others added 30 commits January 8, 2016 17:43
…o ios

# By Tj (3) and others
# Via Greg Herlihy
* 'master' of github.com:MattFoley/react-native-paypal:
  Change react-native dependency.
  Updating version
  Updating Paypal to 2.14.2 and fixing error with preparePaymentOfAmount
  Present on the main thread.
  Bump version.
  Updates to the latest RN, updates to the latest PayPal library. Fixes JS example to use new React class creation style. Disable ATS security for local RN development on iOS 9. Add in CardIO libraries for newest PayPal library. Add RCTConvert class extension for enums being passed in from JS to ObjC.

Conflicts:
	ReactPaypal/ReactPaypal.xcodeproj/project.pbxproj
	ReactPaypal/iOS/AppDelegate.m
	ReactPaypal/iOS/Info.plist
	ReactPaypal/index.ios.js
	ReactPaypal/lib/Paypal
	ReactPaypal/package.json
	ios/MFLReactNativePayPal/MFLReactNativePayPal.m
@greghe
Copy link
Collaborator

greghe commented Aug 14, 2016

looks good.

@MattFoley MattFoley merged commit 715037c into master Aug 15, 2016
@MattFoley MattFoley deleted the ios branch August 15, 2016 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants