@jimrising/easymerchantsdk-react-native 2.3.7 → 2.3.9

package/README.md

@@ -19,7 +19,7 @@ Add the EasyMerchant SDK to your `package.json` under `dependencies`:
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^2.3.7"
+  "@jimrising/easymerchantsdk-react-native": "^2.3.9"
 }
 ```
 

package/android/build.gradle

@@ -1,56 +1,99 @@
-
 buildscript {
+    ext.kotlinVersion = "1.9.10"
+
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath "com.android.tools.build:gradle:8.13.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "23.0.1"
+    namespace = "com.reactlibrary"
+    compileSdk = 36
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 34
-        versionCode 1
-        versionName "1.0"
+        minSdk = 16
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
     }
-    lintOptions {
+
+    lint {
         abortOnError false
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    sourceSets {
+        main { java.srcDirs += "src/main/kotlin" }
+        test { java.srcDirs += "src/test/kotlin" }
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+                outputs.upToDateWhen { false }
+                showStandardStreams = true
+            }
+        }
+    }
 }
 
 repositories {
+    google()
     mavenCentral()
     maven { url 'https://jitpack.io' }
     maven {
         url = uri("https://maven.pkg.github.com/EasyMerchant/em-MobileCheckoutSDK-Android")
         credentials {
             username = "EasyMerchant"
-            password = "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"
+            password = "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"
         }
     }
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.6.1.4'
-    implementation 'com.hbb20:ccp:2.7.3'
-    implementation 'com.github.bumptech.glide:glide:4.16.0'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
-    implementation 'com.github.androidmads:QRGenerator:1.0.1'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'com.facebook.react:react-native:+'
+    implementation "com.facebook.react:react-native:+" // RN runtime
+
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
+
+    // AndroidX / Jetpack
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.activity:activity:1.11.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'com.google.android.material:material:1.13.0'
+
+    // Third-party libs
+    implementation 'com.app:paysdk:1.6.3.4'
+    implementation 'com.hbb20:ccp:2.7.3'
+    implementation 'com.github.bumptech.glide:glide:5.0.4'
+    implementation 'com.github.androidmads:QRGenerator:1.0.5'
+
+    // Unit testing
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation("org.mockito:mockito-core:5.0.0")
 }
-  

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,2 @@
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactlibrary">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
-  

package/ios/Models/Request.swift

@@ -169,8 +169,8 @@ public final class Request: NSObject {
     public let referenceID: Bool?
     public let referenceToken: String?
     public let isEmail: Bool?
-    public let email: String?
-    public let name: String?
+    public var email: String?
+    public var name: String?
     
     public let clientToken: String?
     
@@ -354,7 +354,7 @@ public final class Request: NSObject {
                savedIsRecurring == "1" {
                 
                 self.is_recurring = true
-                print("Recurring enabled (clientToken flow) → is_recurring = \(self.is_recurring ?? false)")
+               // print("Recurring enabled (clientToken flow) → is_recurring = \(self.is_recurring ?? false)")
                 
                 if let cycles = UserStoreSingleton.shared.allowCycles,
                    let num = Int(cycles) {
@@ -969,7 +969,7 @@ public final class Request: NSObject {
                                 } else {
                                     self.is_recurring = false
                                 }
-
+                                
                                 if let paymentIntentId = recurringDetails["payment_intent_id"] {
                                     UserStoreSingleton.shared.paymentIntentId = "\(paymentIntentId)"
                                     print("Saved payment_intent_id: \(paymentIntentId)")
@@ -986,6 +986,41 @@ public final class Request: NSObject {
                                 self.is_recurring = false
                                 UserStoreSingleton.shared.isRecurring = "0"
                             }
+                             
+                            // Save customer details
+                            if let customer = dataObject["customer"] as? [String: Any] {
+                                if let customerId = customer["customer_id"] as? String {
+                                    UserStoreSingleton.shared.customerId = customerId
+                                    print("Saved customer_id: \(customerId)")
+                                }
+                                
+                                if let customerToken = customer["customer_token"] as? String {
+                                    UserStoreSingleton.shared.customerToken = customerToken
+                                    print("Saved customer_token: \(customerToken)")
+                                }
+                                
+                                if let customerEmail = customer["email_address"] as? String {
+                                    UserStoreSingleton.shared.customerEmail = customerEmail
+                                    print("Saved customer email: \(customerEmail)")
+                                    self.email = customerEmail
+                                }
+                                
+                                if let customerName = customer["name"] as? String {
+                                    UserStoreSingleton.shared.customerName = customerName
+                                    print("Saved customer name: \(customerName)")
+                                    self.name = customerName
+                                }
+                            }
+
+                            // ✅ Set isLoggedIn based on availability
+                            if let id = UserStoreSingleton.shared.customerId, !id.isEmpty ||
+                               (UserStoreSingleton.shared.customerToken != nil && !(UserStoreSingleton.shared.customerToken?.isEmpty ?? true)) {
+                                UserStoreSingleton.shared.isLoggedIn = true
+                                print("User is logged in")
+                            } else {
+                                UserStoreSingleton.shared.isLoggedIn = false
+                                print("User is not logged in")
+                            }
 
                             if self.appearanceSettings == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 UserStoreSingleton.shared.body_bg_col = appearanceSettings["body_bg_col"] as? String

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.3.7'
+  s.version          = '2.3.9'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/ios/easymerchantsdk.storyboard

@@ -2910,7 +2910,7 @@
                                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wBs-bW-IlA">
                                                                                         <rect key="frame" x="0.0" y="24.333333333333371" width="172.66666666666666" height="50"/>
                                                                                         <subviews>
-                                                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YYYY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dwB-uJ-vVL">
+                                                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dwB-uJ-vVL">
                                                                                                 <rect key="frame" x="12" y="0.0" width="148.66666666666666" height="50"/>
                                                                                                 <color key="tintColor" name="G_000000"/>
                                                                                                 <fontDescription key="fontDescription" name="Inter-Regular" family="Inter" pointSize="16"/>
@@ -3534,16 +3534,16 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="vXF-kb-KuF">
-                                                                        <rect key="frame" x="103" y="12.666666666666515" width="181" height="40"/>
+                                                                        <rect key="frame" x="103" y="12.666666666666515" width="166" height="40"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vca-sp-HvQ">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="181" height="18"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="166" height="18"/>
                                                                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                                                                 <nil key="textColor"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uke-OI-f2G">
-                                                                                <rect key="frame" x="0.0" y="23" width="181" height="17"/>
+                                                                                <rect key="frame" x="0.0" y="23" width="166" height="17"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <nil key="highlightedColor"/>
@@ -3551,9 +3551,9 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oH7-mm-DxB">
-                                                                        <rect key="frame" x="294" y="17.666666666666515" width="55" height="30"/>
+                                                                        <rect key="frame" x="279" y="17.666666666666515" width="70" height="30"/>
                                                                         <constraints>
-                                                                            <constraint firstAttribute="width" constant="55" id="pWe-dl-0hT"/>
+                                                                            <constraint firstAttribute="width" constant="70" id="pWe-dl-0hT"/>
                                                                             <constraint firstAttribute="height" constant="30" id="yZi-2E-b8X"/>
                                                                         </constraints>
                                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
@@ -3979,7 +3979,7 @@
                                                                             <constraint firstAttribute="height" constant="35" id="J6m-2L-6Ti"/>
                                                                         </constraints>
                                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                                        <state key="normal" image="circle" catalog="system">
+                                                                        <state key="normal" image="circle.inset.filled" catalog="system">
                                                                             <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="18"/>
                                                                         </state>
                                                                         <state key="selected" image="circle.inset.filled" catalog="system">
@@ -4075,7 +4075,7 @@
                                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JcZ-JP-XpP">
                                                                                                 <rect key="frame" x="0.0" y="24.333333333333485" width="172.66666666666666" height="50"/>
                                                                                                 <subviews>
-                                                                                                    <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YYYY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6bS-xy-xdJ">
+                                                                                                    <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6bS-xy-xdJ">
                                                                                                         <rect key="frame" x="12" y="0.0" width="148.66666666666666" height="50"/>
                                                                                                         <color key="tintColor" name="G_000000"/>
                                                                                                         <fontDescription key="fontDescription" name="Inter-Regular" family="Inter" pointSize="16"/>
@@ -4494,7 +4494,7 @@
                                                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SBL-4j-yn1">
                                                                                         <rect key="frame" x="0.0" y="24.333333333333485" width="172.66666666666666" height="50"/>
                                                                                         <subviews>
-                                                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YYYY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WJr-2D-4Xq">
+                                                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="MM/YY" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WJr-2D-4Xq">
                                                                                                 <rect key="frame" x="12" y="0.0" width="148.66666666666666" height="50"/>
                                                                                                 <color key="tintColor" name="G_000000"/>
                                                                                                 <fontDescription key="fontDescription" name="Inter-Regular" family="Inter" pointSize="16"/>
@@ -6728,16 +6728,16 @@
                                                                         </constraints>
                                                                     </imageView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="TP7-nA-i1d">
-                                                                        <rect key="frame" x="103" y="12.66666666666606" width="181" height="40"/>
+                                                                        <rect key="frame" x="103" y="12.66666666666606" width="166" height="40"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iLL-1y-m92">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="181" height="18"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="166" height="18"/>
                                                                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                                                                 <nil key="textColor"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="clF-so-8Bs">
-                                                                                <rect key="frame" x="0.0" y="23" width="181" height="17"/>
+                                                                                <rect key="frame" x="0.0" y="23" width="166" height="17"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <nil key="highlightedColor"/>
@@ -6745,10 +6745,10 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="79U-1D-Otj">
-                                                                        <rect key="frame" x="294" y="17.66666666666606" width="55" height="30"/>
+                                                                        <rect key="frame" x="279" y="17.66666666666606" width="70" height="30"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="30" id="Vbw-VF-17o"/>
-                                                                            <constraint firstAttribute="width" constant="55" id="lXu-UD-7bV"/>
+                                                                            <constraint firstAttribute="width" constant="70" id="lXu-UD-7bV"/>
                                                                         </constraints>
                                                                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -8371,6 +8371,7 @@
                         <outlet property="grailPayBankLinkView" destination="BY8-dY-11P" id="zBG-vo-jck"/>
                         <outlet property="grailPayNewSavedAccountView" destination="3Iv-RN-hhn" id="F0X-Jk-TCN"/>
                         <outlet property="heightSubViewNewAccountFields" destination="DIa-fY-yel" id="FMd-aQ-YOV"/>
+                        <outlet property="heightViewAbandonNewGrailPayAccountView" destination="9eY-ix-Jag" id="rfc-Iv-3dx"/>
                         <outlet property="heightViewBankFields" destination="ZgA-Fo-gO9" id="RHr-Hz-9jt"/>
                         <outlet property="heightViewNewAccountFields" destination="ruC-RR-kfQ" id="wga-bX-u6d"/>
                         <outlet property="heightViewNewCardFields" destination="Jnp-me-gJo" id="pRI-Ke-N6f"/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "2.3.7",
+  "version": "2.3.9",
   "description": "",
   "main": "index.js",
   "scripts": {