react-native-flyy 1.3.1 → 1.4.3

package/ios/ReactNativeFlyy.m

@@ -1,6 +1,5 @@
 #import "ReactNativeFlyy.h"
 #import "FlyyFramework/FlyyFramework.h"
-#import "WebViewController.h"
 
 @interface ReactNativeFlyy ()<FlyySDKClosedListener> {
     Flyy *flyy;
@@ -16,6 +15,7 @@ RCT_EXPORT_MODULE(Flyy)
 static NSString * STAGE = @"STAGE";
 static NSString * PRODUCTION = @"PRODUCTION";
 NSString * themeColor = @"";
+RCTResponseSenderBlock sdkClosedCallback;
 
 -(void)set_navigation_controller:(UINavigationController*)navigation  withCurrentViewController:(UIViewController*) controller
 {
@@ -28,7 +28,7 @@ RCT_EXPORT_METHOD(setPackageName: (NSString *)packageName)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setPackageWithPackageName:packageName];
+    [flyy setPackageWithPackageName:packageName];
 }
 
 //Init flyy sdk
@@ -37,7 +37,7 @@ RCT_EXPORT_METHOD(initSDK: (NSString *)partnerToken :(int)environment)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  initSDKWithPartnerToken:partnerToken environment: environment];
+    [flyy initSDKWithPartnerToken:partnerToken environment: environment];
 }
 
 //Init flyy sdk with referral callback
