@onramper/onramper-react-native 1.2.2 → 1.3.1

package/nitrogen/generated/ios/swift/HybridOnramperNitroSpec.swift

@@ -10,7 +10,7 @@ import NitroModules
 /// See ``HybridOnramperNitroSpec``
 public protocol HybridOnramperNitroSpec_protocol: HybridObject {
   // Properties
-  
+  var sdkVersion: String { get }
 
   // Methods
   func configure(config: OnramperNitroConfig) throws -> Promise<Void>
@@ -19,6 +19,7 @@ public protocol HybridOnramperNitroSpec_protocol: HybridObject {
   func signOut() throws -> Promise<Void>
   func getCheckoutRequirements(requestJson: String, prefillJson: String, styleJson: String) throws -> Promise<PreparedIntentResult>
   func cancelPreparedIntent(intentHandle: String) throws -> Promise<Void>
+  func setLogListener(onLog: @escaping (_ recordJson: String) -> Void) throws -> Void
   func setStateListener(onState: @escaping (_ stateJson: String) -> Void) throws -> Void
   func setEventListener(onEvent: @escaping (_ eventJson: String) -> Void) throws -> Void
   func setTransactionIdListener(onTransactionId: @escaping (_ transactionId: String?) -> Void) throws -> Void

package/nitrogen/generated/ios/swift/HybridOnramperNitroSpec_cxx.swift

@@ -84,7 +84,7 @@ open class HybridOnramperNitroSpec_cxx {
     }
   }
 
-  
+
 
   /**
    * Get the memory size of the Swift class (plus size of any other allocations)
@@ -121,7 +121,12 @@ open class HybridOnramperNitroSpec_cxx {
   }
 
   // Properties
-  
+  public final var sdkVersion: std.string {
+    @inline(__always)
+    get {
+      return std.string(self.__implementation.sdkVersion)
+    }
+  }
 
   // Methods
   @inline(__always)
@@ -142,7 +147,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func initialize(sessionId: std.string, sessionToken: std.string) -> bridge.Result_std__shared_ptr_Promise_void___ {
     do {
@@ -161,7 +166,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func reset() -> bridge.Result_std__shared_ptr_Promise_void___ {
     do {
@@ -180,7 +185,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func signOut() -> bridge.Result_std__shared_ptr_Promise_void___ {
     do {
@@ -199,7 +204,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func getCheckoutRequirements(requestJson: std.string, prefillJson: std.string, styleJson: std.string) -> bridge.Result_std__shared_ptr_Promise_PreparedIntentResult___ {
     do {
@@ -218,7 +223,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_PreparedIntentResult___(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func cancelPreparedIntent(intentHandle: std.string) -> bridge.Result_std__shared_ptr_Promise_void___ {
     do {
@@ -237,7 +242,23 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_std__shared_ptr_Promise_void___(__exceptionPtr)
     }
   }
-  
+
+  @inline(__always)
+  public final func setLogListener(onLog: bridge.Func_void_std__string) -> bridge.Result_void_ {
+    do {
+      try self.__implementation.setLogListener(onLog: { () -> (String) -> Void in
+        let __wrappedFunction = bridge.wrap_Func_void_std__string(onLog)
+        return { (__recordJson: String) -> Void in
+          __wrappedFunction.call(std.string(__recordJson))
+        }
+      }())
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+
   @inline(__always)
   public final func setStateListener(onState: bridge.Func_void_std__string) -> bridge.Result_void_ {
     do {
@@ -253,7 +274,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_void_(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func setEventListener(onEvent: bridge.Func_void_std__string) -> bridge.Result_void_ {
     do {
@@ -269,7 +290,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_void_(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func setTransactionIdListener(onTransactionId: bridge.Func_void_std__optional_std__string_) -> bridge.Result_void_ {
     do {
@@ -291,7 +312,7 @@ open class HybridOnramperNitroSpec_cxx {
       return bridge.create_Result_void_(__exceptionPtr)
     }
   }
-  
+
   @inline(__always)
   public final func setSessionExpirationHandler(handler: bridge.Func_std__shared_ptr_Promise_std__shared_ptr_Promise_NitroSessionCredentials____) -> bridge.Result_void_ {
     do {

package/nitrogen/generated/ios/swift/OnramperNitroConfig.swift

@@ -18,32 +18,42 @@ public extension OnramperNitroConfig {
   /**
    * Create a new instance of `OnramperNitroConfig`.
    */
-  init(apiKey: String, clientId: String, environment: String, theme: String, logLevel: String) {
-    self.init(std.string(apiKey), std.string(clientId), std.string(environment), std.string(theme), std.string(logLevel))
+  init(apiKey: String, clientId: String, environment: String, theme: String, logLevel: String, isEventLoggingEnabled: Bool, isEventConsoleLoggingEnabled: Bool) {
+    self.init(std.string(apiKey), std.string(clientId), std.string(environment), std.string(theme), std.string(logLevel), isEventLoggingEnabled, isEventConsoleLoggingEnabled)
   }
 
   @inline(__always)
   var apiKey: String {
     return String(self.__apiKey)
   }
-  
+
   @inline(__always)
   var clientId: String {
     return String(self.__clientId)
   }
-  
+
   @inline(__always)
   var environment: String {
     return String(self.__environment)
   }
-  
+
   @inline(__always)
   var theme: String {
     return String(self.__theme)
   }
-  
+
   @inline(__always)
   var logLevel: String {
     return String(self.__logLevel)
   }
+
+  @inline(__always)
+  var isEventLoggingEnabled: Bool {
+    return self.__isEventLoggingEnabled
+  }
+
+  @inline(__always)
+  var isEventConsoleLoggingEnabled: Bool {
+    return self.__isEventConsoleLoggingEnabled
+  }
 }

package/nitrogen/generated/shared/c++/HybridOnramperCheckoutButtonSpec.cpp

@@ -16,6 +16,8 @@ namespace margelo::nitro::onramper {
     registerHybrids(this, [](Prototype& prototype) {
       prototype.registerHybridGetter("intentHandle", &HybridOnramperCheckoutButtonSpec::getIntentHandle);
       prototype.registerHybridSetter("intentHandle", &HybridOnramperCheckoutButtonSpec::setIntentHandle);
+      prototype.registerHybridGetter("onContentHeightChange", &HybridOnramperCheckoutButtonSpec::getOnContentHeightChange);
+      prototype.registerHybridSetter("onContentHeightChange", &HybridOnramperCheckoutButtonSpec::setOnContentHeightChange);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridOnramperCheckoutButtonSpec.hpp

@@ -16,6 +16,8 @@
 
 
 #include <string>
+#include <functional>
+#include <optional>
 
 namespace margelo::nitro::onramper {
 
@@ -46,6 +48,8 @@ namespace margelo::nitro::onramper {
       // Properties
       virtual std::string getIntentHandle() = 0;
       virtual void setIntentHandle(const std::string& intentHandle) = 0;
+      virtual std::optional<std::function<void(double /* height */)>> getOnContentHeightChange() = 0;
+      virtual void setOnContentHeightChange(const std::optional<std::function<void(double /* height */)>>& onContentHeightChange) = 0;
 
     public:
       // Methods

package/nitrogen/generated/shared/c++/HybridOnramperNitroSpec.cpp

@@ -14,12 +14,14 @@ namespace margelo::nitro::onramper {
     HybridObject::loadHybridMethods();
     // load custom methods/properties
     registerHybrids(this, [](Prototype& prototype) {
+      prototype.registerHybridGetter("sdkVersion", &HybridOnramperNitroSpec::getSdkVersion);
       prototype.registerHybridMethod("configure", &HybridOnramperNitroSpec::configure);
       prototype.registerHybridMethod("initialize", &HybridOnramperNitroSpec::initialize);
       prototype.registerHybridMethod("reset", &HybridOnramperNitroSpec::reset);
       prototype.registerHybridMethod("signOut", &HybridOnramperNitroSpec::signOut);
       prototype.registerHybridMethod("getCheckoutRequirements", &HybridOnramperNitroSpec::getCheckoutRequirements);
       prototype.registerHybridMethod("cancelPreparedIntent", &HybridOnramperNitroSpec::cancelPreparedIntent);
+      prototype.registerHybridMethod("setLogListener", &HybridOnramperNitroSpec::setLogListener);
       prototype.registerHybridMethod("setStateListener", &HybridOnramperNitroSpec::setStateListener);
       prototype.registerHybridMethod("setEventListener", &HybridOnramperNitroSpec::setEventListener);
       prototype.registerHybridMethod("setTransactionIdListener", &HybridOnramperNitroSpec::setTransactionIdListener);

package/nitrogen/generated/shared/c++/HybridOnramperNitroSpec.hpp

@@ -20,9 +20,9 @@ namespace margelo::nitro::onramper { struct PreparedIntentResult; }
 // Forward declaration of `NitroSessionCredentials` to properly resolve imports.
 namespace margelo::nitro::onramper { struct NitroSessionCredentials; }
 
+#include <string>
 #include <NitroModules/Promise.hpp>
 #include "OnramperNitroConfig.hpp"
-#include <string>
 #include "PreparedIntentResult.hpp"
 #include <functional>
 #include <optional>
@@ -55,7 +55,7 @@ namespace margelo::nitro::onramper {
 
     public:
       // Properties
-      
+      virtual std::string getSdkVersion() = 0;
 
     public:
       // Methods
@@ -65,6 +65,7 @@ namespace margelo::nitro::onramper {
       virtual std::shared_ptr<Promise<void>> signOut() = 0;
       virtual std::shared_ptr<Promise<PreparedIntentResult>> getCheckoutRequirements(const std::string& requestJson, const std::string& prefillJson, const std::string& styleJson) = 0;
       virtual std::shared_ptr<Promise<void>> cancelPreparedIntent(const std::string& intentHandle) = 0;
+      virtual void setLogListener(const std::function<void(const std::string& /* recordJson */)>& onLog) = 0;
       virtual void setStateListener(const std::function<void(const std::string& /* stateJson */)>& onState) = 0;
       virtual void setEventListener(const std::function<void(const std::string& /* eventJson */)>& onEvent) = 0;
       virtual void setTransactionIdListener(const std::function<void(const std::optional<std::string>& /* transactionId */)>& onTransactionId) = 0;

package/nitrogen/generated/shared/c++/OnramperNitroConfig.hpp

@@ -44,10 +44,12 @@ namespace margelo::nitro::onramper {
     std::string environment     SWIFT_PRIVATE;
     std::string theme     SWIFT_PRIVATE;
     std::string logLevel     SWIFT_PRIVATE;
+    bool isEventLoggingEnabled     SWIFT_PRIVATE;
+    bool isEventConsoleLoggingEnabled     SWIFT_PRIVATE;
 
   public:
     OnramperNitroConfig() = default;
-    explicit OnramperNitroConfig(std::string apiKey, std::string clientId, std::string environment, std::string theme, std::string logLevel): apiKey(apiKey), clientId(clientId), environment(environment), theme(theme), logLevel(logLevel) {}
+    explicit OnramperNitroConfig(std::string apiKey, std::string clientId, std::string environment, std::string theme, std::string logLevel, bool isEventLoggingEnabled, bool isEventConsoleLoggingEnabled): apiKey(apiKey), clientId(clientId), environment(environment), theme(theme), logLevel(logLevel), isEventLoggingEnabled(isEventLoggingEnabled), isEventConsoleLoggingEnabled(isEventConsoleLoggingEnabled) {}
 
   public:
     friend bool operator==(const OnramperNitroConfig& lhs, const OnramperNitroConfig& rhs) = default;
@@ -67,7 +69,9 @@ namespace margelo::nitro {
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "clientId"))),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "environment"))),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme"))),
-        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "logLevel")))
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "logLevel"))),
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "isEventLoggingEnabled"))),
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "isEventConsoleLoggingEnabled")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::onramper::OnramperNitroConfig& arg) {
@@ -77,6 +81,8 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "environment"), JSIConverter<std::string>::toJSI(runtime, arg.environment));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "theme"), JSIConverter<std::string>::toJSI(runtime, arg.theme));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "logLevel"), JSIConverter<std::string>::toJSI(runtime, arg.logLevel));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "isEventLoggingEnabled"), JSIConverter<bool>::toJSI(runtime, arg.isEventLoggingEnabled));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "isEventConsoleLoggingEnabled"), JSIConverter<bool>::toJSI(runtime, arg.isEventConsoleLoggingEnabled));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -92,6 +98,8 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "environment")))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme")))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "logLevel")))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "isEventLoggingEnabled")))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "isEventConsoleLoggingEnabled")))) return false;
       return true;
     }
   };

