react-native-nami-sdk 2.0.4 → 2.0.5

package/.github/workflows/build.yml

@@ -10,10 +10,10 @@ on:
       earlyaccess:
         description: "Is this a early access build?"
         default: true
-        type: boolean        
+        type: boolean
     secrets:
       BUILD_USER_PAT:
-        required: true    
+        required: true
 
 jobs:
   build:

package/.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+repos:
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v8.8.0
+    hooks:
+      - id: eslint
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-yaml
+        args: [--allow-multiple-documents]
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+        exclude: ^.*\b(\.(js|jsx|tsx).snap)\b$
+  - repo: https://github.com/nicklockwood/SwiftFormat
+    rev: 0.50.8 
+    hooks:
+      - id: swiftformat
+  - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+    rev: v2.6.0
+    hooks:
+      - id: pretty-format-kotlin

package/android/src/main/java/com/nami/reactlibrary/Constants.kt

@@ -1,3 +1,3 @@
 package com.nami.reactlibrary
 
-const val LOG_TAG = "NamiBridge"
+const val LOG_TAG = "NamiBridge"

package/android/src/main/java/com/nami/reactlibrary/NamiAnalyticsEmitter.kt

@@ -118,4 +118,4 @@ class NamiAnalyticsEmitter(reactContext: ReactApplicationContext) :
 //        return sanitizedDictionary;
 //    }
 
-}
+}

package/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt

@@ -128,7 +128,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:2.0.4")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:2.0.5")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

package/android/src/main/java/com/nami/reactlibrary/NamiBridgePackage.java

@@ -47,6 +47,3 @@ public class NamiBridgePackage implements ReactPackage {
         );
     }
 }
-
-
-

package/android/src/main/java/com/nami/reactlibrary/NamiCustomerManagerBridge.kt

@@ -39,4 +39,4 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
             resultsCallback.invoke(NamiCustomerManager.currentCustomerJourneyState().toDict())
         }
     }
-}
+}

package/android/src/main/java/com/nami/reactlibrary/NamiEmitter.kt

@@ -160,4 +160,4 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
             Log.e(LOG_TAG, "Caught Exception: " + e.message)
         }
     }
-}
+}

package/android/src/main/java/com/nami/reactlibrary/NamiEntitlementManagerBridgeModule.kt

@@ -164,4 +164,4 @@ class NamiEntitlementManagerBridgeModule(reactContext: ReactApplicationContext)
 
         return null
     }
-}
+}

package/android/src/main/java/com/nami/reactlibrary/NamiMLManagerBridgeModule.kt

@@ -47,4 +47,4 @@ class NamiMLManagerBridgeModule(reactContext: ReactApplicationContext) :
             NamiMLManager.coreAction(label)
         }
     }
-}
+}

package/android/src/main/java/com/nami/reactlibrary/NamiPurchaseManagerBridge.kt

@@ -109,4 +109,4 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
         resultsCallback.invoke(resultMap)
     }
-}
+}

package/ios/Nami.m

@@ -2,8 +2,7 @@
 //  Nami.m
 //  RNNami
 //
-//  Created by Kendall Gelner on 1/7/20.
-//  Copyright © 2020 Nami ML Inc. All rights reserved.
+//  Copyright © 2020-2023 Nami ML Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
@@ -25,10 +24,10 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
         NSLog(@"Configure dictionary is %@", configDict);
     }
     NSString *appID = configDict[@"appPlatformID-apple"];
-    
+
     if ([appID length] > 0 ) {
         NamiConfiguration *config = [NamiConfiguration configurationForAppPlatformID:appID];
-        
+
         NSString *logLevelString = configDict[@"logLevel"];
         if ([logLevelString isEqualToString:@"ERROR" ]) {
             config.logLevel = NamiLogLevelError;
@@ -40,7 +39,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
             // If they messed up the params, just set logging to full.
             config.logLevel = NamiLogLevelDebug;
         }
-        
+
         NSString *languageString = configDict[@"namiLanguageCode"];
         if ([logLevelString length] > 0) {
             NSLog(@"Nami language code from config dictionary is %@", languageString);
@@ -51,7 +50,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
                 NSLog(@"Warning: Nami language code from config dictionary %@ not found in list of available Nami Language Codes:\n%@", languageString, [NamiLanguageCodes allAvailiableNamiLanguageCodes]);
             }
         }
-        
+
         NSObject *bypassString = configDict[@"bypassStore"];
         if ( bypassString != NULL )
         {
@@ -66,7 +65,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
                 }
             }
         }
-        
+
         NSObject *developmentModeString = configDict[@"developmentMode"];
         if ( developmentModeString != NULL )
         {
@@ -81,10 +80,10 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
                 }
             }
         }
