@primer-io/react-native 2.22.0 → 2.24.0

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['ReactNative_kotlinVersion']
-
+  def kover_version = '0.7.6'
   repositories {
     google()
     mavenCentral()
@@ -13,12 +13,14 @@ buildscript {
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+    classpath "org.jetbrains.kotlinx:kover-gradle-plugin:$kover_version"
   }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlinx-serialization'
+apply from: "./config/coverage-scripts/kover.gradle"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactNative_' + name]
@@ -29,12 +31,15 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
+  group 'io.primer'
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
 
+    testInstrumentationRunnerArguments runnerBuilder: 'de.mannodermaus.junit5.AndroidJUnit5Builder'
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
   buildTypes {
@@ -56,6 +61,13 @@ android {
   kotlinOptions {
     freeCompilerArgs += '-Xjvm-default=all'
   }
+  testOptions {
+    execution = 'ANDROIDX_TEST_ORCHESTRATOR'
+
+    unitTests.all {
+      useJUnitPlatform()
+    }
+  }
 }
 
 repositories {
@@ -136,5 +148,11 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
-  implementation 'io.primer:android:2.27.0'
+  implementation 'io.primer:android:2.27.3'
+
+  testImplementation 'io.mockk:mockk:1.13.10'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
+  testImplementation 'de.mannodermaus.junit5:android-test-runner:1.3.0'
 }

package/android/config/coverage-scripts/kover.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'org.jetbrains.kotlinx.kover'
+
+subprojects {
+    koverReport {
+        filters {
+            excludes {
+                packages(
+                        '**.example.**',
+                )
+            }
+        }
+        androidReports("release") {
+            verify {
+                rule {
+                    // add lower bound for percentage of covered lines
+                    minBound(80)
+
+                    // add upper bound for percentage of covered lines
+                    maxBound(100)
+                }
+            }
+        }
+    }
+
+    tasks["koverXmlReportRelease"].dependsOn "testReleaseUnitTest"
+}

package/android/src/main/java/com/primerioreactnative/components/manager/klarna/PrimerRNHeadlessUniversalCheckoutKlarnaComponent.kt

@@ -259,12 +259,12 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
         val returnIntentUrl = readableMap.getString("returnIntentUrl")
         val paymentCategory = readableMap.getMap("paymentCategory") as ReadableMap
         val json = Json { ignoreUnknownKeys = true }
-        val KlarnaPaymentCategoryRN =
+        val klarnaPaymentCategoryRN =
             json.decodeFromString<KlarnaPaymentCategoryRN>(
                 Json.encodeToString(paymentCategory.toHashMap() as Map<String, String>)
             )
 
-        val activity = getCurrentActivity()
+        val activity = currentActivity
 
         if (activity == null) {
             val exception = ErrorTypeRN.NativeBridgeFailed errorTo MISSING_ACTIVITY_ERROR
@@ -277,7 +277,7 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
                 KlarnaPaymentCollectableData.PaymentOptions(
                     context = activity,
                     returnIntentUrl = requireNotNull(returnIntentUrl),
-                    paymentCategory = KlarnaPaymentCategoryRN.toKlarnaPaymentCategory()
+                    paymentCategory = klarnaPaymentCategoryRN.toKlarnaPaymentCategory()
                 )
             )
             promise.resolve(null)
@@ -327,8 +327,6 @@ class PrimerRNHeadlessUniversalCheckoutKlarnaComponent(
             Could not retrieve running activity from context.
             """
 
-        val TAG = PrimerRNHeadlessUniversalCheckoutKlarnaComponent::class.simpleName
-
         val json by lazy { Json { encodeDefaults = true } }
     }
 }

package/android/src/main/java/com/primerioreactnative/datamodels/PrimerSettingsRN.kt

@@ -7,6 +7,7 @@ import com.primerioreactnative.extensions.toPrimerUIOptions
 import io.primer.android.data.settings.GooglePayButtonStyle
 import io.primer.android.data.settings.PrimerPaymentHandling
 import io.primer.android.data.settings.PrimerSettings
+import io.primer.android.ui.settings.PrimerTheme
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -44,8 +45,69 @@ data class PrimerUIOptionsRN(
   var isInitScreenEnabled: Boolean = true,
   var isSuccessScreenEnabled: Boolean = true,
   var isErrorScreenEnabled: Boolean = true,
+  var theme: PrimerThemeRN = PrimerThemeRN()
 )
 
+@Serializable
+data class PrimerThemeRN(
+  val colors: ColorThemeRN? = null,
+  val darkModeColors: ColorThemeRN? = null
+) {
+  fun toPrimerTheme(): PrimerTheme {
+    val isDarkMode = false
+
+    return PrimerTheme.buildWithDynamicValues(
+      isDarkMode = isDarkMode,
+      mainColor = when {
+        isDarkMode -> darkModeColors?.mainColor?.toHexStrColor()
+        else -> colors?.mainColor?.toHexStrColor()
+      },
+      backgroundColor = when {
+        isDarkMode -> darkModeColors?.background?.toHexStrColor()
+        else -> colors?.background?.toHexStrColor()
+      },
+      disabledColor = when {
+        isDarkMode -> darkModeColors?.disabled?.toHexStrColor()
+        else -> colors?.disabled?.toHexStrColor()
+      },
+      textColor = when {
+        isDarkMode -> darkModeColors?.text?.toHexStrColor()
+        else -> colors?.text?.toHexStrColor()
+      },
+      bordersColor = when {
+        isDarkMode -> darkModeColors?.borders?.toHexStrColor()
+        else -> colors?.borders?.toHexStrColor()
+      },
+      errorColor = when {
+        isDarkMode -> darkModeColors?.error?.toHexStrColor()
+        else -> colors?.error?.toHexStrColor()
+      }
+    )
+  }
+}
+
+@Serializable
+data class ColorThemeRN(
+  val mainColor: ColorRN? = null,
+  val contrastingColor: ColorRN? = null,
+  val background: ColorRN? = null,
+  val text: ColorRN? = null,
+  val contrastingText: ColorRN? = null,
+  val borders: ColorRN? = null, // or main color
+  val disabled: ColorRN? = null,
+  val error: ColorRN? = null,
+)
+
+@Serializable
+data class ColorRN(
+  val alpha: Int = 0,
+  val red: Int = 0,
+  val green: Int = 0,
+  val blue: Int = 0
+) {
+  fun toHexStrColor() = String.format("#%02X%02X%02X%02X", alpha, red, green, blue)
+}
+
 @Serializable
 data class PrimerDebugOptionsRN(val is3DSSanityCheckEnabled: Boolean = true)
 

package/android/src/main/java/com/primerioreactnative/extensions/PrimerUIOptionsRN.kt

@@ -1,7 +1,6 @@
 package com.primerioreactnative.extensions
 
 import com.primerioreactnative.datamodels.PrimerUIOptionsRN
-import io.primer.android.ui.settings.PrimerTheme
 import io.primer.android.ui.settings.PrimerUIOptions
 
 internal fun PrimerUIOptionsRN.toPrimerUIOptions() =
@@ -9,5 +8,5 @@ internal fun PrimerUIOptionsRN.toPrimerUIOptions() =
     isInitScreenEnabled,
     isSuccessScreenEnabled,
     isErrorScreenEnabled,
-    PrimerTheme.build()
+    theme.toPrimerTheme()
   )

package/android/src/test/java/com/primerioreactnative/utils/ErrorHelperTest.kt

@@ -0,0 +1,24 @@
+package com.primerioreactnative.utils
+
+import com.primerioreactnative.datamodels.ErrorTypeRN
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+internal class ErrorHelperTest {
+
+  // Create a mock ErrorTypeRN instance
+  private val errorType = ErrorTypeRN.InvalidVaultedPaymentMethodId
+
+  @Test
+  fun `errorTo should create PrimerErrorRN with correct properties`() {
+    // Mock message
+    val errorMessage = "This is an error message"
+
+    // Call the infix function
+    val primerError = errorType errorTo errorMessage
+
+    // Verify the errorId and message are set correctly in the PrimerErrorRN object
+    assertEquals(errorType.errorId, primerError.errorId)
+    assertEquals(errorMessage, primerError.description)
+  }
+}

package/ios/Sources/DataModels/PrimerThemeRN.swift

@@ -7,19 +7,52 @@ struct PrimerThemeRN: Decodable {
 
 extension PrimerThemeRN {
     func asPrimerTheme() -> PrimerTheme {
-        return PrimerTheme()
+
+        let isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark
+
+        let _colors = isDarkMode ? darkModeColors : colors
+
+        guard let colors = _colors else {
+            return PrimerTheme()
+        }
+
+        let data = PrimerThemeData()
+        data.colors = PrimerThemeData.ColorSwatch()
+
+        if let mainColor = colors.text?.uiColor ?? colors.mainColor?.uiColor {
+            data.colors.primary = mainColor
+            data.colors.dark = mainColor
+            data.colors.gray = mainColor
+        }
+        if let disabledColor = colors.disabled?.uiColor {
+            data.colors.lightGray = disabledColor
+            data.buttons.main.disabledColor = disabledColor
+        }
+        if let errorColor = colors.error?.uiColor {
+            data.colors.error = errorColor
+        }
+        if let borderColor = colors.borders?.uiColor {
+            data.buttons.main.border.defaultColor = borderColor
+            data.input.border.defaultColor = borderColor
+        }
+
+        if let backgroundColor = colors.background?.uiColor {
+            data.view.backgroundColor = backgroundColor
+        }
+
+        return PrimerTheme(with: data)
     }
 }
 
 struct ColorThemeRN: Decodable {
-    let mainColor: ColorRN?
-    let contrastingColor: ColorRN?
-    let background: ColorRN?
-    let text: ColorRN?
-    let contrastingText: ColorRN?
-    let borders: ColorRN?
-    let disabled: ColorRN?
-    let error: ColorRN?
+    let mainColor: ColorRN? // primary
+    let contrastingColor: ColorRN? // ???
+    let background: ColorRN? // light
+    let text: ColorRN? // primary
+    let contrastingText: ColorRN? // ??
+    let borders: ColorRN? // ??
+    let disabled: ColorRN? // lightGray
+    let error: ColorRN? // error
 }
 
 extension ColorThemeRN {

package/ios/Sources/Headless Universal Checkout/Managers/Klarna/PrimerRNHeadlessUniversalCheckoutKlarnaComponent.swift

@@ -12,7 +12,9 @@ import PrimerSDK
 @objc(RNTPrimerHeadlessUniversalCheckoutKlarnaComponent)
 class RNTPrimerHeadlessUniversalCheckoutKlarnaComponent: RCTEventEmitter {
     
+#if canImport(PrimerKlarnaSDK)
     private var klarnaManager: PrimerHeadlessUniversalCheckout.KlarnaManager = PrimerHeadlessUniversalCheckout.KlarnaManager()
+#endif
     var klarnaComponent: (any KlarnaComponent)?
     var clientToken: String?
     
@@ -46,12 +48,21 @@ class RNTPrimerHeadlessUniversalCheckoutKlarnaComponent: RCTEventEmitter {
                     recoverySuggestion: "'intent' can be 'CHECKOUT' or 'VAULT'.")
                 throw err
             }
-            
+#if canImport(PrimerKlarnaSDK)
             klarnaComponent = try klarnaManager.provideKlarnaComponent(with: sessionIntent)
             klarnaComponent?.stepDelegate = self
             klarnaComponent?.errorDelegate = self
             klarnaComponent?.validationDelegate = self
-            
+#else
+            let err = RNTNativeError(
+                errorId: "native-ios",
+                errorDescription: "PrimerKlarnaSDK missing",
+                recoverySuggestion: "Check if PrimerKlarnaSDK is included in your Podfile")
+
+            throw err
+#endif
+
+
             resolver(nil)
         } catch {
             rejecter(error.rnError["errorId"]!, error.rnError["description"], error)

package/ios/Sources/Headless Universal Checkout/Managers/RNTRedirectManager.swift

@@ -180,4 +180,3 @@ extension RNTPrimerHeadlessUniversalCheckoutBanksComponent: PrimerHeadlessErrora
             body: serializedData)
     }
 }
-

package/ios/Sources/Headless Universal Checkout/RNTPrimerHeadlessUniversalCheckout.swift

@@ -63,11 +63,11 @@ enum PrimerHeadlessUniversalCheckoutEvents: Int, CaseIterable {
 @objc(PrimerHeadlessUniversalCheckout)
 class RNTPrimerHeadlessUniversalCheckout: RCTEventEmitter {
 
-    private var settings: PrimerSettings?
-    private var primerWillCreatePaymentWithDataDecisionHandler: ((_ errorMessage: String?) -> Void)?
-    private var primerDidTokenizePaymentMethodDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
-    private var primerDidResumeWithDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
-    private var implementedRNCallbacks: ImplementedRNCallbacks?
+    var settings: PrimerSettings?
+    var primerWillCreatePaymentWithDataDecisionHandler: ((_ errorMessage: String?) -> Void)?
+    var primerDidTokenizePaymentMethodDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
+    var primerDidResumeWithDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
+    var implementedRNCallbacks: ImplementedRNCallbacks?
 
     override class func requiresMainQueueSetup() -> Bool {
         return true

package/ios/Sources/RNTPrimer.swift

@@ -55,11 +55,11 @@ enum PrimerEvents: Int, CaseIterable {
 @objc(NativePrimer)
 class RNTPrimer: RCTEventEmitter {
 
-    private var primerWillCreatePaymentWithDataDecisionHandler: ((_ errorMessage: String?) -> Void)?
-    private var primerDidTokenizePaymentMethodDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
-    private var primerDidResumeWithDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
-    private var primerDidFailWithErrorDecisionHandler: ((_ errorMessage: String) -> Void)?
-    private var implementedRNCallbacks: ImplementedRNCallbacks?
+    var primerWillCreatePaymentWithDataDecisionHandler: ((_ errorMessage: String?) -> Void)?
+    var primerDidTokenizePaymentMethodDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
+    var primerDidResumeWithDecisionHandler: ((_ resumeToken: String?, _ errorMessage: String?) -> Void)?
+    var primerDidFailWithErrorDecisionHandler: ((_ errorMessage: String) -> Void)?
+    var implementedRNCallbacks: ImplementedRNCallbacks?
 
     // MARK: - INITIALIZATION & REACT NATIVE SUPPORT
 
@@ -291,13 +291,17 @@ class RNTPrimer: RCTEventEmitter {
             var body: [String: Any] = ["error": error.rnError]
             if let checkoutData = checkoutData,
                let data = try? JSONEncoder().encode(checkoutData),
-               let json = try? JSONSerialization.jsonObject(with: data){
+               let json = try? JSONSerialization.jsonObject(with: data) {
                 body["checkoutData"] = json
             }
-            print(body)
-            self.sendEvent(withName: PrimerEvents.onError.stringValue, body: body)
+            if self.bridge != nil {
+                self.sendEvent(withName: PrimerEvents.onError.stringValue, body: body)
+            } else {
+                print("Bridge is not set")
+            }
         }
     }
+
 }
 
 // MARK: - PRIMER DELEGATE

package/ios/Sources/version.swift

@@ -1,2 +1,2 @@
 // swiftlint:disable:next identifier_name
-public let PrimerReactNativeSDKVersion = "2.22.0"
+public let PrimerReactNativeSDKVersion = "2.24.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer-io/react-native",
-  "version": "2.22.0",
+  "version": "2.24.0",
   "description": "Primer SDK for RN",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -58,11 +58,12 @@
     "eslint-config-prettier": "^7.0.0",
     "eslint-plugin-prettier": "^3.1.3",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^29.7.0",
     "pod-install": "^0.1.0",
     "prettier": "^2.4.1",
     "react-native-builder-bob": "^0.20.1",
     "release-it": "^15.5.0",
+    "ts-jest": "^29.1.2",
     "typescript": "4.8.4"
   },
   "peerDependencies": {
@@ -72,13 +73,6 @@
   "engines": {
     "node": ">=16"
   },
-  "jest": {
-    "preset": "react-native",
-    "modulePathIgnorePatterns": [
-      "<rootDir>/example/node_modules",
-      "<rootDir>/lib/"
-    ]
-  },
   "release-it": {
     "git": {
       "commitMessage": "chore: release ${version}",
@@ -141,6 +135,7 @@
     ]
   },
   "dependencies": {
+    "nyc": "^15.1.0",
     "uuid": "^8.3.2"
   }
 }

package/primer-io-react-native.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "PrimerSDK", "2.26.0"
+  s.dependency "PrimerSDK", "2.26.4"
 end