Update RN apis and kotlin parsing

Author: Twigz

android/src/main/java/com/reactnativestripesdk/FakeOnrampSdkModule.kt

@@ -4,6 +4,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.reactnativestripesdk.utils.createFailedError
 
@@ -119,8 +120,8 @@ class FakeOnrampSdkModule(
   }
 
   @ReactMethod
-  override fun getCryptoTokenDisplayData(token: ReadableMap, promise: Promise) {
-    promise?.resolveNotImplemented()
+  override fun getCryptoTokenDisplayData(token: ReadableMap): WritableMap? {
+    return null
   }
 
   private fun Promise.resolveNotImplemented() {

android/src/onramp/java/com/reactnativestripesdk/OnrampSdkModule.kt

@@ -12,6 +12,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.module.annotations.ReactModule
 import com.reactnativestripesdk.utils.ErrorType
@@ -534,47 +535,48 @@ class OnrampSdkModule(
   }
 
   @ReactMethod
-  override fun getCryptoTokenDisplayData(token: ReadableMap, promise: Promise) {
+  override fun getCryptoTokenDisplayData(token: ReadableMap): WritableMap? {
     val context = reactApplicationContext
-
-    val paymentDetails: PaymentMethodPreview = when (token.getString("type")) {
-        "Card" -> {
-            val brand = token.getString("brand") ?: ""
-            val funding = token.getString("funding") ?: ""
-            val last4 = token.getString("last4") ?: ""
-            val cardBrand = CardBrand.fromCode(brand)
-
-            PaymentMethodPreview.create(
-              context = context,
-              details = PaymentMethodPreviewDetails.Card(
-                    brand = cardBrand,
-                    funding = funding,
-                    last4 = last4
-              )
-            )
+    
+        val paymentDetails: PaymentMethodPreview? = when {
+        token.hasKey("card") -> {
+            val cardMap = token.getMap("card")
+            if (cardMap != null) {
+                val brand = cardMap.getString("brand") ?: ""
+                val funding = cardMap.getString("funding") ?: ""
+                val last4 = cardMap.getString("last4") ?: ""
+                val cardBrand = CardBrand.fromCode(brand)
+
+                PaymentMethodPreview.create(
+                    context = context,
+                    details = PaymentMethodPreviewDetails.Card(
+                        brand = cardBrand,
+                        funding = funding,
+                        last4 = last4
+                    )
+                )
+            } else null
         }
-        "BankAccount" -> {
-            val bankName = token.getString("bankName")
-            val last4 = token.getString("last4") ?: ""
-            PaymentMethodPreview.create(
-              context = context,
-              details = PaymentMethodPreviewDetails.BankAccount(
-                    bankIconCode = null,
-                    bankName = bankName,
-                    last4 = last4
-              )
-            )
-        }
-        else -> {
-          promise.resolve(
-            createFailedError(
-              IllegalArgumentException("Unsupported payment method"),
-            ),
-          )
-          return
+        token.hasKey("us_bank_account") -> {
+            val bankMap = token.getMap("us_bank_account")
+            if (bankMap != null) {
+                val bankName = bankMap.getString("bank_name")
+                val last4 = bankMap.getString("last4") ?: ""
+                PaymentMethodPreview.create(
+                    context = context,
+                    details = PaymentMethodPreviewDetails.BankAccount(
+                        bankIconCode = null,
+                        bankName = bankName,
+                        last4 = last4
+                    )
+                )
+            } else null
         }
+        else -> null
     }
 
+    if (paymentDetails == null) return null
+
     val icon =
       currentActivity
         ?.let { ContextCompat.getDrawable(it, paymentDetails.iconRes) }
@@ -586,7 +588,7 @@ class OnrampSdkModule(
     displayData.putString("label", paymentDetails.label)
     displayData.putString("sublabel", paymentDetails.sublabel)
 
-    promise.resolve(createResult("displayData", displayData))
+    return displayData
   }
 
   @ReactMethod

example/src/screens/Onramp/CryptoOnrampFlow.tsx

@@ -151,8 +151,8 @@ export default function CryptoOnrampFlow() {
       },
     };
 
-    const cardData = (await getCryptoTokenDisplayData(cardParams)).displayData;
-    const bankData = (await getCryptoTokenDisplayData(bankParams)).displayData;
+    const cardData = getCryptoTokenDisplayData(cardParams);
+    const bankData = getCryptoTokenDisplayData(bankParams);
 
     if (cardData) {
       setCurrentPaymentDisplayData(cardData);

src/hooks/useOnramp.tsx

@@ -1,6 +1,6 @@
 import { EventSubscription } from 'react-native';
 import NativeOnrampSdk from '../specs/NativeOnrampSdkModule';
-import type { Onramp, OnrampError, StripeError } from '../types';
+import { Onramp, OnrampError, StripeError } from '../types';
 import type { PlatformPay } from '../types';
 import { useCallback } from 'react';
 import { addOnrampListener } from '../events';
@@ -141,14 +141,11 @@ export function useOnramp() {
     []
   );
 
-  const _getCryptoTokenDisplayData = useCallback(
-    async (
-      token: CryptoPaymentToken
-    ): Promise<Onramp.PaymentDisplayDataResult> => {
-      return NativeOnrampSdk.getCryptoTokenDisplayData(token);
-    },
-    []
-  );
+  const _getCryptoTokenDisplayData = (
+    token: CryptoPaymentToken
+  ): Onramp.PaymentMethodDisplayData | null => {
+    return NativeOnrampSdk.getCryptoTokenDisplayData(token);
+  };
 
   const _logOut = useCallback(async (): Promise<{
     error?: StripeError<OnrampError>;

src/specs/NativeOnrampSdkModule.ts

@@ -38,7 +38,7 @@ export interface Spec extends TurboModule {
   onrampAuthorize(linkAuthIntentId: string): Promise<Onramp.AuthorizeResult>;
   getCryptoTokenDisplayData(
     token: UnsafeObject<CryptoPaymentToken>
-  ): Promise<Onramp.PaymentDisplayDataResult>;
+  ): UnsafeObject<Onramp.PaymentMethodDisplayData> | null;
   logout(): Promise<Onramp.VoidResult>;
 }