@@ -46,7 +46,7 @@ RCT_EXPORT_METHOD(initSDKWithReferralCallback: (NSString *)partnerToken :(int)en
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  initSDKWithPartnerToken:partnerToken environment: environment onComplete: ^(BOOL success, NSString * referralData) {
+    [flyy initSDKWithPartnerToken:partnerToken environment: environment onComplete: ^(BOOL success, NSString * referralData) {
         if(success) {
             callback(@[referralData]);
         }
@@ -60,7 +60,7 @@ RCT_EXPORT_METHOD(initSDKWithReferralCallback: (NSString *)partnerToken :(int)en
 //    //Instance of flyy class
 //    flyy = [Flyy sharedFlyyInstance];
 //
-//    [flyy  initSDKWithPartnerToken:partnerToken environment:environment themeColorPrimary:colorPrimary themeColorPrimaryDark:colorPrimaryDark];
+//    [flyy initSDKWithPartnerToken:partnerToken environment:environment themeColorPrimary:colorPrimary themeColorPrimaryDark:colorPrimaryDark];
 //}
 
 //set user
@@ -69,7 +69,7 @@ RCT_EXPORT_METHOD(setUser: (NSString *)userId)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserWithExternalUserId:userId];
+    [flyy setUserWithExternalUserId:userId];
 }
 
 //set user with segment id
@@ -78,7 +78,7 @@ RCT_EXPORT_METHOD(setUserWithSegment: (NSString *)userId :(NSString *)segmentId
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
         }
     }];
@@ -90,7 +90,7 @@ RCT_EXPORT_METHOD(setUserWithCallBack: (NSString *)userId :(RCTResponseSenderBlo
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserWithExternalUserId:userId onComplete: ^(BOOL success) {
+    [flyy setUserWithExternalUserId:userId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -103,7 +103,7 @@ RCT_EXPORT_METHOD(setUserWithSegmentCallback: (NSString *)userId :(NSString *)se
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -116,7 +116,7 @@ RCT_EXPORT_METHOD(setNewUser: (NSString *)userId)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setNewUserWithExternalUserId:userId];
+    [flyy setNewUserWithExternalUserId:userId];
 }
 
 //set new user with segmentId
@@ -125,7 +125,7 @@ RCT_EXPORT_METHOD(setNewUserWithSegment: (NSString *)userId :(NSString *)segment
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
         }
     }];
@@ -137,7 +137,7 @@ RCT_EXPORT_METHOD(setNewUserWithSegmentCallback: (NSString *)userId :(NSString *
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -150,7 +150,7 @@ RCT_EXPORT_METHOD(setNewUserWithCallBack: (NSString *)userId :(RCTResponseSender
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setNewUserWithExternalUserId:userId onComplete: ^(BOOL success) {
+    [flyy setNewUserWithExternalUserId:userId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -163,7 +163,7 @@ RCT_EXPORT_METHOD(setNewUserWithSegment: (NSString *)userId :(NSString *)segment
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setNewUserWithExternalUserId:userId segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -176,7 +176,7 @@ RCT_EXPORT_METHOD(setUserName: (NSString *)userName)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserNameWithUserName:userName];
+    [flyy setUserNameWithUserName:userName];
 }
 
 //set username with callback
@@ -185,7 +185,7 @@ RCT_EXPORT_METHOD(setUserNameWithCallBack: (NSString *)userName :(RCTResponseSen
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setUserNameWithUserName:userName onComplete: ^(BOOL success) {
+    [flyy setUserNameWithUserName:userName onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -198,7 +198,7 @@ RCT_EXPORT_METHOD(sendEvent: (NSString *)key withString:(NSString *)value)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  sendEventWithKey:key value:value];
+    [flyy sendEventWithKey:key value:value];
 }
 
 //send event with callback
@@ -207,7 +207,7 @@ RCT_EXPORT_METHOD(sendEventWithCallBack: (NSString *)key withString:(NSString *)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  sendEventWithKey:key value:value onComplete: ^(BOOL success) {
+    [flyy sendEventWithKey:key value:value onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -248,7 +248,7 @@ RCT_EXPORT_METHOD(addUserToSegment: (NSString *)segmentTitle withString:(NSStrin
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  addUserToSegmentWithSegmentTitle:segmentTitle segmentKey:segmentKey onComplete: ^(BOOL success) {
+    [flyy addUserToSegmentWithSegmentTitle:segmentTitle segmentKey:segmentKey onComplete: ^(BOOL success) {
         if(success) {
             //            callback(@[@("success")]);
         }
@@ -274,7 +274,7 @@ RCT_EXPORT_METHOD(showRewardWonScratchPopup: (NSString *)title :(NSString *)mess
 RCT_EXPORT_METHOD(setReferralCode: (NSString *)referralCode) {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setReferralCodeWithReferralCode:referralCode];
+    [flyy setReferralCodeWithReferralCode:referralCode];
 }
 
 //get referral code
@@ -290,7 +290,7 @@ RCT_EXPORT_METHOD(setSegmentId: (NSString *)segmentId) {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  setSegmentIdWithSegementId:segmentId];
+    [flyy setSegmentIdWithSegementId:segmentId];
 }
 
 //verify refferal code
@@ -299,7 +299,7 @@ RCT_EXPORT_METHOD(verifyReferralCode: (NSString *)referralCode :(RCTResponseSend
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  verifyReferralCodeWithReferralCode:referralCode onComplete:^(bool isValid, NSString* referralUrl) {
+    [flyy verifyReferralCodeWithReferralCode:referralCode onComplete:^(bool isValid, NSString* referralUrl) {
         if (isValid) {
             callback(@[@"true", referralUrl]);
         } else {
@@ -314,7 +314,7 @@ RCT_EXPORT_METHOD(getShareData: (RCTResponseSenderBlock)callback)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  getShareDataOnComplete: ^(BOOL success, NSArray<NSString *> *referralDetails) {
+    [flyy getShareDataOnComplete: ^(BOOL success, NSArray<NSString *> *referralDetails) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"referral_link": referralDetails[0],
@@ -341,7 +341,7 @@ RCT_EXPORT_METHOD(getShareDataWithOfferId: (int)offerId :(RCTResponseSenderBlock
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  getShareDataWithOfferId:offerId onComplete:^(BOOL success, NSArray<NSString *> *referralDetails) {
+    [flyy getShareDataWithOfferId:offerId onComplete:^(BOOL success, NSArray<NSString *> *referralDetails) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"referral_link": referralDetails[0],
@@ -368,7 +368,7 @@ RCT_EXPORT_METHOD(getReferralCount:(RCTResponseSenderBlock)callback)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  getReferralCountOnComplete:^(BOOL success, NSInteger referralCount) {
+    [flyy getReferralCountOnComplete:^(BOOL success, NSInteger referralCount) {
         callback(@[@(referralCount)]);
     }];
     
@@ -381,7 +381,7 @@ RCT_EXPORT_METHOD(setThemeColor: (NSString *)colorPrimary :(NSString *)colorPrim
     
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setThemeColorWithColorPrimary:colorPrimary colorPrimaryDark:colorPrimaryDark];
+    [flyy setThemeColorWithColorPrimary:colorPrimary colorPrimaryDark:colorPrimaryDark];
     
 }
 
@@ -390,7 +390,7 @@ RCT_EXPORT_METHOD(setUserToken: (NSString *)userToken)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setUserTokenWithUserToken:userToken];
+    [flyy setUserTokenWithUserToken:userToken];
 }
 
 //set user token with segment id
@@ -398,7 +398,7 @@ RCT_EXPORT_METHOD(setUserTokenWithSegment: (NSString *)userToken :(NSString *)se
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setUserTokenWithUserToken:userToken segmentId:segmentId];
+    [flyy setUserTokenWithUserToken:userToken segmentId:segmentId];
 }
 
 //set user token with callback
@@ -406,7 +406,7 @@ RCT_EXPORT_METHOD(setUserTokenWithCallBack: (NSString *)userToken :(RCTResponseS
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setUserTokenWithUserToken:userToken onComplete: ^(BOOL success) {
+    [flyy setUserTokenWithUserToken:userToken onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -418,7 +418,7 @@ RCT_EXPORT_METHOD(setUserTokenWithSegmentCallback: (NSString *)userToken :(NSStr
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setUserTokenWithUserToken:userToken segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setUserTokenWithUserToken:userToken segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -430,7 +430,7 @@ RCT_EXPORT_METHOD(setNewUserToken: (NSString *)userToken)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setNewUserTokenWithUserToken:userToken];
+    [flyy setNewUserTokenWithUserToken:userToken];
 }
 
 //set new user token with segmentId
@@ -438,7 +438,7 @@ RCT_EXPORT_METHOD(setNewUserTokenWithSegment: (NSString *)userToken :(NSString *
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setNewUserTokenWithUserToken:userToken segmentId:segmentId];
+    [flyy setNewUserTokenWithUserToken:userToken segmentId:segmentId];
 }
 
 //set new user token with callback
@@ -446,7 +446,7 @@ RCT_EXPORT_METHOD(setNewUserTokenWithCallBack: (NSString *)userToken :(RCTRespon
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setNewUserTokenWithUserToken:userToken onComplete: ^(BOOL success) {
+    [flyy setNewUserTokenWithUserToken:userToken onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -458,7 +458,7 @@ RCT_EXPORT_METHOD(setNewUserTokenWithSegmentCallback: (NSString *)userToken :(NS
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  setNewUserTokenWithUserToken:userToken segmentId:segmentId onComplete: ^(BOOL success) {
+    [flyy setNewUserTokenWithUserToken:userToken segmentId:segmentId onComplete: ^(BOOL success) {
         if(success) {
             callback(@[@("success")]);
         }
@@ -470,7 +470,7 @@ RCT_EXPORT_METHOD(getScratchCardCount: (RCTResponseSenderBlock)callback)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  getScratchCardCountOnComplete: ^(BOOL success, NSArray<NSNumber *> *scratchCardCountData) {
+    [flyy getScratchCardCountOnComplete: ^(BOOL success, NSArray<NSNumber *> *scratchCardCountData) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"total_sc_count": scratchCardCountData[0],
@@ -498,7 +498,7 @@ RCT_EXPORT_METHOD(getWalletBalance: (NSString *)walletLabel :(RCTResponseSenderB
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  getWalletBalanceWithWalletLabel:walletLabel onComplete:^(BOOL success, NSArray<NSNumber *> *walletBalanceData) {
+    [flyy getWalletBalanceWithWalletLabel:walletLabel onComplete:^(BOOL success, NSArray<NSNumber *> *walletBalanceData) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"balance": walletBalanceData[0],
@@ -523,7 +523,7 @@ RCT_EXPORT_METHOD(getReferrerDetails: (RCTResponseSenderBlock)callback)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  getReferrerDetailsOnComplete:^(BOOL success, NSArray<NSString *> *referrerDetailsData) {
+    [flyy getReferrerDetailsOnComplete:^(BOOL success, NSArray<NSString *> *referrerDetailsData) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"name": referrerDetailsData[0],
@@ -549,7 +549,7 @@ RCT_EXPORT_METHOD(getPreviousLeaderboardWinners: (NSString *)tag :(RCTResponseSe
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  getPreviousLeaderboardWinnersWithTag:tag onComplete:^(BOOL success, NSString* message, NSInteger participantsCount, NSString* winners, NSString* previousWinners) {
+    [flyy getPreviousLeaderboardWinnersWithTag:tag onComplete:^(BOOL success, NSString* message, NSInteger participantsCount, NSString* winners, NSString* previousWinners) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"message": message,
@@ -576,7 +576,7 @@ RCT_EXPORT_METHOD(getLeaderboardParticipants: (NSString *)tag :(RCTResponseSende
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  getLeaderboardParticipantsWithTag:tag onComplete:^(BOOL success, NSString* message, NSInteger participantsCount, NSString* winners, NSString* previousWinners) {
+    [flyy getLeaderboardParticipantsWithTag:tag onComplete:^(BOOL success, NSString* message, NSInteger participantsCount, NSString* winners, NSString* previousWinners) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"message": message,
@@ -612,18 +612,60 @@ RCT_EXPORT_METHOD(sendFcmTokenToServer: (NSString *)fcmToken)
     //Instance of flyy class
     NSLog(@"FCMTOKEN %@",fcmToken);
     flyy = [Flyy sharedFlyyInstance];
-    [flyy  sendFcmTokenToServerWithFcmToken:fcmToken];
+    [flyy sendFcmTokenToServerWithFcmToken:fcmToken];
 }
 
-//TODO VISHAL
-//send fcm token to server
-RCT_EXPORT_METHOD(handleNotification: (NSString *)remoteMessageString)
+RCT_EXPORT_METHOD(handleBackgroundNotification: (NSString *)remoteMessageString)
+{
+    //Instance of flyy class
+    flyy = [Flyy sharedFlyyInstance];
+    NSLog(@"userinfo %@",remoteMessageString);
+    
+    if (remoteMessageString != nil) {
+        
+        NSError * err;
+        NSData *data = [remoteMessageString dataUsingEncoding:NSUTF8StringEncoding];
+        NSDictionary * userInfo;
+        if(data!=nil){
+            userInfo = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&err];
+        }
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            dispatch_async(dispatch_get_main_queue(), ^(){
+                [self->flyy handleBackgroundNotificationWithUserInfo:userInfo];
+            });
+        });
+    }
+}
+
+RCT_EXPORT_METHOD(handleForegroundNotification: (NSString *)remoteMessageString)
 {
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     NSLog(@"userinfo %@",remoteMessageString);
     
-    [flyy handleNotificationWithUserInfo:remoteMessageString];
+    if (remoteMessageString != nil) {
+        NSError * err;
+        NSData *data = [remoteMessageString dataUsingEncoding:NSUTF8StringEncoding];
+        NSDictionary * userInfo;
+        if(data!=nil){
+            userInfo = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&err];
+        }
+        
+        [self->flyy handleForegroundNotificationWithUserInfo:userInfo];
+
+//        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+//            dispatch_async(dispatch_get_main_queue(), ^(){
+//                [self->flyy handleForegroundNotificationWithUserInfo:userInfo];
+//            });
+//        });
+    }
+}
+
+
+RCT_EXPORT_METHOD(handleNotification: (NSString *)remoteMessageString)
+{
+    //only for android
 }
 
 //set notification channel works only for android now
@@ -637,7 +679,7 @@ RCT_EXPORT_METHOD(getOffersCount: (RCTResponseSenderBlock)callback)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     
-    [flyy  getOffersCountOnComplete: ^(BOOL success, NSArray<NSNumber *> *offersCount) {
+    [flyy getOffersCountOnComplete: ^(BOOL success, NSArray<NSNumber *> *offersCount) {
         if (success) {
             NSDictionary* jsonObject = @{ @"success": @true,
                                           @"live_offers_count": offersCount[0],
@@ -659,60 +701,198 @@ RCT_EXPORT_METHOD(getOffersCount: (RCTResponseSenderBlock)callback)
 RCT_EXPORT_METHOD(openOffersScreen)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openOffersPage];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openOffersPage];
+        });
+    });
+}
+
+//open offers screen with segment and callback
+RCT_EXPORT_METHOD(openOffersScreenWithCallBack: (RCTResponseSenderBlock)callback)
+{
+    flyy = [Flyy sharedFlyyInstance];
+    sdkClosedCallback = callback;
+    [flyy setSDKClosedListenerWithFlyysdkclosedlistener:self];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openOffersPage];
+        });
+    });
+    
 }
 
 //open offers screen with segemnt id
 RCT_EXPORT_METHOD(openOffersScreenWithSegment: (NSString *)segmentId)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openOffersPageWithSegmentId:segmentId];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openOffersPageWithSegmentId:segmentId];
+        });
+    });
+    
+}
+
+//open offers screen with segment and callback
+RCT_EXPORT_METHOD(openOffersScreenWithSegmentCallBack: (NSString *)segmentId :(RCTResponseSenderBlock)callback)
+{
+    flyy = [Flyy sharedFlyyInstance];
+    sdkClosedCallback = callback;
+    [flyy setSDKClosedListenerWithFlyysdkclosedlistener:self];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openOffersPageWithSegmentId:segmentId];
+        });
+    });
+    
 }
 
 //open rewards screen
 RCT_EXPORT_METHOD(openRewardsScreen)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openRewardsPage];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openRewardsPage];
+        });
+    });
+    
+}
+
+//open rewards screen with callback
+RCT_EXPORT_METHOD(openRewardsScreenWithCallBack: (RCTResponseSenderBlock)callback)
+{
+    flyy = [Flyy sharedFlyyInstance];
+    sdkClosedCallback = callback;
+    [flyy setSDKClosedListenerWithFlyysdkclosedlistener:self];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openRewardsPage];
+        });
+    });
+    
 }
 
 //open wallet screen
 RCT_EXPORT_METHOD(openWalletScreen)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openWalletPage];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openWalletPage];
+        });
+    });
+    
+}
+
+//open wallet screen
+RCT_EXPORT_METHOD(openWalletScreenWithCallBack: (RCTResponseSenderBlock)callback)
+{
+    flyy = [Flyy sharedFlyyInstance];
+    sdkClosedCallback = callback;
+    [flyy setSDKClosedListenerWithFlyysdkclosedlistener:self];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openWalletPage];
+        });
+    });
+    
 }
 
 //open gift cards screen
 RCT_EXPORT_METHOD(openGiftCardScreen)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openGiftCardsPage];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openGiftCardPage];
+        });
+    });
+    
 }
 
 //open referral history screen
 RCT_EXPORT_METHOD(openReferralHistory)
 {
     flyy = [Flyy sharedFlyyInstance];
-    [flyy openReferralHistoryPage];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openReferralHistoryPage];
+        });
+    });
 }
 
 //open quiz screen