package/nitrogen/generated/shared/c++/views/HybridOnramperCheckoutButtonComponent.cpp

@@ -36,6 +36,16 @@ namespace margelo::nitro::onramper::views {
         throw std::runtime_error(std::string("OnramperCheckoutButton.intentHandle: ") + exc.what());
       }
     }()),
+    onContentHeightChange([&]() -> CachedProp<std::optional<std::function<void(double /* height */)>>> {
+      try {
+        const react::RawValue* rawValue = rawProps.at("onContentHeightChange", nullptr, nullptr);
+        if (rawValue == nullptr) return sourceProps.onContentHeightChange;
+        const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
+        return CachedProp<std::optional<std::function<void(double /* height */)>>>::fromRawValue(*runtime, value.asObject(*runtime).getProperty(*runtime, PropNameIDCache::get(*runtime, "f")), sourceProps.onContentHeightChange);
+      } catch (const std::exception& exc) {
+        throw std::runtime_error(std::string("OnramperCheckoutButton.onContentHeightChange: ") + exc.what());
+      }
+    }()),
     hybridRef([&]() -> CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridOnramperCheckoutButtonSpec>& /* ref */)>>> {
       try {
         const react::RawValue* rawValue = rawProps.at("hybridRef", nullptr, nullptr);
@@ -50,6 +60,7 @@ namespace margelo::nitro::onramper::views {
   bool HybridOnramperCheckoutButtonProps::filterObjectKeys(const std::string& propName) {
     switch (hashString(propName)) {
       case hashString("intentHandle"): return true;
+      case hashString("onContentHeightChange"): return true;
       case hashString("hybridRef"): return true;
       default: return false;
     }

package/nitrogen/generated/shared/c++/views/HybridOnramperCheckoutButtonComponent.hpp

@@ -17,10 +17,10 @@
 #include <react/renderer/components/view/ViewProps.h>
 
 #include <string>
-#include <memory>
-#include "HybridOnramperCheckoutButtonSpec.hpp"
 #include <functional>
 #include <optional>
+#include <memory>
+#include "HybridOnramperCheckoutButtonSpec.hpp"
 
 namespace margelo::nitro::onramper::views {
 
@@ -43,6 +43,7 @@ namespace margelo::nitro::onramper::views {
 
   public:
     CachedProp<std::string> intentHandle;
+    CachedProp<std::optional<std::function<void(double /* height */)>>> onContentHeightChange;
     CachedProp<std::optional<std::function<void(const std::shared_ptr<HybridOnramperCheckoutButtonSpec>& /* ref */)>>> hybridRef;
 
   private:

package/nitrogen/generated/shared/json/OnramperCheckoutButtonConfig.json

@@ -5,6 +5,7 @@
   "directEventTypes": {},
   "validAttributes": {
     "intentHandle": true,
+    "onContentHeightChange": true,
     "hybridRef": true
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onramper/onramper-react-native",
-  "version": "1.2.2",
+  "version": "1.3.1",
   "description": "React Native wrapper for the Onramper iOS SDK",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",
@@ -41,6 +41,7 @@
     "lint": "biome check src",
     "format": "biome format --write src",
     "test": "jest",
+    "test:native": "bash scripts/test-native.sh",
     "typecheck": "tsc --noEmit",
     "nitrogen": "nitrogen && node scripts/sync-view-config.js",
     "prepare": "bob build",
@@ -64,7 +65,7 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/onramper/onramper-react-native#readme",
   "onramperSDK": {
-    "checksum": "754184c10a736e1db3292b592ca634ddbaa61dd01540b60610df4aa73a61de9a"
+    "checksum": "c003eb348062fb755d3de304f1f7ea4f1a7253192fa7e33adb794f2ce1d90d6a"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -76,12 +77,14 @@
     "@expo/config-plugins": "^10.0.0",
     "@types/jest": "^29.5.14",
     "@types/react": "~19.2.0",
+    "@types/react-test-renderer": "^19.3.0",
     "jest": "^29.7.0",
     "nitrogen": "^0.35.9",
     "react": "19.2.3",
     "react-native": "0.85.3",
     "react-native-builder-bob": "^0.43.0",
     "react-native-nitro-modules": "^0.35.9",
+    "react-test-renderer": "^19.2.3",
     "ts-jest": "^29.4.10",
     "typescript": "~5.8.3"
   },

package/src/CheckoutButton.ts

@@ -0,0 +1,28 @@
+import { createElement, useMemo, useState } from 'react';
+import { callback } from 'react-native-nitro-modules';
+
+import { OnramperCheckoutButtonView } from './OnramperCheckoutButtonView';
+
+// Height of the bare Buy button. Used until native reports the measured content
+// height so the first frame isn't collapsed.
+export const CHECKOUT_BUTTON_FALLBACK_HEIGHT = 56;
+
+export interface CheckoutButtonProps {
+  intentHandle: string;
+}
+
+/**
+ * Sizes the native checkout button to its SwiftUI content. The content grows when
+ * the SDK shows ToS text under the Buy button (which can change after mount), and
+ * Yoga can't measure a SwiftUI view — so native reports the height and it is
+ * applied here as an explicit `height`.
+ */
+export function CheckoutButton({ intentHandle }: CheckoutButtonProps) {
+  const [height, setHeight] = useState<number | null>(null);
+  const onContentHeightChange = useMemo(() => callback((h: number) => setHeight(Math.ceil(h))), []);
+  return createElement(OnramperCheckoutButtonView, {
+    intentHandle,
+    onContentHeightChange,
+    style: { width: '100%', height: height ?? CHECKOUT_BUTTON_FALLBACK_HEIGHT },
+  });
+}

package/src/OnramperClient.ts

@@ -1,6 +1,6 @@
 import { type ReactElement, createElement } from 'react';
 
-import { OnramperCheckoutButtonView } from './OnramperCheckoutButtonView';
+import { CheckoutButton } from './CheckoutButton';
 import { createOnramperNative } from './OnramperNative';
 import { OnramperError } from './errors';
 import type { CheckoutEvent, EventName, EventPayload } from './events';
@@ -8,6 +8,7 @@ import type {
   CheckoutButtonStyle,
   CheckoutRequest,
   OnramperConfiguration,
+  OnramperLogRecord,
   OnramperState,
   OnramperUserPrefill,
   QuoteResponse,
@@ -28,6 +29,19 @@ export interface GetCheckoutRequirementsResult {
  * unions, then fanned out to any number of listeners.
  */
 export class OnramperClient {
+  /**
+   * Version of the native Onramper iOS SDK loaded by this app (not the RN
+   * package version). No client configuration or session is required. iOS only.
+   */
+  static get sdkVersion(): string {
+    const native = createOnramperNative();
+    try {
+      return native.sdkVersion;
+    } finally {
+      native.dispose();
+    }
+  }
+
   state: OnramperState = { kind: 'idle' };
   lastError: OnramperError | null = null;
   currentTransactionId: string | null = null;
@@ -42,10 +56,24 @@ export class OnramperClient {
   // Resolved when the constructor-issued configure() completes. Public methods
   // that need the native client await this first.
   private readonly configured: Promise<void>;
+  private destroyed = false;
 
   constructor(config: OnramperConfiguration) {
+    if (config.logHandler) {
+      const handler = config.logHandler;
+      this.native.setLogListener((json) => {
+        if (this.destroyed) return;
+        try {
+          handler(JSON.parse(json) as OnramperLogRecord);
+        } catch {
+          // Diagnostics must never interrupt checkout; do not log callback data.
+          console.warn('Onramper logHandler failed.');
+        }
+      });
+    }
     // Single native state callback → update the mirror + fan out to listeners.
     this.native.setStateListener((json) => {
+      if (this.destroyed) return;
       const s = JSON.parse(json) as OnramperState;
       this.state = s;
       if (s.kind === 'failed') this.lastError = OnramperError.from(s.error);
@@ -55,6 +83,7 @@ export class OnramperClient {
     // Single native checkout-event callback → keep the transaction ID mirror
     // synchronized at finalization, then fan out to checkout listeners.
     this.native.setEventListener((json) => {
+      if (this.destroyed) return;
       const e = JSON.parse(json) as CheckoutEvent;
       if (e.type === 'checkoutFinalized') {
         this.updateCurrentTransactionId(e.response.onramperTransactionId);
@@ -63,6 +92,7 @@ export class OnramperClient {
     });
 
     this.native.setTransactionIdListener((transactionId) => {
+      if (this.destroyed) return;
       // The SDK transiently publishes nil while re-preparing after the payment
       // sheet is dismissed. The finalized transaction ID remains durable across
       // that attempt change; only explicit reset()/signOut() clear the JS mirror.
@@ -73,7 +103,9 @@ export class OnramperClient {
     // Nitro stores the async callback natively and awaits it directly — no
     // event round-trip needed.
     this.native.setSessionExpirationHandler(async () => {
+      this.assertActive();
       const creds = await config.onSessionExpired();
+      this.assertActive();
       return { sessionId: creds.sessionId, sessionToken: creds.sessionToken };
     });
 
@@ -84,10 +116,12 @@ export class OnramperClient {
         environment: config.environment,
         theme: config.theme ?? 'system',
         logLevel: config.logLevel ?? 'off',
+        isEventLoggingEnabled: config.isEventLoggingEnabled ?? false,
+        isEventConsoleLoggingEnabled: config.isEventConsoleLoggingEnabled ?? false,
       })
       .catch((e: unknown) => {
         const err = OnramperError.from(e);
-        this.lastError = err;
+        if (!this.destroyed) this.lastError = err;
         throw err;
       });
     // Swallow the unhandled-rejection warning when no one awaits .configured
@@ -95,11 +129,23 @@ export class OnramperClient {
     this.configured.catch(() => undefined);
   }
 
+  private assertActive(): void {
+    if (this.destroyed) {
+      throw new OnramperError({
+        code: 'clientDestroyed',
+        message: 'This OnramperClient has been destroyed. Create a new client before making SDK calls.',
+        userMessage: 'This checkout session has ended. Please reopen checkout.',
+      });
+    }
+  }
+
   private updateCurrentTransactionId(next: string | null): void {
+    if (this.destroyed) return;
     if (next === this.currentTransactionId) return;
 
     this.currentTransactionId = next;
     for (const fn of [...this.transactionIdListeners]) {
+      if (this.destroyed) break;
       try {
         fn(next);
       } catch (error: unknown) {
@@ -110,19 +156,27 @@ export class OnramperClient {
 
   async initialize(creds: SessionCredentials): Promise<void> {
     try {
+      this.assertActive();
       await this.configured;
+      this.assertActive();
       await this.native.initialize(creds.sessionId, creds.sessionToken);
+      this.assertActive();
     } catch (e: unknown) {
+      this.assertActive();
       throw OnramperError.from(e);
     }
   }
 
   async reset(): Promise<void> {
     try {
+      this.assertActive();
       await this.configured;
+      this.assertActive();
       await this.native.reset();
+      this.assertActive();
       this.updateCurrentTransactionId(null);
     } catch (e: unknown) {
+      this.assertActive();
       throw OnramperError.from(e);
     }
   }
@@ -135,10 +189,14 @@ export class OnramperClient {
    */
   async signOut(): Promise<void> {
     try {
+      this.assertActive();
       await this.configured;
+      this.assertActive();
       await this.native.signOut();
+      this.assertActive();
       this.updateCurrentTransactionId(null);
     } catch (e: unknown) {
+      this.assertActive();
       throw OnramperError.from(e);
     }
   }
@@ -147,6 +205,8 @@ export class OnramperClient {
    * Fetches checkout requirements + quote and returns a native checkout button
    * to render plus the quote. The button handles login / finalize / webview
    * internally; outcomes surface via the event stream (`addEventListener`).
+   * A newer preparation, reset, or sign-out invalidates older unmounted buttons
+   * and rejects obsolete in-flight preparations with `intentInvalidated`.
    *
    * Pass `prefill` to pre-populate the OnramperID sign-in and additional-info
    * screens with values you already know about the user. It is best-effort and
@@ -164,30 +224,39 @@ export class OnramperClient {
     prefill: OnramperUserPrefill = {},
   ): Promise<GetCheckoutRequirementsResult> {
     try {
+      this.assertActive();
       await this.configured;
+      this.assertActive();
       const result = await this.native.getCheckoutRequirements(
         JSON.stringify(request),
         JSON.stringify(prefill),
         JSON.stringify(buttonStyle),
       );
+      this.assertActive();
       const quote = JSON.parse(result.quoteJson) as QuoteResponse;
-      const button = createElement(OnramperCheckoutButtonView, {
-        intentHandle: result.intentHandle,
-        style: { width: '100%', minHeight: 56 },
-      });
+      const button = createElement(CheckoutButton, { intentHandle: result.intentHandle });
       return { button, quote };
     } catch (e: unknown) {
+      this.assertActive();
       throw OnramperError.from(e);
     }
   }
 
   /** Discards a prepared intent (e.g. if the user navigates away before checkout). */
-  cancelPreparedIntent(intentHandle: string): Promise<void> {
-    return this.native.cancelPreparedIntent(intentHandle);
+  async cancelPreparedIntent(intentHandle: string): Promise<void> {
+    try {
+      this.assertActive();
+      await this.native.cancelPreparedIntent(intentHandle);
+      this.assertActive();
+    } catch (e: unknown) {
+      this.assertActive();
+      throw OnramperError.from(e);
+    }
   }
 
   /** Subscribe to state changes. Returns an unsubscribe function. */
   addStateListener(fn: (state: OnramperState) => void): () => void {
+    this.assertActive();
     this.stateListeners.add(fn);
     return () => {
       this.stateListeners.delete(fn);
@@ -196,6 +265,7 @@ export class OnramperClient {
 
   /** Subscribe to the durable Onramper transaction ID. Successful reset/signOut publish null. */
   addTransactionIdListener(fn: (transactionId: string | null) => void): () => void {
+    this.assertActive();
     this.transactionIdListeners.add(fn);
     return () => {
       this.transactionIdListeners.delete(fn);
@@ -204,6 +274,7 @@ export class OnramperClient {
 
   /** Subscribe to a specific checkout event. Returns an unsubscribe function. */
   addEventListener<K extends EventName>(name: K, fn: (e: EventPayload<K>) => void): () => void {
+    this.assertActive();
     const wrapper = (e: CheckoutEvent) => {
       if (e.type === name) fn(e as EventPayload<K>);
     };
@@ -213,8 +284,10 @@ export class OnramperClient {
     };
   }
 
-  /** Tear down: clears JS listeners and releases the native callbacks + SDK client. */
+  /** Idempotent teardown. Further operations reject with `clientDestroyed`; create a new client to restart. */
   destroy(): void {
+    if (this.destroyed) return;
+    this.destroyed = true;
     this.stateListeners.clear();
     this.eventListeners.clear();
     this.transactionIdListeners.clear();