framepayments-react-native 1.0.1 → 2.0.1

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

@@ -1,20 +1,20 @@
 -- 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-21:12
+INJECTED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:1:1-21: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-20: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
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:7:7-31
 	android:theme
-		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:6:7-63
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:6:7-53
 	android:name
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:5:7-78
 activity#com.framepayments.reactnativeframe.FrameFlowActivity
@@ -22,9 +22,25 @@ ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_
 	android:exported
 		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:11:7-31
 	android:theme
-		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:10:7-63
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:10:7-53
 	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-53
+	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
+activity#com.framepayments.reactnativeframe.FrameGooglePayActivity
+ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:16:5-19:34
+	android:exported
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:19:7-31
+	android:theme
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:18:7-63
+	android:name
+		ADDED from /Users/erictownsend/Documents/GitHub/frame-react-native/example/node_modules/framepayments-react-native/android/src/main/AndroidManifest.xml:17:7-79
 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,41 @@ 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.2'
+  implementation 'com.framepayments:framesdk_ui:2.0.2'
+  implementation 'com.framepayments:framesdk_onboarding:2.0.2'
+  // Required by FrameGooglePayButton (PaymentsClient, WalletConstants).
+  // framesdk_ui declares this as `implementation`, so it is not exposed transitively.
+  implementation 'com.google.android.gms:play-services-wallet:19.4.0'
+  // AppCompat is needed because FrameGooglePayButton casts its host to AppCompatActivity.
+  implementation 'androidx.appcompat:appcompat:1.7.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

@@ -3,11 +3,19 @@
   <application>
     <activity
       android:name="com.framepayments.reactnativeframe.FrameCheckoutActivity"
-      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+      android:theme="@style/Theme.Frame.NoActionBar"
       android:exported="false" />
     <activity
       android:name="com.framepayments.reactnativeframe.FrameFlowActivity"
-      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+      android:theme="@style/Theme.Frame.NoActionBar"
+      android:exported="false" />
+    <activity
+      android:name="com.framepayments.reactnativeframe.FrameOnboardingActivity"
+      android:theme="@style/Theme.Frame.NoActionBar"
+      android:exported="false" />
+    <activity
+      android:name="com.framepayments.reactnativeframe.FrameGooglePayActivity"
+      android:theme="@style/Theme.Frame.GooglePay.Translucent"
       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/FrameGooglePayActivity.kt

