framepayments-react-native 1.0.1 → 2.0.0

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-4
+5
 0

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,14 +1,14 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:1-13:12
-INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:1-13:12
+ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:1-17:12
+INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:1-17:12
 	package
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:2:5-49
 		INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:11-69
 application
-ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:3:3-12:17
+ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:3:3-16:17
 activity#com.framepayments.reactnativeframe.FrameCheckoutActivity
 ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:4:5-7:34
 	android:exported
@@ -25,6 +25,14 @@ ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:10:7-63
 	android:name
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:9:7-74
+activity#com.framepayments.reactnativeframe.FrameOnboardingActivity
+ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:12:5-15:34
+	android:exported
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:15:7-31
+	android:theme
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:14:7-63
+	android:name
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:13:7-80
 uses-sdk
 INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -1,16 +1,6 @@
-buildscript {
-  repositories {
-    google()
-    mavenCentral()
-  }
-  dependencies {
-    classpath 'com.android.tools.build:gradle:8.1.0'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
-  }
-}
-
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -18,33 +8,36 @@ def safeExtGet(prop, fallback) {
 
 android {
   namespace "com.framepayments.reactnativeframe"
-  compileSdk safeExtGet('compileSdkVersion', 34)
+  compileSdk safeExtGet('compileSdkVersion', 36)
   defaultConfig {
     minSdk safeExtGet('minSdkVersion', 26)
-    targetSdk safeExtGet('targetSdkVersion', 34)
+    targetSdk safeExtGet('targetSdkVersion', 36)
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = '11'
+    jvmTarget = '17'
+  }
+  buildFeatures {
+    compose true
+  }
+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.14"
   }
-}
-
-repositories {
-  google()
-  mavenCentral()
-  maven { url "https://jitpack.io" }
 }
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.0"
-  implementation 'com.framepayments:framesdk:1.2.0'
-  implementation 'com.framepayments:framesdk_ui:1.2.0'
+  implementation 'com.framepayments:framesdk:2.0.0'
+  implementation 'com.framepayments:framesdk_ui:2.0.0'
+  implementation 'com.framepayments:framesdk_onboarding:2.0.0'
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
   // Frame SDK UI uses Compose; LocalLifecycleOwner requires lifecycle-runtime-compose 2.8+
   implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.2'
+  // Compose support for FrameOnboardingActivity
+  implementation 'androidx.activity:activity-compose:1.12.2'
 }

package/android/src/main/AndroidManifest.xml

@@ -9,5 +9,9 @@
       android:name="com.framepayments.reactnativeframe.FrameFlowActivity"
       android:theme="@style/Theme.AppCompat.Light.NoActionBar"
       android:exported="false" />
+    <activity
+      android:name="com.framepayments.reactnativeframe.FrameOnboardingActivity"
+      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+      android:exported="false" />
   </application>
 </manifest>

package/android/src/main/java/com/framepayments/reactnativeframe/FrameFlowActivity.kt