-RCT_EXPORT_METHOD(openFlyyQuizPage)
+RCT_EXPORT_METHOD(openFlyyQuizPage: (NSInteger *)quizId)
 {
+    flyy = [Flyy sharedFlyyInstance];
     
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openQuizListDetailPage];
+        });
+    });
 }
 
 //open quiz history screen
 RCT_EXPORT_METHOD(openFlyyQuizHistoryPage)
 {
+    flyy = [Flyy sharedFlyyInstance];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openQuizHistoryPage];
+        });
+    });
     
 }
 
 //open quiz list screen
 RCT_EXPORT_METHOD(openFlyyQuizListPage)
 {
+    flyy = [Flyy sharedFlyyInstance];
     
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openQuizListPage];
+        });
+    });
 }
 
 //open stamps screen
@@ -722,15 +902,31 @@ RCT_EXPORT_METHOD(openFlyyStampsPage)
 }
 
 //open stamps screen
-RCT_EXPORT_METHOD(openFlyyInviteDetailsPage)
+RCT_EXPORT_METHOD(openFlyyInviteDetailsPage: (NSInteger *)offerId)
 {
+    flyy = [Flyy sharedFlyyInstance];
     
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openInviteDetailsPageWithOfferId:*offerId];
+        });
+    });
 }
 
 //open challenge details screen