@@ -0,0 +1,148 @@
+package com.framepayments.reactnativeframe
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import android.widget.FrameLayout
+import androidx.appcompat.app.AppCompatActivity
+import com.framepayments.framesdk_ui.buttons.FrameGooglePayButton
+import com.google.gson.Gson
+
+/**
+ * Hidden host activity for Frame.presentGooglePay(). The Frame Android SDK only
+ * exposes Google Pay through FrameGooglePayButton (a View). This activity
+ * instantiates that View off-screen, waits for readiness, then programmatically
+ * clicks the inner Google Pay button so the wallet sheet appears. The result
+ * is forwarded back via setResult / FrameSDKModule.onActivityResult.
+ *
+ * The Activity finishes after the result arrives or after a 5s readiness timeout.
+ */
+class FrameGooglePayActivity : AppCompatActivity() {
+
+  private val handler = Handler(Looper.getMainLooper())
+  private var googlePayButton: FrameGooglePayButton? = null
+  private var didTriggerClick = false
+  private var didDeliverResult = false
+  private var readinessTimeout: Runnable? = null
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    val container = FrameLayout(this).apply {
+      layoutParams = FrameLayout.LayoutParams(
+        FrameLayout.LayoutParams.MATCH_PARENT,
+        FrameLayout.LayoutParams.MATCH_PARENT
+      )
+    }
+    setContentView(container)
+
+    val amountCents = intent.getIntExtra(EXTRA_AMOUNT_CENTS, 0)
+    val customerId = intent.getStringExtra(EXTRA_CUSTOMER_ID)
+    val currencyCode = intent.getStringExtra(EXTRA_CURRENCY) ?: "USD"
+    val googlePayMerchantId = intent.getStringExtra(EXTRA_MERCHANT_ID)
+
+    if (amountCents <= 0) {
+      deliverFailure("Invalid amountCents")
+      return
+    }
+
+    val button = FrameGooglePayButton(this)
+    button.layoutParams = FrameLayout.LayoutParams(1, 1) // tiny but measurable so click can fire
+    container.addView(button)
+    googlePayButton = button
+
+    button.configure(
+      amountCents = amountCents,
+      customerId = customerId,
+      currencyCode = currencyCode,
+      googlePayMerchantId = googlePayMerchantId,
+      onResult = { result -> handleResult(result) },
+      onReadinessChanged = { isReady -> handleReadiness(isReady) }
+    )
+
+    // Bail out if Google Pay isn't ready within 5s.
+    readinessTimeout = Runnable {
+      if (!didTriggerClick && !didDeliverResult) {
+        deliverUnavailable()
+      }
+    }
+    handler.postDelayed(readinessTimeout!!, 5000)
+  }
+
+  private fun handleReadiness(isReady: Boolean) {
+    if (didTriggerClick || didDeliverResult) return
+    if (!isReady) return
+    didTriggerClick = true
+    val button = googlePayButton ?: return
+    // The inner Google Pay button (child 0 of FrameGooglePayButton) carries the
+    // OnClickListener that calls requestGooglePay(). Click on the outer
+    // FrameLayout does not propagate.
+    val inner = if (button.childCount > 0) button.getChildAt(0) else null
+    handler.post {
+      if (inner != null) {
+        inner.performClick()
+      } else {
+        deliverFailure("Could not find inner Google Pay button")
+      }
+    }
+  }
+
+  private fun handleResult(result: FrameGooglePayButton.Result) {
+    if (didDeliverResult) return
+    didDeliverResult = true
+    when (result) {
+      is FrameGooglePayButton.Result.Success -> {
+        val json = Gson().toJson(result.chargeIntent)
+        deliverViaCallback(android.app.Activity.RESULT_OK, Intent().putExtra(EXTRA_CHARGE_INTENT_JSON, json))
+      }
+      is FrameGooglePayButton.Result.Failure -> {
+        deliverViaCallback(RESULT_FAILURE, Intent().putExtra(EXTRA_FAILURE_MESSAGE, result.message))
+      }
+      is FrameGooglePayButton.Result.Cancelled -> {
+        deliverViaCallback(android.app.Activity.RESULT_CANCELED, null)
+      }
+    }
+  }
+
+  private fun deliverUnavailable() {
+    if (didDeliverResult) return
+    didDeliverResult = true
+    deliverViaCallback(RESULT_UNAVAILABLE, null)
+  }
+
+  private fun deliverFailure(message: String) {
+    if (didDeliverResult) return
+    didDeliverResult = true
+    deliverViaCallback(RESULT_FAILURE, Intent().putExtra(EXTRA_FAILURE_MESSAGE, message))
+  }
+
+  private fun deliverViaCallback(resultCode: Int, data: Intent?) {
+    val callback = FrameSDKModule.pendingGooglePayCallback
+    FrameSDKModule.pendingGooglePayCallback = null
+    callback?.invoke(resultCode, data)
+    finish()
+  }
+
+  override fun onDestroy() {
+    readinessTimeout?.let { handler.removeCallbacks(it) }
+    readinessTimeout = null
+    super.onDestroy()
+  }
+
+  companion object {
+    const val EXTRA_AMOUNT_CENTS = "amount_cents"
+    const val EXTRA_CUSTOMER_ID = "customer_id"
+    const val EXTRA_CURRENCY = "currency"
+    const val EXTRA_MERCHANT_ID = "merchant_id"
+    const val EXTRA_CHARGE_INTENT_JSON = "charge_intent_json"
+    const val EXTRA_FAILURE_MESSAGE = "failure_message"
+
+    const val REQUEST_CODE = 9003
+
+    // RESULT_FIRST_USER == 1; we use that to distinguish payment failure from cancel.
+    const val RESULT_FAILURE = android.app.Activity.RESULT_FIRST_USER
+    const val RESULT_UNAVAILABLE = android.app.Activity.RESULT_FIRST_USER + 1
+  }
+}

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

@@ -7,9 +7,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
-import org.json.JSONArray
 import com.framepayments.framesdk.FrameNetworking
 import org.json.JSONObject
 
@@ -22,14 +20,21 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
 
   private var checkoutPromise: Promise? = null
   private var cartPromise: Promise? = null
+  private var onboardingPromise: Promise? = null
+  private var googlePayPromise: Promise? = null
 
   override fun getName(): String = "FrameSDK"
 
+  companion object {
+    @JvmStatic
+    var pendingGooglePayCallback: ((Int, Intent?) -> Unit)? = null
+  }
+
   @ReactMethod
