Skip to content

fix: support old arch on iOS #93

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
MegaManSec wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: support old arch on iOS #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 42 additions & 5 deletions ios/RNWallet.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#import <react_native_wallet-Swift.h>
#endif


@interface RNWallet () <WalletDelegate>
@end

Expand All @@ -34,17 +33,33 @@ - (instancetype)init {
}

RCT_REMAP_METHOD(IOSPresentAddPaymentPassView,
#ifdef RCT_NEW_ARCH_ENABLED
IOSPresentAddPaymentPassView:(JS::NativeWallet::IOSCardData &)cardData
#else
IOSPresentAddPaymentPassView:(NSDictionary *)cardData
#endif
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)
{
@try {
NSDictionary *cardDataDict = @{
NSDictionary *cardDataDict = nil;

#ifdef RCT_NEW_ARCH_ENABLED
cardDataDict = @{
@"network": [self safeString:cardData.network()],
@"cardHolderName": [self safeString:cardData.cardHolderName()],
@"lastDigits": [self safeString:cardData.lastDigits()],
@"cardDescription": [self safeString:cardData.cardDescription()],
};
#else
cardDataDict = @{
@"network": [self safeString:cardData[@"network"]],
@"cardHolderName": [self safeString:cardData[@"cardHolderName"]],
@"lastDigits": [self safeString:cardData[@"lastDigits"]],
@"cardDescription": [self safeString:cardData[@"cardDescription"]],
};
#endif

dispatch_async(dispatch_get_main_queue(), ^{
[self->walletManager IOSPresentAddPaymentPassViewWithCardData:cardDataDict completion:^(OperationResult result, NSDictionary* data) {
[self handleWalletResponse:result data:data completedBlock:resolve errorPrefix:@"present_payment_pass_view_failed" defaultErrorMessage:@"Failed to present the payment pass view" rejecter:reject];
Expand All @@ -56,16 +71,31 @@ - (instancetype)init {
}

RCT_REMAP_METHOD(IOSHandleAddPaymentPassResponse,
#ifdef RCT_NEW_ARCH_ENABLED
IOSHandleAddPaymentPassResponse:(JS::NativeWallet::IOSEncryptPayload &)payload
#else
IOSHandleAddPaymentPassResponse:(NSDictionary *)payload
#endif
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject)
{
@try {
NSDictionary *payloadDict = @{
NSDictionary *payloadDict = nil;

#ifdef RCT_NEW_ARCH_ENABLED
payloadDict = @{
@"encryptedPassData": [self safeString:payload.encryptedPassData()],
@"activationData": [self safeString:payload.activationData()],
@"ephemeralPublicKey": [self safeString:payload.ephemeralPublicKey()],
};
#else
payloadDict = @{
@"encryptedPassData": [self safeString:payload[@"encryptedPassData"]],
@"activationData": [self safeString:payload[@"activationData"]],
@"ephemeralPublicKey": [self safeString:payload[@"ephemeralPublicKey"]],
};
#endif

dispatch_async(dispatch_get_main_queue(), ^{
[self->walletManager IOSHandleAddPaymentPassResponseWithPayload:payloadDict completion:^(OperationResult result, NSDictionary* data) {
[self handleWalletResponse:result data:data completedBlock:resolve errorPrefix:@"add_card_failed" defaultErrorMessage:@"Failed to add the card to the wallet" rejecter:reject];
Expand Down Expand Up @@ -93,7 +123,15 @@ - (instancetype)init {
resolve([walletManager getCardStatusByIdentifierWithIdentifier:identifier]);
}

- (void)addCardToGoogleWallet:(JS::NativeWallet::AndroidCardData &)cardData resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- (void)addCardToGoogleWallet:
#ifdef RCT_NEW_ARCH_ENABLED
(JS::NativeWallet::AndroidCardData &)cardData
#else
(NSDictionary *)cardData
#endif
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject
{
// no-op
}

Expand Down Expand Up @@ -149,5 +187,4 @@ - (NSString *)safeString:(NSString *)value {
}
#endif


@end
Loading