@@ -55,9 +55,9 @@ class FrameFlowActivity : AppCompatActivity() {
   private fun showCart(customerId: String?, items: List<FrameCartItem>, shippingCents: Int) {
     container.removeAllViews()
     cartView = FrameCartView(this).apply {
-      configure(customerId, items, shippingCents) { totalCents ->
+      configure(customerId, items, shippingCents, { totalCents ->
         showCheckout(customerId, totalCents)
-      }
+      }, null)
     }
     container.addView(cartView)
   }

package/android/src/main/java/com/framepayments/reactnativeframe/FrameOnboardingActivity.kt

@@ -0,0 +1,68 @@
+package com.framepayments.reactnativeframe
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import com.framepayments.frameonboarding.classes.Capabilities
+import com.framepayments.frameonboarding.classes.OnboardingConfig
+import com.framepayments.frameonboarding.classes.OnboardingResult
+import com.framepayments.frameonboarding.views.OnboardingContainerView
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+
+class FrameOnboardingActivity : ComponentActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    val accountId = intent.getStringExtra(EXTRA_ACCOUNT_ID)
+    val capabilitiesJson = intent.getStringExtra(EXTRA_CAPABILITIES_JSON) ?: "[]"
+    val capabilities = parseCapabilities(capabilitiesJson)
+
+    val config = OnboardingConfig(
+      accountId = accountId,
+      requiredCapabilities = capabilities
+    )
+
+    setContent {
+      OnboardingContainerView(config = config) { result ->
+        when (result) {
+          is OnboardingResult.Completed -> {
+            val data = Intent().apply {
+              putExtra(EXTRA_PAYMENT_METHOD_ID, result.paymentMethodId)
+            }
+            setResult(RESULT_OK, data)
+            finish()
+          }
+          is OnboardingResult.Cancelled -> {
+            setResult(RESULT_CANCELED)
+            finish()
+          }
+          is OnboardingResult.Error -> {
+            setResult(RESULT_CANCELED)
+            finish()
+          }
+        }
+      }
+    }
+  }
+
+  private fun parseCapabilities(json: String): List<Capabilities> {
+    return try {
+      val type = object : TypeToken<List<String>>() {}.type
+      val rawList: List<String> = Gson().fromJson(json, type)
+      rawList.mapNotNull { raw ->
+        Capabilities.entries.find { it.apiValue == raw }
+      }
+    } catch (e: Exception) {
+      emptyList()
+    }
+  }
+
+  companion object {
+    const val EXTRA_ACCOUNT_ID = "account_id"
+    const val EXTRA_CAPABILITIES_JSON = "capabilities_json"
+    const val EXTRA_PAYMENT_METHOD_ID = "payment_method_id"
+    const val REQUEST_CODE = 9003
+  }
+}

package/android/src/main/java/com/framepayments/reactnativeframe/FrameSDKModule.kt

@@ -22,6 +22,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
 
   private var checkoutPromise: Promise? = null
   private var cartPromise: Promise? = null
+  private var onboardingPromise: Promise? = null
 
   override fun getName(): String = "FrameSDK"
 