-        
+
         // Start commands with header iformation for Nami to let them know this is a React client.
-        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:2.0.4"]];
-        
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:2.0.5"]];
+
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];
         if ( appCommandStrings != NULL ) {
@@ -97,10 +96,10 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
                 }
             }
         }
-        
+
         config.namiCommands = namiCommandStrings;
 
-        
+
         [Nami configureWithNamiConfig:config];
     }
 }
@@ -110,15 +109,15 @@ RCT_EXPORT_METHOD(performNamiCommand: (NSString *)command) {
 }
 
 RCT_EXPORT_METHOD(setExternalIdentifier: (NSString *)externalIdentifier  type:(NSString *)type completion: (RCTResponseSenderBlock) completion) {
-    
+
     NamiExternalIdentifierType useType;
-     
+
     if ( [type isEqualToString:@"sha256"] ) {
         useType = NamiExternalIdentifierTypeSha256;
     } else {
         useType = NamiExternalIdentifierTypeUuid;
     }
-    
+
     NSLog(@"NamiBridge: Setting external identifier %@ of type %@", externalIdentifier, type);
 
     [Nami setExternalIdentifierWithExternalIdentifier:externalIdentifier type:useType completion:^(BOOL success, NSError * _Nullable error) {
@@ -132,7 +131,7 @@ RCT_EXPORT_METHOD(setExternalIdentifier: (NSString *)externalIdentifier  type:(N
 RCT_EXPORT_METHOD(getExternalIdentifier:(RCTResponseSenderBlock)completion)
 {
     NSString *externalIdentifier = [Nami getExternalIdentifier];
-   
+
     if (externalIdentifier == NULL || [externalIdentifier length] == 0) {
         completion(@[]);
     } else {
@@ -144,7 +143,8 @@ RCT_EXPORT_METHOD(clearExternalIdentifier:(RCTResponseSenderBlock)completion) {
     NSLog(@"NamiBridge: Clearing external identifier.");
     [Nami clearExternalIdentifierWithCompletion:^(BOOL success, NSError * _Nullable error) {
         if (error) {
-            success        }
+            completion(@[error]);
+        }
         completion(nil);
     }];
 }

package/ios/NamiAnalyticsEmitter.m

@@ -29,7 +29,7 @@
     self = [super init];
     if (self) {
         hasNamiAanlyticsEmitterListeners = NO;
-        
+
         [NamiAnalyticsSupport registerAnalyticsHandlerWithHandler: ^(NamiAnalyticsActionType actionType , NSDictionary<NSString *,id> * _Nonnull anaytlicsDict) {
             [self sendAnalyticsEventForAction:actionType anayticsItems:anaytlicsDict];
         }];

package/ios/NamiBridgeUtil.m

@@ -28,7 +28,7 @@
         productDict[@"priceLanguage"] = productInt.priceLocale.languageCode;
         productDict[@"priceCountry"] = productInt.priceLocale.countryCode;
         productDict[@"priceCurrency"] = productInt.priceLocale.currencyCode;
-        
+
         // Add smart text processed values for sku buttons to sku dictionary
         productDict[@"displayText"] = [sku namiDisplayText];
         productDict[@"displaySubText"] = [sku namiSubDisplayText];
@@ -71,18 +71,18 @@
 
  + (NSDictionary<NSString *,NSString *> *) purchaseToPurchaseDict:(NamiPurchase *)purchase {
      NSMutableDictionary<NSString *,id> *purchaseDict = [NSMutableDictionary new];
-     
+
      purchaseDict[@"skuIdentifier"] = purchase.skuID;
      purchaseDict[@"transactionIdentifier"] = purchase.transactionIdentifier;
 
      // Removed, not sure why, should add back in when possible.
      //     purchaseDict[@"purchaseInitiatedTimestamp"] = [self javascriptDateFromNSDate:purchase.purchaseInitiatedTimestamp];
-     
+
      NSDate *subscriptionExpirationDate = purchase.expires;
      if (subscriptionExpirationDate != nil) {
          purchaseDict[@"subscriptionExpirationDate"] = [self javascriptDateFromNSDate:subscriptionExpirationDate];
      }
-     
+
      NSString *convertedSourceString = @"UNKNOWN";
      switch (purchase.purchaseSource) {
           case 0:
@@ -98,9 +98,9 @@
              break;
      }
      purchaseDict[@"purchaseSource"] =  convertedSourceString;
-     
+
 //     NamiSKU *purchaseSku = [purchase ]
-     
+
      return purchaseDict;
  }
 
@@ -109,7 +109,7 @@
 + (NSArray *)stripPresentationPositionFromOrderedMetadataForPaywallMetaDict: (NSDictionary *)paywallMeta {
     NSArray *baseSkuArray = [paywallMeta objectForKey:@"sku_ordered_metadata"];
     NSMutableArray *newOrderedMetadata = [NSMutableArray new];
-    
+
     if ( [baseSkuArray isKindOfClass:[NSArray class]] ) {
         for (NSDictionary *baseSkuDict in baseSkuArray) {
             NSMutableDictionary *skuFormattingDict = [NSMutableDictionary dictionaryWithDictionary:baseSkuDict];
@@ -127,12 +127,12 @@
     entitlementDict[@"namiID"] = [entitlement namiID] ? [entitlement namiID] : @"";
     entitlementDict[@"desc"] = [entitlement desc] ? [entitlement desc] : @"";
     entitlementDict[@"name"] = [entitlement name] ? [entitlement name] : @"";
-    
+
     if (entitlementDict[@"referenceID"] == nil || [[entitlement referenceID] length] == 0) {
         NSLog(@"NamiBridge: Bad entitlement in system, empty referenceID.");
         return nil;
     }
-    
+
     NSArray <NamiPurchase *>*activePurchases = [entitlement activePurchases];
     NSMutableArray *convertedActivePurchases = [NSMutableArray array];
     for (NamiPurchase *purchase in activePurchases) {
@@ -142,7 +142,7 @@
         }
     }
     entitlementDict[@"activePurchases"] = convertedActivePurchases;
-    
+
     NSArray <NamiSKU *>*purchasedSKUs = [entitlement purchasedSKUs];
        NSMutableArray *convertedPurchasedSKUs = [NSMutableArray array];
        for (NamiSKU *sku in purchasedSKUs) {
@@ -152,8 +152,8 @@
            }
        }
        entitlementDict[@"purchasedSKUs"] = convertedPurchasedSKUs;
-    
-    
+
+
     NSArray <NamiSKU *>*relatedSKUs = [entitlement relatedSKUs];
     NSMutableArray *convertedRelatedSKUs = [NSMutableArray array];
     for (NamiSKU *sku in relatedSKUs) {
@@ -163,7 +163,7 @@
         }
     }
     entitlementDict[@"relatedSKUs"] = convertedRelatedSKUs;
-    
+
     NamiPurchase *lastPurchase;
     for (NamiPurchase *purchase in [entitlement activePurchases]) {
         if (lastPurchase == NULL || ([lastPurchase purchaseInitiatedTimestamp] < [purchase purchaseInitiatedTimestamp])) {
@@ -173,9 +173,9 @@
     if (lastPurchase != NULL) {
 //        entitlementDict[@"latestPurchase"] = [NamiBridgeUtil purchaseToPurchaseDict:lastPurchase];
     }
-    
+
     NSString *lastPurchaseSKUID = [lastPurchase skuID];
-    
+
     NamiSKU *lastPurchasedSKU;
     if (lastPurchaseSKUID != NULL ) {
         for (NamiSKU *sku in [entitlement purchasedSKUs]) {
@@ -184,7 +184,7 @@
             }
         }
     }
-    
+
     if (lastPurchasedSKU != NULL) {
         lastPurchasedSKU = [[entitlement purchasedSKUs] lastObject];
     }
@@ -192,7 +192,7 @@
     if (lastPurchasedSKU != NULL) {
 //        entitlementDict[@"lastPurchasedSKU"] = [NamiBridgeUtil skuToSKUDict:lastPurchasedSKU];
     }
-   
+
     return entitlementDict;
 }
 
@@ -201,23 +201,23 @@
 + (NSString *)javascriptDateFromNSDate:(NSDate *)purchaseTimestamp {
     NSTimeZone *UTC = [NSTimeZone timeZoneWithAbbreviation: @"UTC"];
     NSISO8601DateFormatOptions options = NSISO8601DateFormatWithInternetDateTime | NSISO8601DateFormatWithDashSeparatorInDate | NSISO8601DateFormatWithColonSeparatorInTime | NSISO8601DateFormatWithTimeZone;
-    
+
     return [NSISO8601DateFormatter stringFromDate:purchaseTimestamp timeZone:UTC formatOptions:options];
 }
 
 
 + (NSDictionary<NSString *,NSString *> *) customerJourneyStateDict {
     CustomerJourneyState *journeyState = [NamiCustomerManager currentCustomerJourneyState];
-    
+
     BOOL formerSubscriber = [journeyState formerSubscriber];
     BOOL inGracePeriod = [journeyState inGracePeriod];
     BOOL inTrialPeriod = [journeyState inTrialPeriod];
     BOOL inIntroOfferPeriod = [journeyState inIntroOfferPeriod];
-    
+
     BOOL isCancelled = [journeyState isCancelled];
     BOOL inPause = [journeyState inPause];
     BOOL inAccountHold = [journeyState inAccountHold];
-    
+
     NSDictionary *journeyDict = @{@"formerSubscriber":@(formerSubscriber),
                                   @"inGracePeriod":@(inGracePeriod),
                                   @"inTrialPeriod":@(inTrialPeriod),
@@ -231,52 +231,52 @@
 
 + (NSDictionary<NSString *,NSString *> *) paywallStylingToPaywallStylingDict:(PaywallStyleData *)styling {
     NSMutableDictionary<NSString *,id> *stylingDict = [NSMutableDictionary new];
-    if (styling != nil) {        
+    if (styling != nil) {
         stylingDict[@"backgroundColor"] = [NamiBridgeUtil hexStringForColor: styling.backgroundColor];
-        
+
         stylingDict[@"bodyFontSize"] = @(styling.bodyFontSize);
         stylingDict[@"bodyTextColor"] = [NamiBridgeUtil hexStringForColor: styling.bodyTextColor];
         stylingDict[@"bodyShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.bodyShadowColor];
         stylingDict[@"bodyShadowRadius"] = @(styling.bodyShadowRadius);
-        
+
         stylingDict[@"titleFontSize"] = @(styling.titleFontSize);
         stylingDict[@"titleTextColor"] = [NamiBridgeUtil hexStringForColor: styling.titleTextColor];
         stylingDict[@"titleShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.titleShadowColor];
         stylingDict[@"titleShadowRadius"] = @(styling.titleShadowRadius);
-        
+
         stylingDict[@"closeButtonFontSize"] = @(styling.closeButtonFontSize);
         stylingDict[@"closeButtonTextColor"] = [NamiBridgeUtil hexStringForColor: styling.closeButtonTextColor];
         stylingDict[@"closeButtonShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.closeButtonShadowColor];
         stylingDict[@"closeButtonShadowRadius"] = @(styling.closeButtonShadowRadius);
-        
+
         stylingDict[@"bottomOverlayColor"] = [NamiBridgeUtil hexStringForColor: styling.bottomOverlayColor];
         stylingDict[@"bottomOverlayCornerRadius"] = @(styling.bottomOverlayCornerRadius);
-        
+
         stylingDict[@"skuButtonColor"] = [NamiBridgeUtil hexStringForColor: styling.skuButtonColor];
         stylingDict[@"skuButtonTextColor"] = [NamiBridgeUtil hexStringForColor: styling.skuButtonTextColor];
-        
+
         stylingDict[@"featuredSkusButtonColor"] = [NamiBridgeUtil hexStringForColor: styling.featuredSkusButtonColor];
         stylingDict[@"featuredSkusButtonTextColor"] = [NamiBridgeUtil hexStringForColor: styling.featuredSkusButtonTextColor];
-        
+
         stylingDict[@"signinButtonFontSize"] = @(styling.signinButtonFontSize);
         stylingDict[@"signinButtonTextColor"] = [NamiBridgeUtil hexStringForColor: styling.signinButtonTextColor];
         stylingDict[@"signinButtonShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.signinButtonShadowColor];
         stylingDict[@"signinButtonShadowRadius"] = @(styling.signinButtonShadowRadius);
-        
+
         stylingDict[@"restoreButtonFontSize"] = @(styling.restoreButtonFontSize);
         stylingDict[@"restoreButtonTextColor"] = [NamiBridgeUtil hexStringForColor: styling.restoreButtonTextColor];
         stylingDict[@"restoreButtonShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.restoreButtonShadowColor];
         stylingDict[@"restoreButtonShadowRadius"] = @(styling.restoreButtonShadowRadius);
-        
+
         stylingDict[@"purchaseTermsFontSize"] = @(styling.purchaseTermsFontSize);
         stylingDict[@"purchaseTermsTextColor"] = [NamiBridgeUtil hexStringForColor: styling.purchaseTermsTextColor];
         stylingDict[@"purchaseTermsShadowColor"] = [NamiBridgeUtil hexStringForColor: styling.purchaseTermsShadowColor];
         stylingDict[@"purchaseTermsShadowRadius"] = @(styling.purchaseTermsShadowRadius);
-        
+
 
         stylingDict[@"termsLinkColor"] = styling.termsLinkColor;
     }
-    
+
     return stylingDict;
 }
 

package/ios/NamiCustomerManager.m

@@ -23,7 +23,7 @@
 RCT_EXPORT_METHOD(currentCustomerJourneyState:(RCTResponseSenderBlock)completion)
 {
     NSDictionary *journeyDict = [NamiBridgeUtil customerJourneyStateDict];
-    
+
     completion(@[journeyDict]);
 }
 

package/ios/NamiEmitter.m

@@ -32,37 +32,37 @@ static NamiEmitter *namiEmitter;
     self = [super init];
     if (self) {
         hasNamiEmitterListeners = NO;
-        
+
         // Tell Nami to listen for purchases and we'll forward them on to listeners
         [NamiPurchaseManager registerPurchasesChangedHandler:^(NSArray<NamiPurchase *> * _Nonnull purchases, enum NamiPurchaseState purchaseState, NSError * _Nullable error) {
             [self sendEventPurchaseMadeWithPurchases:purchases withState:purchaseState error:error];
         }];
-        
+
         [NamiEntitlementManager registerEntitlementsChangedHandler:^(NSArray<NamiEntitlement *> * _Nonnull entitlements) {
             [self sendEventEntitlementsChangedWithEntitlements:entitlements];
         }];
-              
-        
+
+
         [NamiPaywallManager registerSignInHandler:^(UIViewController * _Nullable fromVC, NSString * _Nonnull developerPaywallID, NamiPaywall * _Nonnull paywallMetadata) {
             [self sendSignInActivateFromVC:fromVC forPaywall:developerPaywallID paywallMetadata:paywallMetadata];
         }];
-        
+
         [NamiPaywallManager registerPaywallRaiseHandler:^(UIViewController * _Nullable fromVC, NSArray<NamiSKU *> * _Nullable products, NSString * _Nonnull developerPaywallID, NamiPaywall * _Nonnull paywallMetadata) {
             [self sendPaywallActivatedFromVC:fromVC forPaywall:developerPaywallID withProducts:products paywallMetadata:paywallMetadata];
         }];
-        
+
         [NamiPaywallManager registerBlockingPaywallClosedHandler:^{
             [self sendBlockingPaywallClosed];
         }];
-                
+
         [NamiPurchaseManager registerRestorePurchasesHandlerWithRestorePurchasesStateHandler:^(enum NamiRestorePurchasesState state, NSArray<NamiPurchase *> * _Nonnull newPurchases, NSArray<NamiPurchase *> * _Nonnull oldPurchases, NSError * _Nullable error) {
             [self sendRestorePurchasesStateChanged:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
         }];
-        
+
         [NamiCustomerManager registerJourneyStateChangedHandler:^(CustomerJourneyState * _Nonnull journeyState) {
             [self sendEventCustomerJourneyStateChanged:journeyState];
         }];
-        
+
     }
     namiEmitter = self;
     return self;
@@ -88,7 +88,7 @@ static NamiEmitter *namiEmitter;
     for (NamiPurchase *purchase in purchases) {
         [productIDs addObject:purchase.skuID];
     }
-    
+
     return productIDs;
 }
 
@@ -118,7 +118,7 @@ bool hasNamiEmitterListeners;
 
 -(NSString *)purchaseStateToString:(NamiPurchaseState)purchaseState {
     switch (purchaseState) {
-  
+
         case NamiPurchaseStatePending:
             return @"PENDING";
             break;
@@ -133,7 +133,7 @@ bool hasNamiEmitterListeners;
             break;
         case NamiPurchaseStateUnsubscribed:
             return @"UNSUBSCRIBED";
-            break;       
+            break;
         case NamiPurchaseStateDeferred:
             return @"DEFERRED";
             break;
@@ -142,7 +142,7 @@ bool hasNamiEmitterListeners;
             break;
         case NamiPurchaseStateCancelled:
             return @"CANCELLED";
-            break;       
+            break;
         case NamiPurchaseStateUnknown:
             return @"UNKNOWN";
             break;
@@ -154,7 +154,7 @@ bool hasNamiEmitterListeners;
 
 - (void)sendEventEntitlementsChangedWithEntitlements:(NSArray<NamiEntitlement *>*)entitlements {
     if (hasNamiEmitterListeners) {
-        
+
         NSMutableArray *convertedEntitlementDicts = [NSMutableArray new];
         for ( NamiEntitlement *entitlementRecord in entitlements ) {
             if ( entitlementRecord.referenceID != nil ) {
@@ -162,25 +162,25 @@ bool hasNamiEmitterListeners;
                 [convertedEntitlementDicts addObject:entitlementDict];
             }
         }
-        
+
         NSMutableDictionary *sendDict = [NSMutableDictionary dictionary];
         sendDict[@"activeEntitlements"] =  convertedEntitlementDicts;
-        
+
         [self sendEventWithName:@"EntitlementsChanged" body:sendDict];
     }
 }
 
 - (void)sendEventPreparePaywallForDisplayFinishedWithResult:(BOOL)success developerPaywallID: (NSString * _Nullable) developerPaywallID error:(NSError * _Nullable) error {
     if (hasNamiEmitterListeners) {
-        
+
         NSMutableDictionary *sendDict = [NSMutableDictionary dictionaryWithDictionary: @{ @"success": @(success) }];
-        
+
         if (developerPaywallID != nil) {
             [sendDict addEntriesFromDictionary:@{
                 @"developerPaywallID": developerPaywallID
             }];
         }
-        
+
         if (error != nil) {
             [sendDict addEntriesFromDictionary:@{
                 @"errorCode": @(error.code),
@@ -188,7 +188,7 @@ bool hasNamiEmitterListeners;
                 }
             ];
         }
-        
+
         NSLog(@"NamiBridge: Info: attempting to send result of preparePaywallForDisplay with result dictionary: %@", sendDict);
         [self sendEventWithName:@"PreparePaywallFinished" body:sendDict];
     }
@@ -203,10 +203,10 @@ bool hasNamiEmitterListeners;
 
 - (void)sendEventPurchaseMadeWithPurchases:(NSArray<NamiPurchase *>*)purchases withState:(NamiPurchaseState)purchaseState error:(NSError *)error {
     if (hasNamiEmitterListeners) {
-        
-        
+
+
         NSString *convertedState = [self purchaseStateToString:purchaseState];
-        
+
         NSMutableArray *convertedPurchaseDicts = [NSMutableArray new];
         for ( NamiPurchase *purchaseRecord in purchases ) {
             if ( purchaseRecord.skuID != nil ) {
@@ -214,16 +214,16 @@ bool hasNamiEmitterListeners;
                 [convertedPurchaseDicts addObject:purchaseDict];
             }
         }
-        
+
         NSString *localizedErrorDescription = [error localizedDescription];
-        
+
         NSMutableDictionary *sendDict = [NSMutableDictionary dictionary];
         sendDict[@"purchases"] =  convertedPurchaseDicts;
         sendDict[@"purchaseState"] = convertedState;
         if (localizedErrorDescription != nil) {
            sendDict[@"error"] = localizedErrorDescription;
         }
-        
+
         [self sendEventWithName:@"PurchasesChanged" body:sendDict];
     }
 }
@@ -247,7 +247,7 @@ bool hasNamiEmitterListeners;
     for (NamiSKU *sku in products) {
       [skuDicts addObject:[NamiBridgeUtil skuToSKUDict:sku]];
     }
-        
+
         NSMutableDictionary *paywallMeta = [NSMutableDictionary dictionaryWithDictionary:paywallMetadata.namiPaywallInfoDict];
         // This part is really meant to be internally facing, scrub from dictionary
 
@@ -258,7 +258,7 @@ bool hasNamiEmitterListeners;
         marketingContentDictionary[@"title"] = [paywallMetadata title];
         paywallMeta[@"marketing_content"] = marketingContentDictionary;
         paywallMeta[@"purchase_terms"] = [paywallMetadata purchaseTerms];
-        
+
         // Strip out presention_position from all listed sku items
         NSArray *cleanedOrderdMetadata = [NamiBridgeUtil stripPresentationPositionFromOrderedMetadataForPaywallMetaDict:paywallMeta];
         [paywallMeta setObject:cleanedOrderdMetadata  forKey:@"formatted_skus"];
@@ -268,8 +268,8 @@ bool hasNamiEmitterListeners;
 
         NSDictionary *paywallStylingDict = [NamiBridgeUtil paywallStylingToPaywallStylingDict:[paywallMetadata styleData]];
         paywallMeta[@"styleData"] = paywallStylingDict;
-        
-        // remove keys that are inconsistent with android 
+
+        // remove keys that are inconsistent with android
         [paywallMeta removeObjectForKey:@"body"];
         [paywallMeta removeObjectForKey:@"title"];
         [paywallMeta removeObjectForKey:@"style"];
@@ -291,10 +291,10 @@ bool hasNamiEmitterListeners;
     } else {
         initialDict = @{@"state": [NSNumber numberWithBool:state], @"stateDesc": [self restorePurchaseStateDescriptionFromCode:state]};
     }
-    
+
     NSMutableDictionary *retDict = [NSMutableDictionary dictionary];
     [retDict addEntriesFromDictionary:initialDict];
-      
+
     NSMutableArray *newPurchaseDicts = [NSMutableArray array];
     for ( NamiPurchase *purchaseRecord in newPurchases ) {
         if ( purchaseRecord.skuID == nil ) {
@@ -310,10 +310,10 @@ bool hasNamiEmitterListeners;
         NSDictionary *purchaseDict = [NamiBridgeUtil purchaseToPurchaseDict:purchaseRecord];
         [oldPurchaseDicts addObject:purchaseDict];
     }
-    
+
     retDict[@"newPurchases"] = newPurchaseDicts;
     retDict[@"oldPurchases"] = oldPurchaseDicts;
-    
+
     NSLog(@"NamiBridge: Info: RestorePurchases state change: %@", retDict);
 
     return retDict;
@@ -345,14 +345,14 @@ bool hasNamiEmitterListeners;
     // Let system know a blocking paywall has been closed, in case they want to react specifically.
     if (hasNamiEmitterListeners) {
         NSMutableDictionary *paywallMeta = [NSMutableDictionary dictionary];
-        
+
         // Strip out presention_position from all listed sku items
         NSArray *cleanedOrderdMetadata = [NamiBridgeUtil stripPresentationPositionFromOrderedMetadataForPaywallMetaDict:paywallMeta];
         [paywallMeta setObject:cleanedOrderdMetadata  forKey:@"formatted_skus"];
-        
+
         [paywallMeta removeObjectForKey:@"sku_ordered_metadata"];
         [paywallMeta removeObjectForKey:@"skus"];
-        
+
         [self sendEventWithName:@"BlockingPaywallClosed" body:@{ @"blockingPaywallClosed": @true }];
     }
 }

package/ios/NamiEntitlementManagerBridge.m

@@ -34,16 +34,16 @@ RCT_EXPORT_METHOD(isEntitlementActive:(nonnull NSString*)entitlementRefID comple
 RCT_EXPORT_METHOD(getEntitlements:(RCTResponseSenderBlock)completion)
 {
     NSArray<NamiEntitlement *> *entitlements = [NamiEntitlementManager getEntitlements];
-    
+
     NSMutableArray *entitlementDicts = [NSMutableArray new];
-       
+
        for (NamiEntitlement *entitlement in entitlements) {
            NSDictionary *entitlementDict = [NamiBridgeUtil entitlementToEntitlementDict:entitlement];
            if ([entitlementDict count] > 0) {
                [entitlementDicts addObject:entitlementDict];
            }
        }
-       
+
        completion(@[entitlementDicts]);
 }
 
@@ -51,16 +51,16 @@ RCT_EXPORT_METHOD(getEntitlements:(RCTResponseSenderBlock)completion)
 RCT_EXPORT_METHOD(activeEntitlements:(RCTResponseSenderBlock)completion)
 {
     NSArray<NamiEntitlement *> *entitlements = [NamiEntitlementManager activeEntitlements];
-    
+
     NSMutableArray *entitlementDicts = [NSMutableArray new];
-    
+
     for (NamiEntitlement *entitlement in entitlements) {
         NSDictionary *entitlementDict = [NamiBridgeUtil entitlementToEntitlementDict:entitlement];
         if ([entitlementDict count] > 0) {
             [entitlementDicts addObject:entitlementDict];
         }
     }
-    
+
     completion(@[entitlementDicts]);
 }
 
@@ -77,9 +77,9 @@ RCT_EXPORT_METHOD(setEntitlements:(NSArray *)entitlementSetterDicts)
             NSString *expiresStr = entitlementSetterDict[@"expires"];
             // TODO: figure out reverse parsing of date string passed in
             NSDate* expires = NULL;
-            
+
             NSString *platormStr = entitlementSetterDict[@"platform"];
-            
+
             NamiPlatformType platform = NamiPlatformTypeOther;
             if ([platormStr isEqualToString:@"android"]) {
                 platform = NamiPlatformTypeAndroid;
@@ -90,16 +90,16 @@ RCT_EXPORT_METHOD(setEntitlements:(NSArray *)entitlementSetterDicts)
             } else if ([platormStr isEqualToString:@"web"]) {
                 platform = NamiPlatformTypeWeb;
             }
-            
+
             NamiEntitlementSetter *setter = [NamiEntitlementSetter alloc];
             setter = [setter initWithId:referenceID platform:platform purchasedSKUid:purchasedSKUid expires:expires];
-            
+
             [entitlementSetters addObject:setter];
         } else {
             NSLog(@"Warning, entitlement to set had empty referenceID, whole entitlement is \n %@", entitlementSetterDict);
         }
     }
-    
+
     [NamiEntitlementManager setEntitlements:entitlementSetters];
 }
 

package/ios/NamiPaywallManagerBridge.m

@@ -83,18 +83,18 @@ RCT_EXPORT_METHOD(fetchCustomPaywallMetaForDeveloperID:(NSString *)developerPayw
         }
 
         NSMutableDictionary *paywallMeta = [NSMutableDictionary dictionaryWithDictionary:paywallMetadata.namiPaywallInfoDict];
-        // This part is really meant to be internally facing, scrub from dictionary        
+        // This part is really meant to be internally facing, scrub from dictionary
         // Strip out presention_position from all listed sku items
-        NSArray *cleanedOrderdMetadata = [NamiBridgeUtil stripPresentationPositionFromOrderedMetadataForPaywallMetaDict:paywallMeta];        
+        NSArray *cleanedOrderdMetadata = [NamiBridgeUtil stripPresentationPositionFromOrderedMetadataForPaywallMetaDict:paywallMeta];
         [paywallMeta setObject:cleanedOrderdMetadata  forKey:@"formatted_skus"];
-        
+
         [paywallMeta removeObjectForKey:@"sku_ordered_metadata"];
         [paywallMeta removeObjectForKey:@"skus"];
 
         NSDictionary *paywallStylingDict = [NamiBridgeUtil paywallStylingToPaywallStylingDict:[paywallMetadata styleData]];
         paywallMeta[@"styleData"] = paywallStylingDict;
-        
-        
+
+
         NSArray *wrapperArray = @[@{ @"namiSkus": productDicts,
                                      @"developerPaywallID": developerPaywallID,
                                      @"paywallMetadata": paywallMeta }];

package/ios/NamiPurchaseManagerBridge.m

@@ -47,9 +47,9 @@ RCT_EXPORT_METHOD(purchases:(RCTResponseSenderBlock)completion)
             anyProductNil = YES;
         }
         NSDictionary *purchaseDict = [NamiBridgeUtil purchaseToPurchaseDict:purchaseRecord];
-        [convertedPurchaseDicts addObject:purchaseDict];       
+        [convertedPurchaseDicts addObject:purchaseDict];
     }
-    
+
     completion(@[convertedPurchaseDicts]);
 }
 
@@ -62,7 +62,7 @@ RCT_EXPORT_METHOD(isSKUIDPurchased:(nonnull NSString*)skuID completion:(RCTRespo
 RCT_EXPORT_METHOD(restorePurchasesWithCompletionHandler:(RCTResponseSenderBlock)completion)
 {
     NSLog(@"NamiBridge: Info: Calling RestorePurchasesWithCompletionHandler");
-    
+
     [NamiPurchaseManager restorePurchasesWithStatehandler:^(enum NamiRestorePurchasesState state, NSArray<NamiPurchase *> * _Nonnull newPurchases, NSArray<NamiPurchase *> * _Nonnull oldPurchases, NSError * _Nullable error) {
         NSDictionary *retDict = [[NamiEmitter reactInstance] buildRestorePurchasesStateChangedDict:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
         completion(@[retDict]);
@@ -72,7 +72,7 @@ RCT_EXPORT_METHOD(restorePurchasesWithCompletionHandler:(RCTResponseSenderBlock)
 RCT_EXPORT_METHOD(restorePurchases)
 {
     NSLog(@"NamiBridge: Info: Calling RestorePurchases");
-    
+
     [NamiPurchaseManager restorePurchasesWithStatehandler:^(enum NamiRestorePurchasesState state, NSArray<NamiPurchase *> * _Nonnull newPurchases, NSArray<NamiPurchase *> * _Nonnull oldPurchases, NSError * _Nullable error) {
         [[NamiEmitter reactInstance] sendRestorePurchasesStateChanged:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
     }];
@@ -127,7 +127,7 @@ RCT_EXPORT_METHOD(canPresentCodeRedemptionSheet:(RCTResponseSenderBlock)completi
                 NSLog(@"NamiBridge: Info: Purchase result is %@, purchased is %d, purchaseState is %@, error is %@", purchase, (purchaseState == NamiPurchaseStatePurchased), [NSNumber numberWithInt:(int)purchaseState], [error localizedDescription]);
                 if (purchaseState == NamiPurchaseStatePurchased) {
                     completion(@[[NSNumber numberWithBool:true]]);
-                } 
+                }
             }];
         } else {
             completion(@[[NSNumber numberWithBool:false]]);

package/ios/RNNami.h

@@ -8,4 +8,4 @@
 @interface RNNami : NSObject <RCTBridgeModule>
 
 @end
-  
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.js",
   "scripts": {