Skip to content

Avoid crash on unknown payment network name, and some additional code cleanup #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Avoid crash on unknown payment network name, and some additional code cleanup #351

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735d623
Avoid crash on unknown payment network name
Uriah-Eisenstein-ATT Apr 14, 2022
35ad585
(remove duplicate code)
Uriah-Eisenstein-ATT Apr 14, 2022
9608448
Create supported networks mapping only once
Uriah-Eisenstein-ATT Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions ios/ReactNativePayments.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ - (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController
// PRIVATE METHODS
// https://developer.apple.com/reference/passkit/pkpaymentnetwork
// ---------------
- (NSArray *_Nonnull)getSupportedNetworksFromMethodData:(NSDictionary *_Nonnull)methodData
{
static NSMutableDictionary *createSupportedNetworksMapping() {
NSMutableDictionary *supportedNetworksMapping = [[NSMutableDictionary alloc] init];

CGFloat iOSVersion = [[[UIDevice currentDevice] systemVersion] floatValue];
Expand Down Expand Up @@ -259,15 +258,24 @@ - (NSArray *_Nonnull)getSupportedNetworksFromMethodData:(NSDictionary *_Nonnull)
[supportedNetworksMapping setObject:PKPaymentNetworkMada forKey:@"mada"];
}

if (iOSVersion >= 12.1) {
[supportedNetworksMapping setObject:PKPaymentNetworkMada forKey:@"mada"];
return supportedNetworksMapping;
}

- (NSArray *_Nonnull)getSupportedNetworksFromMethodData:(NSDictionary *_Nonnull)methodData
{
static NSMutableDictionary * supportedNetworksMapping;
if (!supportedNetworksMapping) {
supportedNetworksMapping = createSupportedNetworksMapping();
}

// Setup supportedNetworks
NSArray *jsSupportedNetworks = methodData[@"supportedNetworks"];
NSMutableArray *supportedNetworks = [NSMutableArray array];
for (NSString *supportedNetwork in jsSupportedNetworks) {
[supportedNetworks addObject: supportedNetworksMapping[supportedNetwork]];
PKPaymentNetwork network = supportedNetworksMapping[supportedNetwork];
if (network != nil) {
[supportedNetworks addObject: network];
}
}

return supportedNetworks;
Expand Down