@@ -38,7 +39,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun presentCheckout(customerId: String?, amount: Double, promise: Promise) {
-    val activity = currentActivity ?: run {
+    val activity = reactApplicationContext.currentActivity ?: run {
       promise.reject("NO_ACTIVITY", "No current activity", null)
       return
     }
@@ -59,7 +60,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     shippingAmountInCents: Double,
     promise: Promise
   ) {
-    val activity = currentActivity ?: run {
+    val activity = reactApplicationContext.currentActivity ?: run {
       promise.reject("NO_ACTIVITY", "No current activity", null)
       return
     }
@@ -78,6 +79,27 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun presentOnboarding(
+    accountId: String?,
+    capabilities: com.facebook.react.bridge.ReadableArray,
+    promise: Promise
+  ) {
+    val activity = reactApplicationContext.currentActivity ?: run {
+      promise.reject("NO_ACTIVITY", "No current activity", null)
+      return
+    }
+    val capabilitiesJson = readableArrayToJsonArray(capabilities)
+    onboardingPromise = promise
+    activity.runOnUiThread {
+      val intent = Intent(activity, FrameOnboardingActivity::class.java).apply {
+        putExtra(FrameOnboardingActivity.EXTRA_ACCOUNT_ID, accountId)
+        putExtra(FrameOnboardingActivity.EXTRA_CAPABILITIES_JSON, capabilitiesJson)
+      }
+      activity.startActivityForResult(intent, FrameOnboardingActivity.REQUEST_CODE)
+    }
+  }
+
   private fun readableArrayToJson(items: com.facebook.react.bridge.ReadableArray): String? {
     val arr = org.json.JSONArray()
     for (i in 0 until items.size()) {
@@ -92,10 +114,19 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     return arr.toString()
   }
 
-  override fun onActivityResult(activity: Activity?, requestCode: Int, resultCode: Int, data: Intent?) {
+  private fun readableArrayToJsonArray(arr: com.facebook.react.bridge.ReadableArray): String {
+    val jsonArr = org.json.JSONArray()
+    for (i in 0 until arr.size()) {
+      arr.getString(i)?.let { jsonArr.put(it) }
+    }
+    return jsonArr.toString()
+  }
+
+  override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
     when (requestCode) {
       FrameCheckoutActivity.REQUEST_CODE -> handleCheckoutResult(resultCode, data)
       FrameFlowActivity.REQUEST_CODE -> handleCartResult(resultCode, data)
+      FrameOnboardingActivity.REQUEST_CODE -> handleOnboardingResult(resultCode, data)
       else -> return
     }
   }
@@ -142,6 +173,23 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  private fun handleOnboardingResult(resultCode: Int, data: Intent?) {
+    val promise = onboardingPromise ?: return
+    onboardingPromise = null
+    val map = WritableNativeMap()
+    if (resultCode == Activity.RESULT_OK) {
+      map.putString("status", "completed")
+      val paymentMethodId = data?.getStringExtra(FrameOnboardingActivity.EXTRA_PAYMENT_METHOD_ID)
+      if (paymentMethodId != null) {
+        map.putString("paymentMethodId", paymentMethodId)
+      }
+      promise.resolve(map)
+    } else {
+      map.putString("status", "cancelled")
+      promise.resolve(map)
+    }
+  }
+
   private fun jsonObjectToWritableMap(obj: JSONObject): WritableNativeMap {
     val map = WritableNativeMap()
     for (key in obj.keys()) {
@@ -175,5 +223,5 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     return list
   }
 
-  override fun onNewIntent(intent: Intent?) {}
+  override fun onNewIntent(intent: Intent) {}
 }

package/ios/FrameReactNative.podspec

@@ -16,10 +16,16 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-Core'
 
-  # Frame-iOS SDK – must be available to the app. Add via Swift Package Manager in Xcode:
-  # File → Add Package Dependencies → https://github.com/Frame-Payments/frame-ios
-  # Our native code imports Frame; ensure the app target links Frame-iOS (SPM).
-  # If Frame-iOS is provided as a pod in the future, uncomment:
+  # Frame-iOS SDK (Frame + FrameOnboarding) must be available to the app.
+  #
+  # SPM users (RN >= 0.73): add framepayments-react-native via Swift Package Manager.
+  # Frame and FrameOnboarding are declared as dependencies in Package.swift and resolve
+  # automatically — no manual step required.
+  #
+  # CocoaPods users: add frame-ios manually via Xcode:
+  #   File → Add Package Dependencies → https://github.com/Frame-Payments/frame-ios
+  #   Add both the "Frame-iOS" and "Frame-Onboarding" products to your app target.
+  # If Frame-iOS is published as a pod in the future, replace the above with:
   # s.dependency 'Frame-iOS'
 
   install_modules_dependencies(s) if respond_to?(:install_modules_dependencies)

package/ios/FrameSDKBridge.m

@@ -41,6 +41,11 @@ RCT_EXTERN_METHOD(presentCart:(id)customerId
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(presentOnboarding:(id)accountId
+                  capabilities:(NSArray *)capabilities
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
 @end
 
 @implementation FrameSDK
@@ -75,7 +80,18 @@ RCT_EXTERN_METHOD(presentCart:(id)customerId
       reject(@"NO_ROOT_VC", @"Could not find root view controller to present cart", nil);
       return;
     }
-    [[[ObjCFrameSDKBridge alloc] init] presentCartFrom:topVC customerId:customerId items:items shippingAmountInCents:shippingAmountInCents resolver:resolve rejecter:reject];
+    [[[ObjCFrameSDKBridge alloc] init] presentCartFrom:topVC customerId:customerId items:items shippingAmountInCents:shippingAmountInCents.integerValue resolver:resolve rejecter:reject];
+  });
+}
+
+- (void)presentOnboarding:(id)accountId capabilities:(NSArray *)capabilities resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
+  dispatch_async(dispatch_get_main_queue(), ^{
+    UIViewController *topVC = FrameGetTopViewController();
+    if (!topVC) {
+      reject(@"NO_ROOT_VC", @"Could not find root view controller to present onboarding", nil);
+      return;
+    }
+    [[[ObjCFrameSDKBridge alloc] init] presentOnboardingFrom:topVC accountId:accountId capabilities:capabilities resolver:resolve rejecter:reject];
   });
 }