react-native-nami-sdk 1.0.1 → 2.0.0

package/README.md

@@ -1,4 +1,4 @@
-![Nami SDK logo](https://nami-brand.s3.amazonaws.com/images/Nami.SDK.2.0.120x137.png)
+![Nami SDK logo](https://cdn.namiml.com/brand/sdk/Nami-SDK@0.5x.png)
 
 # React Native Bridge for the Nami SDK
 

package/android/build.gradle

@@ -10,48 +10,52 @@ import groovy.json.JsonSlurper
 // * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-def DEFAULT_COMPILE_SDK_VERSION = 30
-def DEFAULT_BUILD_TOOLS_VERSION = '29.0.3'
-def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 30
+def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2'
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
 buildscript {
-    ext.kotlin_version = '1.4.30'
+    ext.kotlin_version = '1.4.31'
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
     // module dependency in an application project.
     // ref: https://docs.gradle.org/current/userguide/tutorial_using_tasks.html#sec:build_script_external_dependencies
     if (project == rootProject) {
         repositories {
+            mavenCentral()
             google()
-            jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.1.2'
+            classpath 'com.android.tools.build:gradle:4.2.1'
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         }
     }
 }
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
+    compileSdkVersion 31
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
-        targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
+        minSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     lintOptions {
         abortOnError false
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 repositories {
+    mavenCentral()
     // ref: https://www.baeldung.com/maven-local-repository
     maven { url("https://nami-android.s3.amazonaws.com/") }
     maven {
@@ -63,14 +67,14 @@ repositories {
         url("$rootDir/../node_modules/jsc-android/dist")
     }
     google()
-    jcenter()
 }
+
 dependencies {
     //noinspection GradleDynamicVersion
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    implementation "com.namiml:sdk-android:1.0.1"
+    implementation "com.namiml:sdk-android:2.0.0"
 
     implementation 'com.facebook.react:react-native:+'  // From node_modules
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Nov 15 19:24:03 EST 2020
+#Wed May 26 17:12:26 EDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.nami.reactlibrary">
+<manifest package="com.nami.reactlibrary">
 
 </manifest>

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

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.WritableNativeArray
 import com.namiml.Nami
 import com.namiml.NamiConfiguration
 import com.namiml.NamiExternalIdentifierType
+import com.namiml.NamiLanguageCode
 import com.namiml.NamiLogLevel
 
 class NamiBridgeModule(reactContext: ReactApplicationContext) :
@@ -26,6 +27,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
         private const val CONFIG_MAP_DEVELOPMENT_MODE_KEY = "developmentMode"
         private const val CONFIG_MAP_BYPASS_STORE_KEY = "bypassStore"
         private const val CONFIG_MAP_NAMI_COMMANDS_KEY = "namiCommands"
+        private const val CONFIG_MAP_LANGUAGE_CODE_KEY = "namiLanguageCode"
         private const val PLATFORM_ID_ERROR_VALUE = "APPPLATFORMID_NOT_FOUND"
     }
 
@@ -33,12 +35,6 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
         return "NamiBridge"
     }
 
-//    @ReactMethod
-//    public void sampleMethod(String stringArgument, int numberArgument, Callback callback) {
-//        // TODO: Implement some actually useful functionality
-//        callback.invoke("Received numberArgument: " + numberArgument + " stringArgument: " + stringArgument);
-//    }
-
     @ReactMethod
     fun configure(configDict: ReadableMap) {
 
@@ -106,13 +102,32 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             builder.bypassStore = true
         }
 
+        val languageCode = if (configDict.hasKey(CONFIG_MAP_LANGUAGE_CODE_KEY)) {
+            configDict.getString(CONFIG_MAP_LANGUAGE_CODE_KEY)
+        } else {
+            null
+        }
+        languageCode?.let { code ->
+            NamiLanguageCode.values().find { it.code == code }.let { namiLanguageCode ->
+                if (namiLanguageCode == null) {
+                    Log.w(
+                        LOG_TAG,
+                        "Nami language code from config dictionary \"$code\" not " +
+                            "found in list of available Nami Language Codes:\n"
+                    )
+                } else {
+                    builder.namiLanguageCode = namiLanguageCode
+                }
+            }
+        }
+
         val namiCommandsReact: ReadableArray? =
             if (configDict.hasKey(CONFIG_MAP_NAMI_COMMANDS_KEY)) {
                 configDict.getArray(CONFIG_MAP_NAMI_COMMANDS_KEY)
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:0.3.1")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:1.2.1")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

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

@@ -1,10 +1,12 @@
 package com.nami.reactlibrary
 
+import android.util.Log
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.namiml.customer.CustomerJourneyState
 import com.namiml.customer.NamiCustomerManager
 
 class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
@@ -14,24 +16,27 @@ class NamiCustomerManagerBridgeModule(reactContext: ReactApplicationContext) :
         return "NamiCustomerManagerBridge"
     }
 
+    init {
+        NamiCustomerManager.registerCustomerJourneyChangedListener { customerJourneyState ->
+            emitCustomerJourneyChanged(customerJourneyState)
+        }
+    }
+
+    private fun emitCustomerJourneyChanged(customerJourneyState: CustomerJourneyState) {
+        Log.i(LOG_TAG, "Emitting CustomerJourneyState changed")
+        try {
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("CustomerJourneyStateChanged", customerJourneyState.toDict())
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Caught Exception: " + e.message)
+        }
+    }
+
     @ReactMethod
     fun currentCustomerJourneyState(resultsCallback: Callback) {
         reactApplicationContext.runOnUiQueueThread {
-            val journeyState = NamiCustomerManager.currentCustomerJourneyState()
-
-            val formerSubscriber = journeyState?.formerSubscriber ?: false
-            val inGracePeriod = journeyState?.inGracePeriod ?: false
-            val inTrialPeriod = journeyState?.inTrialPeriod ?: false
-            val inIntroOfferPeriod = journeyState?.inIntroOfferPeriod ?: false
-
-            val journeyDict = WritableNativeMap().apply {
-                putBoolean("formerSubscriber", formerSubscriber)
-                putBoolean("inGracePeriod", inGracePeriod)
-                putBoolean("inTrialPeriod", inTrialPeriod)
-                putBoolean("inIntroOfferPeriod", inIntroOfferPeriod)
-            }
-
-            resultsCallback.invoke(journeyDict)
+            resultsCallback.invoke(NamiCustomerManager.currentCustomerJourneyState().toDict())
         }
     }
 }

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

@@ -11,7 +11,8 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.billing.NamiPurchase
 import com.namiml.billing.NamiPurchaseManager
 import com.namiml.billing.NamiPurchaseState
-import com.namiml.entitlement.NamiEntitlement
+import com.namiml.customer.CustomerJourneyState
+import com.namiml.customer.NamiCustomerManager
 import com.namiml.paywall.NamiPaywall
 import com.namiml.paywall.NamiPaywallManager
 import com.namiml.paywall.NamiSKU
@@ -32,15 +33,15 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
     }
 
     override fun initialize() {
-        NamiPaywallManager.registerSignInListener { context, paywallData, developerPaywallID ->
+        NamiPaywallManager.registerSignInListener { _, _, developerPaywallID ->
             Log.i(LOG_TAG, "Sign in clicked with developerPaywallID $developerPaywallID")
 
-            emitSignInActivated(paywallData, developerPaywallID)
+            emitSignInActivated(developerPaywallID)
         }
 
         Log.i(LOG_TAG, "In Emitter Initialize()")
 
-        NamiPaywallManager.registerPaywallRaiseListener { context, paywallData, products, developerPaywallId ->
+        NamiPaywallManager.registerPaywallRaiseListener { _, paywallData, products, developerPaywallId ->
             Log.i(
                 LOG_TAG,
                 "Products from registerPaywallRaiseListener callback are $products"
@@ -53,28 +54,24 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
         NamiPurchaseManager.registerPurchasesChangedListener { list, namiPurchaseState, s ->
             emitPurchaseMade(list, namiPurchaseState, s)
         }
-    }
-
-    fun emitEntitlementsChanged(entitlements: List<NamiEntitlement>) {
-        val map = Arguments.createMap()
 
-        val resultArray: WritableArray = WritableNativeArray()
-        for (entitlement in entitlements) {
-            resultArray.pushMap(entitlement.toEntitlementDict())
+        NamiCustomerManager.registerCustomerJourneyChangedListener {
+            emitCustomerJourneyChanged(it)
         }
-        map.putArray("entitlements", resultArray)
+    }
 
-        Log.i(LOG_TAG, "Emitting entitlements changed")
+    private fun emitCustomerJourneyChanged(customerJourneyState: CustomerJourneyState) {
+        Log.i(LOG_TAG, "Emitting CustomerJourneyChanged $customerJourneyState")
         try {
             reactApplicationContext
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("EntitlementsChanged", map)
+                .emit("CustomerJourneyStateChanged", customerJourneyState.toDict())
         } catch (e: Exception) {
             Log.e(LOG_TAG, "Caught Exception: " + e.message)
         }
     }
 
-    fun emitPurchaseMade(
+    private fun emitPurchaseMade(
         purchases: List<NamiPurchase>,
         purchaseState: NamiPurchaseState,
         errorString: String?
@@ -117,7 +114,7 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
         }
     }
 
-    fun emitPaywallRaise(
+    private fun emitPaywallRaise(
         namiPaywall: NamiPaywall,
         productDicts: List<NamiSKU>,
         paywallDeveloperID: String?
@@ -139,7 +136,7 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
             skusArray.pushMap(sku.toSkuDict())
         }
 
-        map.putArray("skus", skusArray)
+        map.putArray("namiSkus", skusArray)
 
         try {
             reactApplicationContext
@@ -150,7 +147,7 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
         }
     }
 
-    fun emitSignInActivated(paywallData: NamiPaywall, paywallDeveloperID: String?) {
+    private fun emitSignInActivated(paywallDeveloperID: String?) {
 
         val map = Arguments.createMap().apply {
             putString("developerPaywallID", paywallDeveloperID)
@@ -163,19 +160,4 @@ class NamiEmitter(reactContext: ReactApplicationContext) :
             Log.e(LOG_TAG, "Caught Exception: " + e.message)
         }
     }
-
-    fun emitPurchaseMade(paywallDeveloperID: String) {
-
-        val map = Arguments.createMap().apply {
-            putString("key1", "Value1")
-            putString("key1", "Value1")
-        }
-        try {
-            reactApplicationContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                .emit("customEventName", map)
-        } catch (e: Exception) {
-            Log.e(LOG_TAG, "Caught Exception: " + e.message)
-        }
-    }
 }

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

@@ -12,6 +12,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.namiml.paywall.NamiPaywallManager
+import com.namiml.paywall.PreparePaywallResult
 
 class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext), ActivityEventListener {
@@ -46,7 +47,7 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
     }
 
-    fun emitBockedPaywallClosed() {
+    private fun emitBockedPaywallClosed() {
         val map = Arguments.createMap().apply {
             putBoolean("blockingPaywallClosed", true)
         }
@@ -99,9 +100,6 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun canRaisePaywall(successCallback: Callback) {
-//        BOOL canRaise = [[NamiPaywallManager shared] canRaisePaywall];
-//        completion(@[[NSNumber numberWithBool:canRaise]]);
-
         reactApplicationContext.runOnUiQueueThread {
             val canRaiseResult = NamiPaywallManager.canRaisePaywall()
             successCallback.invoke(canRaiseResult)
@@ -124,4 +122,80 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     fun paywallImpression(developerPaywallID: String) {
         // TODO: Android SDK paywall impression call.
     }
+
+    @ReactMethod
+    fun preparePaywallForDisplay(backgroundImageRequired: Boolean, imageFetchTimeout: Double) {
+        val imageFetchTimeoutConvertedToLong: Long = imageFetchTimeout.toLong()
+        reactApplicationContext.runOnUiQueueThread {
+
+            NamiPaywallManager.preparePaywallForDisplay(
+                backgroundImageRequired,
+                imageFetchTimeoutConvertedToLong
+            ) { result ->
+                when (result) {
+                    is PreparePaywallResult.Success -> {
+                        emitPreparePaywallFinished(true, null, null)
+                    }
+                    is PreparePaywallResult.Failure -> {
+                        emitPreparePaywallFinished(false, null, result.error)
+                    }
+                }
+            }
+        }
+    }
+
+    @ReactMethod
+    fun preparePaywallForDisplayByDeveloperPaywallId(
+        developerPaywallID: String,
+        backgroundImageRequired: Boolean,
+        imageFetchTimeout: Double
+    ) {
+        val imageFetchTimeoutConvertedToLong: Long = imageFetchTimeout.toLong()
+        reactApplicationContext.runOnUiQueueThread {
+            NamiPaywallManager.preparePaywallForDisplay(
+                developerPaywallID,
+                backgroundImageRequired,
+                imageFetchTimeoutConvertedToLong
+            ) { result ->
+                when (result) {
+                    is PreparePaywallResult.Success -> {
+                        emitPreparePaywallFinished(true, developerPaywallID, null)
+                    }
+                    is PreparePaywallResult.Failure -> {
+                        emitPreparePaywallFinished(false, developerPaywallID, result.error)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun emitPreparePaywallFinished(
+        success: Boolean,
+        developerPaywallID: String?,
+        error: com.namiml.paywall.PreparePaywallError?
+    ) {
+        val prepareContentMap = Arguments.createMap()
+        prepareContentMap.putBoolean("success", success)
+
+        if (developerPaywallID != null) {
+            prepareContentMap.putString("developerPaywallID", developerPaywallID)
+        }
+
+        if (error != null) {
+            prepareContentMap.putInt("errorCode", error.ordinal)
+            prepareContentMap.putString("errorMessage", error.toString())
+        }
+
+        Log.i(
+            LOG_TAG,
+            "Emitting preparePaywallForDisplay finished with result " + success + "error: " + error.toString()
+        )
+        try {
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("PreparePaywallFinished", prepareContentMap)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Caught Exception: " + e.message)
+        }
+    }
 }

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

@@ -70,6 +70,13 @@ class NamiPurchaseManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun consumePurchasedSKU(skuRefId: String) {
+        reactApplicationContext.runOnUiQueueThread {
+            NamiPurchaseManager.consumePurchasedSKU(skuRefId)
+        }
+    }
+
     @ReactMethod
     fun anySKUIDPurchased(skuIDs: ReadableArray, resultsCallback: Callback) {
         reactApplicationContext.runOnUiQueueThread {

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

@@ -6,12 +6,15 @@ import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
-import com.namiml.api.model.FormattedSku
 import com.namiml.billing.NamiPurchase
+import com.namiml.customer.CustomerJourneyState
 import com.namiml.entitlement.NamiEntitlement
+import com.namiml.paywall.LegalCitations
+import com.namiml.paywall.NamiLocaleConfig
 import com.namiml.paywall.NamiPaywall
 import com.namiml.paywall.NamiPurchaseSource
 import com.namiml.paywall.NamiSKU
+import com.namiml.paywall.PaywallDisplayOptions
 import com.namiml.paywall.PaywallStyleData
 import com.namiml.paywall.SubscriptionPeriod
 import com.namiml.util.extensions.getFormattedPrice
@@ -22,19 +25,9 @@ import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
 
-fun FormattedSku.toFormattedSkuDict(): WritableMap {
-    val map: WritableMap = Arguments.createMap()
-    map.putString("sku_ref_id", this.skuId)
-    map.putBoolean("featured", this.featured)
-    return map
-}
-
 fun NamiPaywall.toNamiPaywallDict(): WritableMap {
 
     val paywallMap: WritableMap = Arguments.createMap()
-    // These don't seem to exist, inconsistent between Android and iOS, leave in marketing content
-    //paywallMap.putString("title", title.orEmpty())
-    //paywallMap.putString("body", body.orEmpty())
 
     val marketingContentMap = Arguments.createMap()
     marketingContentMap.putString("title", title.orEmpty())
@@ -49,37 +42,55 @@ fun NamiPaywall.toNamiPaywallDict(): WritableMap {
 
     Log.i(LOG_TAG, "extraData items are $extraDataMap")
     paywallMap.putString("id", id)
-    paywallMap.putString("background_image_url_phone", backgroundImageUrlPhone.orEmpty())
-    paywallMap.putString("background_image_url_tablet", backgroundImageUrlTablet.orEmpty())
-    paywallMap.putString("privacy_policy", privacyPolicy.orEmpty())
+    paywallMap.putMap("backgrounds", Arguments.createMap().apply {
+        putString("phone", backgroundImageUrlPhone.orEmpty())
+        putString("tablet", backgroundImageUrlTablet.orEmpty())
+    })
     paywallMap.putString("purchase_terms", purchaseTerms.orEmpty())
-    paywallMap.putString("tos_link", tosLink.orEmpty())
     paywallMap.putString("name", name.orEmpty())
-    paywallMap.putString("cta_type", type)
+    paywallMap.putString("paywall_type", type)
+    paywallMap.putMap("locale_config", localeConfig.toDict())
+    paywallMap.putMap("legal_citations", legalCitations?.toDict())
+    paywallMap.putMap("display_options", displayOptions.toDict())
     paywallMap.putString("developer_paywall_id", developerPaywallId.orEmpty())
-
-    val allowClosing = allowClosing
-    paywallMap.putBoolean("allow_closing", allowClosing)
-
-    val restoreControl = restoreControl
-    paywallMap.putBoolean("restore_control", restoreControl)
-
-    val signInControl = signInControl
-    paywallMap.putBoolean("sign_in_control", signInControl)
-
-    val formattedSkusArray: WritableArray = Arguments.createArray()
-    for (formattedSku in formattedSkus) {
-        formattedSkusArray.pushMap(formattedSku.toFormattedSkuDict())
-    }
-    paywallMap.putArray("formatted_skus", formattedSkusArray)
-
     styleData?.let {
         paywallMap.putMap("styleData", it.toPaywallStylingDict())
     }
+    return paywallMap
+}
 
-    paywallMap.putBoolean("use_bottom_overlay", useBottomOverlay)
+private fun NamiLocaleConfig.toDict(): WritableMap {
+    return Arguments.createMap().apply {
+        putString("close_button_text", closeButtonText)
+        putString("sign_in_button_text", signInButtonText)
+        putString("restore_purchase_button_text", restorePurchaseButtonText)
+        putString("purchase_button_hint_text_to_speech", purchaseButtonHintTextToSpeech)
+        putString("purchase_terms_prefix_hint_text_to_speech", purchaseTermsPrefixHintTextToSpeech)
+    }
+}
 
-    return paywallMap
+private fun PaywallDisplayOptions.toDict(): WritableMap {
+    return Arguments.createMap().apply {
+        putBoolean("allow_closing", allowClosing)
+        putBoolean("restore_control", restoreControl)
+        putBoolean("sign_in_control", signInControl)
+        putString("scrollable_region_size", scrollableRegionSize)
+        putBoolean("show_nami_purchase_success_message", shouldShowNamiPurchaseSuccessMessage)
+        putBoolean("skus_in_scrollable_region", showSkusInScrollableRegion)
+        putBoolean("use_bottom_overlay", useBottomOverlay)
+    }
+}
+
+private fun LegalCitations.toDict(): WritableMap {
+    return Arguments.createMap().apply {
+        putString("id", id)
+        putString("privacy_url", privacyUrl)
+        putString("privacy_text", privacyText)
+        putString("tos_url", tosUrl)
+        putString("tos_text", tosText)
+        putString("clickwrap_text", clickWrapText)
+        putString("language", language)
+    }
 }
 
 fun PaywallStyleData.toPaywallStylingDict(): WritableMap {
@@ -107,6 +118,9 @@ fun PaywallStyleData.toPaywallStylingDict(): WritableMap {
 
     styleMap.putString("skuButtonColor", skuButtonColor)
     styleMap.putString("skuButtonTextColor", skuButtonTextColor)
+    styleMap.putString("skuSubDisplayTextColor", skuSubDisplayTextColor)
+    styleMap.putString("skuSubDisplayTextShadowColor", skuSubDisplayTextShadowColor)
+    styleMap.putDouble("skuSubDisplayTextShadowRadius", skuSubDisplayTextShadowRadius.toDouble())
 
     styleMap.putString("featuredSkusButtonColor", featuredSkuButtonColor)
     styleMap.putString("featuredSkusButtonTextColor", featuredSkuButtonTextColor)
@@ -196,6 +210,9 @@ fun NamiSKU.toSkuDict(): WritableMap {
     productDict.putString("localizedDescription", skuDetails.description)
     productDict.putString("localizedPrice", skuDetails.price)
     productDict.putString("localizedMultipliedPrice", skuDetails.price)
+    productDict.putBoolean("featured", featured)
+    productDict.putString("displayText", displayText)
+    productDict.putString("displaySubText", displaySubText)
     productDict.putString("price", skuDetails.getFormattedPrice().toString())
     productDict.putString("priceLanguage", Locale.getDefault().language)
     productDict.putString("priceCountry", Locale.getDefault().country)
@@ -208,9 +225,6 @@ fun NamiSKU.toSkuDict(): WritableMap {
         SubscriptionPeriod.HALF_YEAR -> {
             "half_year"
         }
-        SubscriptionPeriod.DAY -> {
-            "day"
-        }
         SubscriptionPeriod.WEEKLY -> {
             "week"
         }
@@ -220,6 +234,9 @@ fun NamiSKU.toSkuDict(): WritableMap {
         SubscriptionPeriod.ANNUAL -> {
             "year"
         }
+        SubscriptionPeriod.FOUR_WEEKS -> {
+            "four_weeks"
+        }
         else -> {
             null
         }
@@ -268,6 +285,26 @@ fun NamiPurchase.toPurchaseDict(): WritableMap {
     return purchaseMap
 }
 
+fun CustomerJourneyState?.toDict(): WritableMap {
+    val formerSubscriber = this?.formerSubscriber ?: false
+    val inGracePeriod = this?.inGracePeriod ?: false
+    val inTrialPeriod = this?.inTrialPeriod ?: false
+    val inIntroOfferPeriod = this?.inIntroOfferPeriod ?: false
+    val inPause = this?.inPause ?: false
+    val inAccountHold = this?.inAccountHold ?: false
+    val isCancelled = this?.isCancelled ?: false
+
+    return WritableNativeMap().apply {
+        putBoolean("formerSubscriber", formerSubscriber)
+        putBoolean("inGracePeriod", inGracePeriod)
+        putBoolean("inTrialPeriod", inTrialPeriod)
+        putBoolean("inIntroOfferPeriod", inIntroOfferPeriod)
+        putBoolean("inPause", inPause)
+        putBoolean("inAccountHold", inAccountHold)
+        putBoolean("isCancelled", isCancelled)
+    }
+}
+
 fun NamiEntitlement.toEntitlementDict(): WritableMap? {
     val resultMap: WritableMap = WritableNativeMap()
     resultMap.putString("referenceID", referenceId)
@@ -322,4 +359,3 @@ fun Date.toJavascriptDate(): String {
     }
     return df.format(this)
 }
-

package/ios/Nami.m

@@ -21,7 +21,9 @@
 @implementation NamiBridge (RCTExternModule)
 
 RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
-    
+    if ([configDict count] == 0 || [configDict[@"logLevel"] isEqual: @"DEBUG"] ) {
+        NSLog(@"Configure dictionary is %@", configDict);
+    }
     NSString *appID = configDict[@"appPlatformID-apple"];
     
     if ([appID length] > 0 ) {
@@ -39,6 +41,17 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict) {
             config.logLevel = NamiLogLevelDebug;
         }
         
+        NSString *languageString = configDict[@"namiLanguageCode"];
+        if ([logLevelString length] > 0) {
+            NSLog(@"Nami language code from config dictionary is %@", languageString);
+            if  ([[NamiLanguageCodes allAvailiableNamiLanguageCodes]
+                  containsObject:[languageString lowercaseString]] ) {
+              config.namiLanguageCode = languageString;
+            } else {
+                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 )
         {
@@ -70,7 +83,7 @@ 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:0.3.0"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:2.0.0"]];
         
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/ios/NamiBridgeUtil.h

@@ -25,6 +25,8 @@
 
 + (NSArray *)stripPresentationPositionFromOrderedMetadataForPaywallMetaDict: (NSDictionary *)paywallMeta;
 
++ (NSDictionary<NSString *,NSString *> *) customerJourneyStateDict;
+
 + (NSString *)hexStringForColor:(UIColor *)color;
 
 @end

package/ios/NamiBridgeUtil.m

@@ -28,6 +28,10 @@
         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];
 
         if (@available(iOS 12.0, *)) {
             if (productInt != nil && productInt.subscriptionGroupIdentifier != nil) {
@@ -201,6 +205,30 @@
     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),
+                                  @"inIntroOfferPeriod":@(inIntroOfferPeriod),
+                                  @"isCancelled":@(isCancelled),
+                                  @"inPause":@(inPause),
+                                  @"inAccountHold":@(inAccountHold)
+    };
+    return journeyDict;
+}
+
 + (NSDictionary<NSString *,NSString *> *) paywallStylingToPaywallStylingDict:(PaywallStyleData *)styling {
     NSMutableDictionary<NSString *,id> *stylingDict = [NSMutableDictionary new];
     if (styling != nil) {        

package/ios/NamiCustomerManager.m

@@ -22,18 +22,7 @@
 
 RCT_EXPORT_METHOD(currentCustomerJourneyState:(RCTResponseSenderBlock)completion)
 {
-    CustomerJourneyState *journeyState = [NamiCustomerManager currentCustomerJourneyState];
-    
-    BOOL formerSubscriber = [journeyState formerSubscriber];
-    BOOL inGracePeriod = [journeyState inGracePeriod];
-    BOOL inTrialPeriod = [journeyState inTrialPeriod];
-    BOOL inIntroOfferPeriod = [journeyState inIntroOfferPeriod];
-    
-    NSDictionary *journeyDict = @{@"formerSubscriber":@(formerSubscriber),
-                                  @"inGracePeriod":@(inGracePeriod),
-                                  @"inTrialPeriod":@(inTrialPeriod),
-                                  @"inIntroOfferPeriod":@(inIntroOfferPeriod)
-    };
+    NSDictionary *journeyDict = [NamiBridgeUtil customerJourneyStateDict];
     
     completion(@[journeyDict]);
 }

package/ios/NamiEmitter.m

@@ -23,6 +23,8 @@ RCT_EXTERN_METHOD(allPurchasedProducts)
 RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
 @end
 
+static NamiEmitter *namiEmitter;
+
 @implementation NamiEmitter : RCTEventEmitter
 
 - (instancetype)init
@@ -52,11 +54,29 @@ RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
         [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;
 }
 
+- (void)dealloc {
+    namiEmitter = nil;
+}
+
+
++ (NamiEmitter *) reactInstance {
+    return namiEmitter;
+}
+
 - (void) getPurchasedProducts : (RCTResponseSenderBlock) callback  {
     NSArray *allProducts = [self allPurchasedProducts];
     callback(allProducts);
@@ -77,7 +97,7 @@ RCT_EXTERN_METHOD(getPurchasedProducts: (RCTResponseSenderBlock)callback)
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"PurchasesChanged", @"SignInActivate", @"AppPaywallActivate", @"EntitlementsChanged", @"BlockingPaywallClosed" ];
+    return @[@"PurchasesChanged", @"SignInActivate", @"AppPaywallActivate", @"EntitlementsChanged", @"BlockingPaywallClosed", @"PreparePaywallFinished", @"RestorePurchasesStateChanged", @"CustomerJourneyStateChanged" ];
 }
 
 - (NSDictionary<NSString *, NSObject *> *)constantsToExport {
@@ -150,6 +170,37 @@ bool hasNamiEmitterListeners;
     }
 }
 
+- (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),
+                @"errorMessage": [error localizedDescription]
+                }
+            ];
+        }
+        
+        NSLog(@"NamiBridge: Info: attempting to send result of preparePaywallForDisplay with result dictionary: %@", sendDict);
+        [self sendEventWithName:@"PreparePaywallFinished" body:sendDict];
+    }
+}
+
+- (void)sendEventCustomerJourneyStateChanged:(CustomerJourneyState *)journeyState {
+    if (hasNamiEmitterListeners) {
+        NSDictionary *sendDict = [NamiBridgeUtil customerJourneyStateDict];
+        [self sendEventWithName:@"CustomerJourneyStateChanged" body:sendDict];
+    }
+}
+
 - (void)sendEventPurchaseMadeWithPurchases:(NSArray<NamiPurchase *>*)purchases withState:(NamiPurchaseState)purchaseState error:(NSError *)error {
     if (hasNamiEmitterListeners) {
         
@@ -200,6 +251,14 @@ bool hasNamiEmitterListeners;
         NSMutableDictionary *paywallMeta = [NSMutableDictionary dictionaryWithDictionary:paywallMetadata.namiPaywallInfoDict];
         // This part is really meant to be internally facing, scrub from dictionary
 
+        NSMutableDictionary *marketingContentDictionary = [NSMutableDictionary dictionaryWithDictionary:paywallMeta[@"marketing_content"]];
+
+        // Populated SmartText formatted values in dictioanry to send
+        marketingContentDictionary[@"body"] = [paywallMetadata body];
+        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"];
@@ -215,12 +274,73 @@ bool hasNamiEmitterListeners;
         [paywallMeta removeObjectForKey:@"title"];
         [paywallMeta removeObjectForKey:@"style"];
 
-        [self sendEventWithName:@"AppPaywallActivate" body:@{ @"skus": skuDicts,
+        [self sendEventWithName:@"AppPaywallActivate" body:@{ @"namiSkus": skuDicts,
                                                             @"developerPaywallID": developerPaywallID,
                                                             @"paywallMetadata": paywallMeta }];
   }
 }
 
+- (NSDictionary *)buildRestorePurchasesStateChangedDict: (enum NamiRestorePurchasesState) state
+                                           newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
+                                           oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
+                                                  error: (NSError * _Nullable) error {
+    NSString *errorDesc = [error localizedDescription];
+    NSDictionary *initialDict;
+    if ([errorDesc length] > 0) {
+        initialDict = @{@"state": [NSNumber numberWithBool:state], @"stateDesc": [self restorePurchaseStateDescriptionFromCode:state], @"error": [error localizedDescription]};
+    } 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 ) {
+        }
+        NSDictionary *purchaseDict = [NamiBridgeUtil purchaseToPurchaseDict:purchaseRecord];
+        [newPurchaseDicts addObject:purchaseDict];
+    }
+
+    NSMutableArray *oldPurchaseDicts = [NSMutableArray array];
+    for ( NamiPurchase *purchaseRecord in oldPurchases ) {
+        if ( purchaseRecord.skuID == nil ) {
+        }
+        NSDictionary *purchaseDict = [NamiBridgeUtil purchaseToPurchaseDict:purchaseRecord];
+        [oldPurchaseDicts addObject:purchaseDict];
+    }
+    
+    retDict[@"newPurchases"] = newPurchaseDicts;
+    retDict[@"oldPurchases"] = oldPurchaseDicts;
+    
+    NSLog(@"NamiBridge: Info: RestorePurchases state change: %@", retDict);
+
+    return retDict;
+}
+
+- (void)sendRestorePurchasesStateChanged: (enum NamiRestorePurchasesState) state
+                            newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
+                            oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
+                                   error: (NSError * _Nullable) error {
+    NSDictionary * retDict = [self buildRestorePurchasesStateChangedDict:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
+    [self sendEventWithName:@"RestorePurchasesStateChanged" body:retDict];
+}
+
+- (NSString *) restorePurchaseStateDescriptionFromCode:(NamiRestorePurchasesState)stateCode {
+    switch (stateCode) {
+        case NamiRestorePurchasesStateStarted:
+            return @"started";
+            break;
+        case NamiRestorePurchasesStateFinished:
+            return @"finished";
+            break;
+        case NamiRestorePurchasesStateError:
+            return @"error";
+            break;
+    }
+}
+
 - (void) sendBlockingPaywallClosed {
     // Let system know a blocking paywall has been closed, in case they want to react specifically.
     if (hasNamiEmitterListeners) {

package/ios/NamiPaywallManagerBridge.m

@@ -15,7 +15,10 @@
 
 #import "React/RCTViewManager.h"
 
-
+@interface NamiEmitter : RCTEventEmitter
+- (void)sendEventPreparePaywallForDisplayFinishedWithResult:(BOOL)success developerPaywallID: (NSString * _Nullable) developerPaywallID error:(NSError * _Nullable) error;
++ (NamiEmitter *) reactInstance;
+@end
 
 @interface NamiPaywallManagerBridge : NSObject <RCTBridgeModule>
 @property (atomic) BOOL blockPaywallRaise;
@@ -58,6 +61,7 @@ RCT_EXPORT_METHOD(canRaisePaywall:(RCTResponseSenderBlock)completion)
     completion(@[[NSNumber numberWithBool:canRaise]]);
 }
 
+
 RCT_EXPORT_METHOD(presentNamiPaywall:(NSArray *)skuIDs metapaywallDefinition:(NSDictionary *)paywallDict)
 {
     NSString *paywallDeveloperID = paywallDict[@"developerPaywallID"];
@@ -91,7 +95,7 @@ RCT_EXPORT_METHOD(fetchCustomPaywallMetaForDeveloperID:(NSString *)developerPayw
         paywallMeta[@"styleData"] = paywallStylingDict;
         
         
-        NSArray *wrapperArray = @[@{ @"products": productDicts,
+        NSArray *wrapperArray = @[@{ @"namiSkus": productDicts,
                                      @"developerPaywallID": developerPaywallID,
                                      @"paywallMetadata": paywallMeta }];
         completion(wrapperArray);
@@ -104,6 +108,38 @@ RCT_EXPORT_METHOD(paywallImpression:(NSString *)developerPaywallID)
     [NamiPaywallManager paywallImpressionWithDeveloperID:developerPaywallID];
 }
 
+RCT_EXPORT_METHOD( preparePaywallForDisplay:(BOOL)backgroundImageRequired
+    imageFetchTimeout:(double)imageFetchTimeout )
+{
+    [NamiPaywallManager preparePaywallForDisplayWithBackgroundImageRequired:backgroundImageRequired imageFetchTimeout:imageFetchTimeout prepareHandler:^(BOOL success, NSError * _Nullable error) {
+        [[NamiEmitter reactInstance] sendEventPreparePaywallForDisplayFinishedWithResult:success developerPaywallID:nil error:error];
+    }];
+}
+
+RCT_EXPORT_METHOD(preparePaywallForDisplayByDeveloperPaywallId:(NSString *)developerPaywallID
+    backgroundImageRequired: (BOOL)backgroundImageRequired
+    imageFetchTimeout:(double)imageFetchTimeout )
+{
+    [NamiPaywallManager preparePaywallForDisplayWithDeveloperPaywallID:developerPaywallID backgroundImageRequired:backgroundImageRequired imageFetchTimeout:imageFetchTimeout prepareHandler:^(BOOL success, NSError * _Nullable error) {
+        [[NamiEmitter reactInstance] sendEventPreparePaywallForDisplayFinishedWithResult:success developerPaywallID:developerPaywallID error:error];
+    }];
+}
+
+
+RCT_EXPORT_METHOD(processSmartTextForProducts:(NSString *)smartText  skuIDs:(NSArray<NSString *> *)skuIDs completion:(RCTResponseSenderBlock)completion)
+{
+    [NamiPurchaseManager skusForSKUIDsWithSkuIDs:skuIDs productHandler:^(BOOL success, NSArray<NamiSKU *> * _Nullable skus, NSArray<NSString *> * _Nullable invalidSkuIDs, NSError * _Nullable error) {
+        if (skus != NULL) {
+            // Found some of the skus they were looking for, process text
+            NSString *processedText = [NamiPaywallManager processSmartTextWithText:smartText dataStores:skus];
+            completion(@[processedText]);
+        } else {
+            // No products found so cannot process smart text, just send back.
+            completion(@[smartText]);
+        }
+    }];
+}
+
 
 @end
 

package/ios/NamiPurchaseManagerBridge.m

@@ -15,6 +15,17 @@
 
 #import "React/RCTViewManager.h"
 
+@interface NamiEmitter : RCTEventEmitter
+- (void)sendRestorePurchasesStateChanged: (enum NamiRestorePurchasesState) state
+                            newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
+                            oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
+                                   error: (NSError * _Nullable) error;
+- (NSDictionary *)buildRestorePurchasesStateChangedDict: (enum NamiRestorePurchasesState) state
+                                           newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
+                                           oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
+                                                  error: (NSError * _Nullable) error;
++ (NamiEmitter *) reactInstance;
+@end
 
 @interface NamiPurchaseManagerBridge : NSObject <RCTBridgeModule>
 @end
@@ -48,23 +59,26 @@ RCT_EXPORT_METHOD(isSKUIDPurchased:(nonnull NSString*)skuID completion:(RCTRespo
     completion(@[[NSNumber numberWithBool:active]]);
 }
 
-RCT_EXPORT_METHOD(restorePurchases:(RCTResponseSenderBlock)completion)
+RCT_EXPORT_METHOD(restorePurchasesWithCompletionHandler:(RCTResponseSenderBlock)completion)
 {
-    NSLog(@"NamiBridge: Info: Calling RestorePurchases");
-    [NamiPurchaseManager restorePurchasesWithHandler:^(BOOL success, NSError * _Nullable error) {
-        NSString *errorDesc = [error localizedDescription];
-        NSDictionary *retDict;
-        if ([errorDesc length] > 0) {
-           retDict = @{@"success": [NSNumber numberWithBool:success], @"error": [error localizedDescription]};
-        } else {
-            retDict = @{@"success": [NSNumber numberWithBool:success]};
-        }
-        
-        NSLog(@"NamiBridge: Info: RestorePurchases Returned %@", retDict);
+    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]);
     }];
 }
 
+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];
+    }];
+}
+
+/// Determines if any one of the passed in SKUID's have been purchased.
 RCT_EXPORT_METHOD(anySKUIDPurchased:(nonnull NSArray*)skuIDs completion:(RCTResponseSenderBlock)completion)
 {
     BOOL active = false;
@@ -78,6 +92,31 @@ RCT_EXPORT_METHOD(anySKUIDPurchased:(nonnull NSArray*)skuIDs completion:(RCTResp
     completion(@[[NSNumber numberWithBool:active]]);
 }
 
+/// For consumable purchases, removes the SKU from Nami so a product may be purchased again.
+RCT_EXPORT_METHOD(consumePurchasedSKU:(nonnull NSString*)skuID)
+{
+    [NamiPurchaseManager consumePurchasedSKUWithSkuID:skuID];
+}
+
+/// For consumable purchases, removes the SKU from Nami so a product may be purchased again.
+RCT_EXPORT_METHOD(presentCodeRedemptionSheet)
+{
+    if (@available(iOS 14.0, *)) {
+        [NamiPurchaseManager presentCodeRedemptionSheet];
+    } else {
+        NSLog(@"NamiBridge: Warning: presentCodeRedemptionSheet only present in iOS14 and higher");
+    }
+}
+
+RCT_EXPORT_METHOD(canPresentCodeRedemptionSheet:(RCTResponseSenderBlock)completion)
+{
+    if (@available(iOS 14.0, *)) {
+        completion(@[[NSNumber numberWithBool:true]]);
+    } else {
+        completion(@[[NSNumber numberWithBool:false]]);
+    }
+}
+
 /// This method does the purchase work, and can optionally be fed a paywall metadata object to pass along to the purchase flow.
 - (void) doSKUPurchaseWithSKUID:(nonnull NSString*)skuID namiPaywall:(NamiPaywall * _Nullable)namiPaywall completion:(RCTResponseSenderBlock)completion {
     [NamiPurchaseManager skusForSKUIDsWithSkuIDs:@[skuID] productHandler:^(BOOL success, NSArray<NamiSKU *> * _Nullable products, NSArray<NSString *> * _Nullable invalidProducts, NSError * _Nullable error) {

package/ios/Podfile

@@ -1,48 +1,32 @@
-platform :ios, '11.0'
+
+require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
+platform :ios, '11.2'
+
 source 'https://cdn.cocoapods.org/'
 
 target 'RNNami' do
-  # Pods for RNNami
-  pod 'Nami', '2.5.2'
-  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/'
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
-
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-
-  use_native_modules!
+  config = use_native_modules!
+  pod 'Nami', '2.9.3'
 
-end
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )
+
+  # Enables Flipper.
+  #
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
+  # you should disable the next line.
+  use_flipper!()
 
-post_install do |installer|
-  puts("Attempting to add Nami.xcframework reference to react-native-nami-sdk project.")
+  post_install do |installer|
+    react_native_post_install(installer)
+    #__apply_Xcode_12_5_M1_post_install_workaround(installer)
+
+      puts("Attempting to add Nami.xcframework reference to react-native-nami-sdk project.")
   installer.pods_project.targets.each do |target|
     if target.name  == "Pods-RNNami"
       puts("Found Pods-RNNami target.")
@@ -60,4 +44,28 @@ post_install do |installer|
       end
     end
   end
+       ## Fix for XCode 12+, hotpatch of react files should be a great idea
+      find_and_replace("../node_modules/react-native/React/CxxBridge/RCTCxxBridge.mm",
+      "_initializeModules:(NSArray<id<RCTBridgeModule>> *)modules", "_initializeModules:(NSArray<Class> *)modules")
+      find_and_replace("../node_modules/react-native/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm",
+      "RCTBridgeModuleNameForClass(module))", "RCTBridgeModuleNameForClass(Class(module)))")
+
+
+  end
+end
+
+
+
+
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+      text = File.read(name)
+      replace = text.gsub(findstr,replacestr)
+      if text != replace
+          puts "Fix: " + name
+          File.open(name, "w") { |file| file.puts replace }
+          STDOUT.flush
+      end
+  end
+  Dir[dir + '*/'].each(&method(:find_and_replace))
 end

package/ios/RNNami.xcodeproj/project.pbxproj

@@ -230,6 +230,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -245,7 +246,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -274,6 +275,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = " ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -282,7 +284,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "React Native Module for Nami - The Smartest Way to Sell Subscriptions.",
   "main": "index.js",
   "scripts": {
@@ -39,12 +39,13 @@
   ],
   "license": "SEE LICENSE FILE",
   "peerDependencies": {
-    "react": "^16.8.1",
-    "react-native": ">=0.60.0-rc.0 <1.0.x"
+    "react": "^17.0.2",
+    "react-native": "^0.65.2"
   },
   "devDependencies": {
-    "react": "^16.9.0",
-    "react-native": "^0.61.5"
+    "react": "^17.0.2",
+    "react-native": "^0.65.2",
+    "react-native-codegen": "^0.0.12"
   },
   "repository": {
     "type": "git",

package/react-native-nami-sdk.podspec

@@ -13,12 +13,12 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
   s.license      = package['license']
 
-  s.platform     = :ios, "11.0"
+  s.platform     = :ios, "11.2"
   s.source       = { :git => "https://github.com/namiml/react-native-nami-sdk.git", :tag => "#{s.version}" }
   s.source_files = "ios/**/*.{h,m}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '2.5.2'
+  s.dependency 'Nami', '2.9.3'
   s.dependency 'React'
 
 end