-RCT_EXPORT_METHOD(openFlyyChallengeDetailPage: (NSString *)offerId)
+RCT_EXPORT_METHOD(openFlyyChallengeDetailPage: (NSInteger *)offerId)
 {
+    flyy = [Flyy sharedFlyyInstance];
     
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openFlyyChallengesPageWithOfferId:offerId];
+        });
+    });
 }
 
 //open bonanza screen
@@ -739,35 +935,41 @@ RCT_EXPORT_METHOD(openFlyyBonanzaPage)
     
 }
 
-//call back when pages are closed
-RCT_EXPORT_METHOD(OnSDKClosed: (RCTResponseSenderBlock)callback)
+//open offers screen
+RCT_EXPORT_METHOD(openFlyyCustomInviteAndEarnPage: (NSInteger *)offerId :(NSString *)headerColor)
 {
-    [flyy setSDKClosedListenerWithFlyysdkclosedlistener:self];
-//    callback(@[@("Flyy SDK Closed")]);
+    flyy = [Flyy sharedFlyyInstance];
     
-//    [[NSNotificationCenter defaultCenter] addObserver:self
-//                                             selector:@selector(returnCallBack::callback:)
-//           name:@"OnSDKClosed"
-//           object:nil];
-   
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openFlyyCustomInviteAndEarnVCWithOfferId:offerId headerColor:headerColor];
+        });
+    });
+}
+
+RCT_EXPORT_METHOD(openFlyyInviteAndEarnPage: (NSInteger *)offerId)
+{
+    flyy = [Flyy sharedFlyyInstance];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        dispatch_async(dispatch_get_main_queue(), ^(){
+            
+            [self->flyy openInviteAndEarnPageWithOfferId:offerId];
+        });
+    });
 }
 
 //our internal protocol stub method
 - (void)onSDKClosedWithScreenName:(NSString * _Nonnull)screenName {
     NSLog(@"%@", screenName);
     
-//    [[NSNotificationCenter defaultCenter]
-//            postNotificationName:@"OnSDKClosed"
-//            object:self];
-    
-//    RCTResponseSenderBlock callback;
-//
-//    [self OnSDKClosed: callback];
-}
-
-- (void) returnCallBack:(NSNotification *) notification :(RCTResponseSenderBlock)callback {
-    NSLog(@"%@", notification);
-//    callback(@[@("Flyy SDK Closed")]);
+    if(sdkClosedCallback != nil) {
+        sdkClosedCallback(@[@("success")]);
+        sdkClosedCallback = nil;
+    }
 }
 
 //overriden method to expose all the constants
@@ -776,8 +978,8 @@ RCT_EXPORT_METHOD(OnSDKClosed: (RCTResponseSenderBlock)callback)
     //Instance of flyy class
     flyy = [Flyy sharedFlyyInstance];
     return @{
-        STAGE: [NSNumber numberWithInt:[flyy  staging]],
-        PRODUCTION: [NSNumber numberWithInt:[flyy  production]],
+        STAGE: [NSNumber numberWithInt:[flyy staging]],
+        PRODUCTION: [NSNumber numberWithInt:[flyy production]],
     };
 }