-  fun initialize(apiKey: String, debugMode: Boolean, promise: Promise) {
+  fun initialize(secretKey: String, publishableKey: String, debugMode: Boolean, promise: Promise) {
     try {
       val ctx = reactApplicationContext.applicationContext
-      FrameNetworking.initializeWithAPIKey(ctx, apiKey, debugMode)
+      FrameNetworking.initializeWithAPIKey(ctx, secretKey, publishableKey, debugMode)
       promise.resolve(null)
     } catch (e: Exception) {
       promise.reject("INIT_FAILED", e.message, e)
@@ -38,7 +43,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 +64,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 +83,59 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  @ReactMethod
+  fun presentGooglePay(
+    amountCents: Double,
+    customerId: String?,
+    currencyCode: String?,
+    googlePayMerchantId: String?,
+    promise: Promise
+  ) {
+    val activity = reactApplicationContext.currentActivity ?: run {
+      promise.reject("NO_ACTIVITY", "No current activity", null)
+      return
+    }
+    val amountInt = amountCents.toInt()
+    if (amountInt <= 0) {
+      promise.reject("INVALID_AMOUNT", "amountCents must be positive", null)
+      return
+    }
+    googlePayPromise = promise
+    pendingGooglePayCallback = { resultCode, data ->
+      handleGooglePayResult(resultCode, data)
+    }
+    activity.runOnUiThread {
+      val intent = Intent(activity, FrameGooglePayActivity::class.java).apply {
+        putExtra(FrameGooglePayActivity.EXTRA_AMOUNT_CENTS, amountInt)
+        putExtra(FrameGooglePayActivity.EXTRA_CUSTOMER_ID, customerId)
+        putExtra(FrameGooglePayActivity.EXTRA_CURRENCY, currencyCode ?: "USD")
+        putExtra(FrameGooglePayActivity.EXTRA_MERCHANT_ID, googlePayMerchantId)
+      }
+      activity.startActivity(intent)
+    }
+  }
+
+  @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 +150,20 @@ 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)
+      FrameGooglePayActivity.REQUEST_CODE -> handleGooglePayResult(resultCode, data)
       else -> return
     }
   }
@@ -142,38 +210,52 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  private fun jsonObjectToWritableMap(obj: JSONObject): WritableNativeMap {
-    val map = WritableNativeMap()
-    for (key in obj.keys()) {
-      if (obj.isNull(key)) continue
-      when (val v = obj.get(key)) {
-        is String -> map.putString(key, v)
-        is Int -> map.putInt(key, v)
-        is Long -> map.putDouble(key, v.toDouble())
-        is Double -> map.putDouble(key, v)
-        is Boolean -> map.putBoolean(key, v)
-        is JSONObject -> map.putMap(key, jsonObjectToWritableMap(v))
-        is JSONArray -> map.putArray(key, jsonArrayToWritableArray(v))
+  private fun handleGooglePayResult(resultCode: Int, data: Intent?) {
+    val promise = googlePayPromise ?: return
+    googlePayPromise = null
+    when (resultCode) {
+      Activity.RESULT_OK -> {
+        val json = data?.getStringExtra(FrameGooglePayActivity.EXTRA_CHARGE_INTENT_JSON)
+        if (json != null) {
+          try {
+            val map = jsonObjectToWritableMap(JSONObject(json))
+            promise.resolve(map)
+          } catch (e: Exception) {
+            promise.reject("PARSE_ERROR", e.message, e)
+          }
+        } else {
+          promise.reject("NO_RESULT", "No charge intent in result", null)
+        }
+      }
+      FrameGooglePayActivity.RESULT_FAILURE -> {
+        val message = data?.getStringExtra(FrameGooglePayActivity.EXTRA_FAILURE_MESSAGE) ?: "Google Pay failed"
+        promise.reject("PAYMENT_FAILED", message, null)
+      }
+      FrameGooglePayActivity.RESULT_UNAVAILABLE -> {
+        promise.reject("GOOGLE_PAY_UNAVAILABLE", "Google Pay is not available on this device", null)
+      }
+      else -> {
+        promise.reject("USER_CANCELED", "User cancelled Google Pay", null)
       }
     }
-    return map
   }
 
-  private fun jsonArrayToWritableArray(arr: JSONArray): WritableNativeArray {
-    val list = WritableNativeArray()
-    for (i in 0 until arr.length()) {
-      when (val v = arr.get(i)) {
-        is String -> list.pushString(v)
-        is Int -> list.pushInt(v)
-        is Long -> list.pushDouble(v.toDouble())
-        is Double -> list.pushDouble(v)
-        is Boolean -> list.pushBoolean(v)
-        is JSONObject -> list.pushMap(jsonObjectToWritableMap(v))
-        is JSONArray -> list.pushArray(jsonArrayToWritableArray(v))
+  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)
     }
-    return list
   }
 
-  override fun onNewIntent(intent: Intent?) {}
+  override fun onNewIntent(intent: Intent) {}
 }