react-amwal-pay 0.1.11 → 0.1.13

package/README.md

@@ -4,11 +4,78 @@ A React Native library for integrating Amwal Pay payment gateway into your React
 
 ## Installation
 
+### Prerequisites
+
+- React Native project (0.79+)
+- Node.js 18 or higher
+- iOS: Xcode and CocoaPods installed
+- Android: Android Studio and JDK installed
+
+### Step 1: Install the Package
+
 ```sh
 npm install react-amwal-pay
+# or
+yarn add react-amwal-pay
+```
+
+### Step 2: Configure React Native (Required)
+
+Create or update `react-native.config.js` in your project root:
+
+```javascript
+const path = require('path');
+const pkg = require('react-amwal-pay/package.json');
+
+module.exports = {
+  project: {
+    ios: {
+      automaticPodsInstallation: true,
+    },
+  },
+  dependencies: {
+    [pkg.name]: {
+      root: path.join(__dirname, 'node_modules/react-amwal-pay'),
+      platforms: {
+        ios: {},
+        android: {},
+      },
+    },
+  },
+};
+```
+
+### Step 3: iOS Setup
+
+#### 3.1 Update Podfile
+
+Add the following configuration to your `ios/Podfile` inside the `post_install` block:
+
+```ruby
+post_install do |installer|
+  react_native_post_install(installer, config[:reactNativePath])
+  
+  # Set "Build Libraries for Distribution" to NO for amwalsdk
+  installer.pods_project.targets.each do |target|
+    if target.name == 'amwalsdk'
+      target.build_configurations.each do |config|
+        config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'NO'
+        config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'x86_64'
+      end
+    end
+  end
+end
 ```
 
-### iOS Installation Note
+#### 3.2 Install Pods
+
+```bash
+cd ios
+pod install
+cd ..
+```
+
+#### 3.3 iOS Build Setting (Manual Step)
 
 After pod installation, you need to set "Build Libraries for Distribution" to NO in Xcode:
 
@@ -20,7 +87,7 @@ After pod installation, you need to set "Build Libraries for Distribution" to NO
 
 ![Build Libraries Setting](https://github.com/amwal-pay/AnwalPaySDKReactNative/raw/master/docs/images/ios_install_note.png)
 
-#### Configuring amwalsdk Subspec
+#### 3.4 Configuring amwalsdk Subspec (Optional)
 
 The library uses amwalsdk as a dependency and supports both Release and Debug subspecs. By default, it uses the Debug subspec. To change this, you can set the `AMWAL_SUBSPEC` environment variable in your Podfile:
 
@@ -35,6 +102,45 @@ Or you can set it when running pod install:
 AMWAL_SUBSPEC=Release pod install
 ```
 
+### Step 4: Android Setup
+
+No additional Android configuration is required. The SDK uses React Native's autolinking feature.
+
+**Note:** The SDK requires minimum SDK 24 (Android 7.0). Ensure your `android/build.gradle` has:
+
+```gradle
+minSdkVersion = 24
+```
+
+### Step 5: Clean and Rebuild
+
+After installation, clean and rebuild your project:
+
+```bash
+# iOS
+cd ios
+rm -rf Pods Podfile.lock
+pod install
+cd ..
+
+# Android
+cd android
+./gradlew clean
+cd ..
+
+# Rebuild your app
+npm run ios
+# or
+npm run android
+```
+
+### Troubleshooting
+
+- **Pods fail to install**: Clean pods and reinstall (`rm -rf Pods Podfile.lock && pod install`)
+- **Linking issues**: Ensure `react-native.config.js` is in your project root
+- **Build errors**: Clean build folders and rebuild your project
+- **iOS build errors**: Verify that "Build Libraries for Distribution" is set to NO for amwalsdk target
+
 ## Usage
 
 ```js
@@ -61,6 +167,7 @@ const config: AmwalPayConfig = {
   customerId: 'customer-id', // optional
   sessionToken: 'your-session-token', // optional
   transactionId: 'custom-transaction-id', // optional: auto-generated if not provided
+  merchantReference: 'optional-merchant-reference', // optional: merchant reference for transaction tracking
   additionValues: { // optional: custom key-value pairs for SDK configuration
     merchantIdentifier: 'merchant.applepay.amwalpay', // for Apple Pay configuration
     customKey: 'customValue' // add more as needed
@@ -165,6 +272,7 @@ The `AmwalPayConfig` interface includes the following properties:
 - `customerId`: (Optional) The customer's ID
 - `sessionToken`: (Optional) Your session token
 - `transactionId`: (Optional) Unique transaction identifier - auto-generated if not provided
+- `merchantReference`: (Optional) Merchant reference for transaction tracking
 - `additionValues`: (Optional) Custom key-value pairs for SDK configuration (includes merchantIdentifier for Apple Pay)
 - `onCustomerId`: (Optional) Callback function for customer ID updates
 - `onResponse`: (Optional) Callback function for payment response

package/android/src/main/java/com/reactamwalpay/ReactAmwalPayModule.kt

@@ -17,32 +17,61 @@ class ReactAmwalPayModule(reactContext: ReactApplicationContext) :
     return NAME
   }
 
- 
-  
-  private fun sendEvent(eventName: String, params: WritableMap?) {
+  private fun sendEvent(eventName: String, params: Any?) {
     reactApplicationContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
       .emit(eventName, params)
   }
+
+  private fun emitOnResponse(params: WritableMap) {
+    sendEvent("onResponse", params)
+  }
+
+  private fun emitOnCustomerId(customerId: String?) {
+    sendEvent("onCustomerId", customerId)
+  }
+
+  override fun addListener(eventName: String?) {
+    // Required for RN built in Event Emitter Calls.
+  }
+
+  override fun removeListeners(count: Double) {
+    // Required for RN built in Event Emitter Calls.
+  }
   
   override fun initiate(config: ReadableMap) {
     Log.d(NAME, "initiate called")
     val activity = reactApplicationContext.currentActivity
     if (activity == null) {
-      // Since we can't use Promise here (method signature must match the spec),
-      // we'll send an error event
       val params = Arguments.createMap()
-      params.putString("type", "onResponse")
       val errorData = Arguments.createMap()
       errorData.putString("status", "ERROR")
       errorData.putString("message", "Activity context is not available")
       params.putMap("data", errorData)
-      sendEvent("AmwalPayEvent", params)
+      emitOnResponse(params)
       return
     }
     
     Log.d(NAME, "initiate got here")
     try {
+      // Handle additionValues map
+      val additionValues = if (config.hasKey("additionValues")) {
+        val additionValuesMap = config.getMap("additionValues")
+        val map = mutableMapOf<String, String>()
+        additionValuesMap?.let { readableMap ->
+          val iterator = readableMap.keySetIterator()
+          while (iterator.hasNextKey()) {
+            val key = iterator.nextKey()
+            readableMap.getString(key)?.let { value ->
+              map[key] = value
+            }
+          }
+        }
+        map.toMap()
+      } else {
+        AmwalSDK.Config.generateDefaultAdditionValues()
+      }
+
       val sdkConfig = AmwalSDK.Config(
         environment = AmwalSDK.Config.Environment.valueOf(config.getString("environment") ?: ""),
         sessionToken = config.getString("sessionToken") ?: "",
@@ -52,7 +81,10 @@ class ReactAmwalPayModule(reactContext: ReactApplicationContext) :
         terminalId = config.getString("terminalId") ?: "",
         locale = java.util.Locale(config.getString("locale") ?: "en"),
         customerId = if (config.hasKey("customerId")) config.getString("customerId") else null,
-        transactionType = AmwalSDK.Config.TransactionType.valueOf(config.getString("transactionType") ?: "")
+        transactionType = AmwalSDK.Config.TransactionType.valueOf(config.getString("transactionType") ?: ""),
+        transactionId = if (config.hasKey("transactionId")) config.getString("transactionId") else AmwalSDK.Config.generateTransactionId(),
+        additionValues = additionValues,
+        merchantReference = if (config.hasKey("merchantReference")) config.getString("merchantReference") else null
       )
       
       // Ensure this runs on the UI thread
@@ -81,12 +113,11 @@ class ReactAmwalPayModule(reactContext: ReactApplicationContext) :
     } catch (e: Exception) {
       Log.e(NAME, "Error initializing AmwalSDK", e)
       val params = Arguments.createMap()
-      params.putString("type", "onResponse")
       val errorData = Arguments.createMap()
       errorData.putString("status", "ERROR")
       errorData.putString("message", e.message ?: "Unknown error")
       params.putMap("data", errorData)
-      sendEvent("AmwalPayEvent", params)
+      emitOnResponse(params)
     }
   }
 

package/ios/ReactAmwalPay.swift

@@ -42,6 +42,15 @@ class ReactAmwalPay: RCTEventEmitter {
     private var onResponseCallback: RCTResponseSenderBlock?
     private var onCustomerIdCallback: RCTResponseSenderBlock?
     private func prepareConfig(config: [String: Any]) -> Config {
+        // Handle additionValues
+        var additionValues: [String: String] = Config.generateDefaultAdditionValues()
+        if let configAdditionValues = config["additionValues"] as? [String: String] {
+            // Merge with default values, allowing override
+            for (key, value) in configAdditionValues {
+                additionValues[key] = value
+            }
+        }
+        
         return Config(
             environment: mapEnvironment(environment: config["environment"] as? String ?? "PROD"),
             sessionToken: config["sessionToken"] as? String ?? "",
@@ -51,7 +60,10 @@ class ReactAmwalPay: RCTEventEmitter {
             terminalId: config["terminalId"] as? String ?? "",
             customerId: config["customerId"] as? String,
             locale: mapLocale(locale: config["locale"] as? String ?? "en"),
-            transactionType: mapTransactionType(transactionType: config["transactionType"] as? String ?? "CARD_WALLET")
+            transactionType: mapTransactionType(transactionType: config["transactionType"] as? String ?? "CARD_WALLET"),
+            transactionId: config["transactionId"] as? String ?? Config.generateTransactionId(),
+            additionValues: additionValues,
+            merchantReference: config["merchantReference"] as? String
         )
     }
     

package/lib/module/AmwalPaySDK.js

@@ -28,7 +28,9 @@ class AmwalPaySDK {
       const networkClient = NetworkClient.getInstance();
 
       // Fetch session token
+      console.log('Fetching session token for environment:', config.environment);
       const sessionToken = await networkClient.fetchSessionToken(config.environment, config.merchantId, config.customerId, config.secureHash);
+      console.log('Session token result:', sessionToken ? 'Success' : 'Failed');
       if (!sessionToken) {
         // If session token is null, the error has already been shown by NetworkClient
         return;
@@ -41,6 +43,7 @@ class AmwalPaySDK {
       };
 
       // Initiate the payment process
+      console.log('Initiating native payment with config:', JSON.stringify(completeConfig));
       initiate(completeConfig);
     } catch (error) {
       console.error('Error starting payment:', error);

package/lib/module/AmwalPaySDK.js.map

@@ -1 +1 @@
-{"version":3,"names":["initiate","onCustomerId","onResponse","NetworkClient","AmwalPaySDK","onResponseSubscription","onCustomerIdSubscription","constructor","getInstance","instance","startPayment","config","setupEventListeners","networkClient","sessionToken","fetchSessionToken","environment","merchantId","customerId","secureHash","completeConfig","error","console","dispose","removeEventListeners","response","log","remove"],"sourceRoot":"../../src","sources":["AmwalPaySDK.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,UAAU,QAA6B,YAAS;AACjF,OAAOC,aAAa,MAAM,4BAAyB;AAInD,MAAMC,WAAW,CAAC;EAGRC,sBAAsB,GAA2B,IAAI;EAErDC,wBAAwB,GAA2B,IAAI;EAEvDC,WAAWA,CAAA,EAAG;IACpB;EAAA;EAIF,OAAOC,WAAWA,CAAA,EAAgB;IAChC,IAAI,CAACJ,WAAW,CAACK,QAAQ,EAAE;MACzBL,WAAW,CAACK,QAAQ,GAAG,IAAIL,WAAW,CAAC,CAAC;IAC1C;IACA,OAAOA,WAAW,CAACK,QAAQ;EAC7B;;EAEA;AACF;AACA;AACA;EACE,MAAMC,YAAYA,CAACC,MAA4C,EAAiB;IAC9E,IAAI;MACF;MACA,IAAI,CAACC,mBAAmB,CAACD,MAAM,CAAC;;MAEhC;MACA,MAAME,aAAa,GAAGV,aAAa,CAACK,WAAW,CAAC,CAAC;;MAEjD;MACA,MAAMM,YAAY,GAAG,MAAMD,aAAa,CAACE,iBAAiB,CACxDJ,MAAM,CAACK,WAAW,EAClBL,MAAM,CAACM,UAAU,EACjBN,MAAM,CAACO,UAAU,EACjBP,MAAM,CAACQ,UACT,CAAC;MAED,IAAI,CAACL,YAAY,EAAE;QACjB;QACA;MACF;;MAEA;MACA,MAAMM,cAA8B,GAAG;QACrC,GAAGT,MAAM;QACTG;MACF,CAAC;;MAED;MACAd,QAAQ,CAACoB,cAAc,CAAC;IAC1B,CAAC,CAAC,OAAOC,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,yBAAyB,EAAEA,KAAK,CAAC;IACjD;EACF;EAEAE,OAAOA,CAAA,EAAS;IACd;IACA,IAAI,CAACC,oBAAoB,CAAC,CAAC;EAC7B;;EAEA;AACF;AACA;AACA;EACUZ,mBAAmBA,CAACD,MAA4C,EAAQ;IAC9E;IACA,IAAI,CAACa,oBAAoB,CAAC,CAAC;IAE3B,IAAI,CAACnB,sBAAsB,GAAGH,UAAU,CAAEuB,QAAQ,IAAK;MACrDH,OAAO,CAACI,GAAG,CAAC,4BAA4B,EAAED,QAAQ,CAAC;MACnDd,MAAM,CAACT,UAAU,CAACuB,QAAQ,CAAC;IAC7B,CAAC,CAAC;IAEF,IAAI,CAACnB,wBAAwB,GAAGL,YAAY,CAAEiB,UAAU,IAAK;MAC3DI,OAAO,CAACI,GAAG,CAAC,sBAAsB,EAAER,UAAU,CAAC;MAC/CP,MAAM,CAACV,YAAY,CAACiB,UAAU,CAAC;IACjC,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACUM,oBAAoBA,CAAA,EAAS;IACnC,IAAI,CAACnB,sBAAsB,EAAEsB,MAAM,CAAC,CAAC;IACrC,IAAI,CAACrB,wBAAwB,EAAEqB,MAAM,CAAC,CAAC;IACvC,IAAI,CAACtB,sBAAsB,GAAG,IAAI;IAClC,IAAI,CAACC,wBAAwB,GAAG,IAAI;EACtC;AACF;AAEA,eAAeF,WAAW","ignoreList":[]}
+{"version":3,"names":["initiate","onCustomerId","onResponse","NetworkClient","AmwalPaySDK","onResponseSubscription","onCustomerIdSubscription","constructor","getInstance","instance","startPayment","config","setupEventListeners","networkClient","console","log","environment","sessionToken","fetchSessionToken","merchantId","customerId","secureHash","completeConfig","JSON","stringify","error","dispose","removeEventListeners","response","remove"],"sourceRoot":"../../src","sources":["AmwalPaySDK.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,YAAY,EAAEC,UAAU,QAA6B,YAAS;AACjF,OAAOC,aAAa,MAAM,4BAAyB;AAInD,MAAMC,WAAW,CAAC;EAGRC,sBAAsB,GAA6B,IAAI;EAEvDC,wBAAwB,GAA6B,IAAI;EAEzDC,WAAWA,CAAA,EAAG;IACpB;EAAA;EAIF,OAAOC,WAAWA,CAAA,EAAgB;IAChC,IAAI,CAACJ,WAAW,CAACK,QAAQ,EAAE;MACzBL,WAAW,CAACK,QAAQ,GAAG,IAAIL,WAAW,CAAC,CAAC;IAC1C;IACA,OAAOA,WAAW,CAACK,QAAQ;EAC7B;;EAEA;AACF;AACA;AACA;EACE,MAAMC,YAAYA,CAACC,MAA4C,EAAiB;IAC9E,IAAI;MACF;MACA,IAAI,CAACC,mBAAmB,CAACD,MAAM,CAAC;;MAEhC;MACA,MAAME,aAAa,GAAGV,aAAa,CAACK,WAAW,CAAC,CAAC;;MAEjD;MACAM,OAAO,CAACC,GAAG,CAAC,yCAAyC,EAAEJ,MAAM,CAACK,WAAW,CAAC;MAC1E,MAAMC,YAAY,GAAG,MAAMJ,aAAa,CAACK,iBAAiB,CACxDP,MAAM,CAACK,WAAW,EAClBL,MAAM,CAACQ,UAAU,EACjBR,MAAM,CAACS,UAAU,EACjBT,MAAM,CAACU,UACT,CAAC;MAEDP,OAAO,CAACC,GAAG,CAAC,uBAAuB,EAAEE,YAAY,GAAG,SAAS,GAAG,QAAQ,CAAC;MAEzE,IAAI,CAACA,YAAY,EAAE;QACjB;QACA;MACF;;MAEA;MACA,MAAMK,cAA8B,GAAG;QACrC,GAAGX,MAAM;QACTM;MACF,CAAC;;MAED;MACAH,OAAO,CAACC,GAAG,CAAC,wCAAwC,EAAEQ,IAAI,CAACC,SAAS,CAACF,cAAc,CAAC,CAAC;MACrFtB,QAAQ,CAACsB,cAAc,CAAC;IAC1B,CAAC,CAAC,OAAOG,KAAK,EAAE;MACdX,OAAO,CAACW,KAAK,CAAC,yBAAyB,EAAEA,KAAK,CAAC;IACjD;EACF;EAEAC,OAAOA,CAAA,EAAS;IACd;IACA,IAAI,CAACC,oBAAoB,CAAC,CAAC;EAC7B;;EAEA;AACF;AACA;AACA;EACUf,mBAAmBA,CAACD,MAA4C,EAAQ;IAC9E;IACA,IAAI,CAACgB,oBAAoB,CAAC,CAAC;IAE3B,IAAI,CAACtB,sBAAsB,GAAGH,UAAU,CAAE0B,QAAQ,IAAK;MACrDd,OAAO,CAACC,GAAG,CAAC,4BAA4B,EAAEa,QAAQ,CAAC;MACnDjB,MAAM,CAACT,UAAU,CAAC0B,QAAQ,CAAC;IAC7B,CAAC,CAAC;IAEF,IAAI,CAACtB,wBAAwB,GAAGL,YAAY,CAAEmB,UAAU,IAAK;MAC3DN,OAAO,CAACC,GAAG,CAAC,sBAAsB,EAAEK,UAAU,CAAC;MAC/CT,MAAM,CAACV,YAAY,CAACmB,UAAU,CAAC;IACjC,CAAC,CAAC;EACJ;;EAEA;AACF;AACA;EACUO,oBAAoBA,CAAA,EAAS;IACnC,IAAI,CAACtB,sBAAsB,EAAEwB,MAAM,CAAC,CAAC;IACrC,IAAI,CAACvB,wBAAwB,EAAEuB,MAAM,CAAC,CAAC;IACvC,IAAI,CAACxB,sBAAsB,GAAG,IAAI;IAClC,IAAI,CAACC,wBAAwB,GAAG,IAAI;EACtC;AACF;AAEA,eAAeF,WAAW","ignoreList":[]}

package/lib/module/NativeReactAmwalPay.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","Environment","Currency","TransactionType","getEnforcing"],"sourceRoot":"../../src","sources":["NativeReactAmwalPay.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AAGlD,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAMvB,WAAYC,QAAQ,0BAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA;AAIpB,WAAYC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;;AAY3B;;AAkBA;;AAuBA,eAAeH,mBAAmB,CAACI,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","Environment","Currency","TransactionType","getEnforcing"],"sourceRoot":"../../src","sources":["NativeReactAmwalPay.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AAElD,WAAYC,WAAW,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;AAMvB,WAAYC,QAAQ,0BAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA;AAIpB,WAAYC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;;AAY3B;;AAmBA;;AAwBA,eAAeH,mBAAmB,CAACI,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}

package/lib/module/index.js

@@ -3,8 +3,10 @@
 import ReactAmwalPay, { Environment, Currency, TransactionType } from "./NativeReactAmwalPay.js";
 import AmwalPaySDK from "./AmwalPaySDK.js";
 import { UuidUtil } from "./utils/UuidUtil.js";
-// Create an event emitter for the native module
+import { NativeEventEmitter } from 'react-native';
 
+// Create an event emitter for the native module
+const eventEmitter = new NativeEventEmitter(ReactAmwalPay);
 export function initiate(config) {
   // Create default additionValues with merchantIdentifier for iOS if not provided
   const defaultAdditionValues = {
@@ -26,17 +28,18 @@ export function initiate(config) {
     transactionType: config.transactionType,
     sessionToken: config.sessionToken,
     transactionId: config.transactionId ?? UuidUtil.generateTransactionId(),
-    additionValues: finalAdditionValues
+    additionValues: finalAdditionValues,
+    merchantReference: config.merchantReference
   };
 
   // Call the native module
   ReactAmwalPay.initiate(nativeConfig);
 }
 export function onResponse(callback) {
-  return ReactAmwalPay.onResponse(callback);
+  return eventEmitter.addListener('onResponse', callback);
 }
 export function onCustomerId(callback) {
-  return ReactAmwalPay.onCustomerId(callback);
+  return eventEmitter.addListener('onCustomerId', callback);
 }
 export { Environment, Currency, TransactionType, AmwalPaySDK, UuidUtil };
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["ReactAmwalPay","Environment","Currency","TransactionType","AmwalPaySDK","UuidUtil","initiate","config","defaultAdditionValues","merchantIdentifier","finalAdditionValues","additionValues","nativeConfig","environment","secureHash","currency","amount","merchantId","terminalId","locale","customerId","transactionType","sessionToken","transactionId","generateTransactionId","onResponse","callback","onCustomerId"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,aAAa,IAClBC,WAAW,EACXC,QAAQ,EACRC,eAAe,QAIV,0BAAuB;AAC9B,OAAOC,WAAW,MAAM,kBAAe;AACvC,SAASC,QAAQ,QAAQ,qBAAkB;AAG3C;;AAEA,OAAO,SAASC,QAAQA,CAACC,MAAsB,EAAQ;EACrD;EACA,MAAMC,qBAAqB,GAAG;IAC5BC,kBAAkB,EAAE;EACtB,CAAC;EAED,MAAMC,mBAAmB,GAAG;IAC1B,GAAGF,qBAAqB;IACxB,GAAGD,MAAM,CAACI;EACZ,CAAC;EAED,MAAMC,YAAkC,GAAG;IACzCC,WAAW,EAAEN,MAAM,CAACM,WAAW;IAC/BC,UAAU,EAAEP,MAAM,CAACO,UAAU;IAC7BC,QAAQ,EAAER,MAAM,CAACQ,QAAQ;IACzBC,MAAM,EAAET,MAAM,CAACS,MAAM;IACrBC,UAAU,EAAEV,MAAM,CAACU,UAAU;IAC7BC,UAAU,EAAEX,MAAM,CAACW,UAAU;IAC7BC,MAAM,EAAEZ,MAAM,CAACY,MAAM;IACrBC,UAAU,EAAEb,MAAM,CAACa,UAAU;IAC7BC,eAAe,EAAEd,MAAM,CAACc,eAAe;IACvCC,YAAY,EAAEf,MAAM,CAACe,YAAY;IACjCC,aAAa,EAAEhB,MAAM,CAACgB,aAAa,IAAIlB,QAAQ,CAACmB,qBAAqB,CAAC,CAAC;IACvEb,cAAc,EAAED;EAClB,CAAC;;EAED;EACAV,aAAa,CAACM,QAAQ,CAACM,YAAY,CAAC;AACtC;AAEA,OAAO,SAASa,UAAUA,CAACC,QAA8C,EAAoB;EAC3F,OAAO1B,aAAa,CAACyB,UAAU,CAACC,QAAQ,CAAC;AAC3C;AACA,OAAO,SAASC,YAAYA,CAACD,QAAsC,EAAoB;EACrF,OAAO1B,aAAa,CAAC2B,YAAY,CAACD,QAAQ,CAAC;AAC7C;AAEA,SACEzB,WAAW,EACXC,QAAQ,EACRC,eAAe,EAGfC,WAAW,EACXC,QAAQ","ignoreList":[]}
+{"version":3,"names":["ReactAmwalPay","Environment","Currency","TransactionType","AmwalPaySDK","UuidUtil","NativeEventEmitter","eventEmitter","initiate","config","defaultAdditionValues","merchantIdentifier","finalAdditionValues","additionValues","nativeConfig","environment","secureHash","currency","amount","merchantId","terminalId","locale","customerId","transactionType","sessionToken","transactionId","generateTransactionId","merchantReference","onResponse","callback","addListener","onCustomerId"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,OAAOA,aAAa,IAClBC,WAAW,EACXC,QAAQ,EACRC,eAAe,QAIV,0BAAuB;AAC9B,OAAOC,WAAW,MAAM,kBAAe;AACvC,SAASC,QAAQ,QAAQ,qBAAkB;AAC3C,SACEC,kBAAkB,QAEb,cAAc;;AAErB;AACA,MAAMC,YAAY,GAAG,IAAID,kBAAkB,CAACN,aAAoB,CAAC;AAEjE,OAAO,SAASQ,QAAQA,CAACC,MAAsB,EAAQ;EACrD;EACA,MAAMC,qBAAqB,GAAG;IAC5BC,kBAAkB,EAAE;EACtB,CAAC;EAED,MAAMC,mBAAmB,GAAG;IAC1B,GAAGF,qBAAqB;IACxB,GAAGD,MAAM,CAACI;EACZ,CAAC;EAED,MAAMC,YAAkC,GAAG;IACzCC,WAAW,EAAEN,MAAM,CAACM,WAAW;IAC/BC,UAAU,EAAEP,MAAM,CAACO,UAAU;IAC7BC,QAAQ,EAAER,MAAM,CAACQ,QAAQ;IACzBC,MAAM,EAAET,MAAM,CAACS,MAAM;IACrBC,UAAU,EAAEV,MAAM,CAACU,UAAU;IAC7BC,UAAU,EAAEX,MAAM,CAACW,UAAU;IAC7BC,MAAM,EAAEZ,MAAM,CAACY,MAAM;IACrBC,UAAU,EAAEb,MAAM,CAACa,UAAU;IAC7BC,eAAe,EAAEd,MAAM,CAACc,eAAe;IACvCC,YAAY,EAAEf,MAAM,CAACe,YAAY;IACjCC,aAAa,EAAEhB,MAAM,CAACgB,aAAa,IAAIpB,QAAQ,CAACqB,qBAAqB,CAAC,CAAC;IACvEb,cAAc,EAAED,mBAAmB;IACnCe,iBAAiB,EAAElB,MAAM,CAACkB;EAC5B,CAAC;;EAED;EACA3B,aAAa,CAACQ,QAAQ,CAACM,YAAY,CAAC;AACtC;AAEA,OAAO,SAASc,UAAUA,CAACC,QAA8C,EAAqB;EAC5F,OAAOtB,YAAY,CAACuB,WAAW,CAAC,YAAY,EAAED,QAAQ,CAAC;AACzD;AACA,OAAO,SAASE,YAAYA,CAACF,QAAsC,EAAqB;EACtF,OAAOtB,YAAY,CAACuB,WAAW,CAAC,cAAc,EAAED,QAAQ,CAAC;AAC3D;AAEA,SACE5B,WAAW,EACXC,QAAQ,EACRC,eAAe,EAGfC,WAAW,EACXC,QAAQ","ignoreList":[]}

package/lib/typescript/src/AmwalPaySDK.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AmwalPaySDK.d.ts","sourceRoot":"","sources":["../../../src/AmwalPaySDK.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAKlF,cAAM,WAAW;IACf,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IAErC,OAAO,CAAC,sBAAsB,CAAgC;IAE9D,OAAO,CAAC,wBAAwB,CAAgC;IAEhE,OAAO;IAKP,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC;;;OAGG;IACG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC/E,OAAO,IAAI,IAAI;IAKf;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAe3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAM7B;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"AmwalPaySDK.d.ts","sourceRoot":"","sources":["../../../src/AmwalPaySDK.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,SAAS,CAAC;AAKlF,cAAM,WAAW;IACf,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAc;IAErC,OAAO,CAAC,sBAAsB,CAAkC;IAEhE,OAAO,CAAC,wBAAwB,CAAkC;IAElE,OAAO;IAKP,MAAM,CAAC,WAAW,IAAI,WAAW;IAOjC;;;OAGG;IACG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC/E,OAAO,IAAI,IAAI;IAKf;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAe3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;CAM7B;AAED,eAAe,WAAW,CAAC"}

package/lib/typescript/src/NativeReactAmwalPay.d.ts

@@ -1,5 +1,4 @@
 import type { TurboModule } from 'react-native';
-import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
 export declare enum Environment {
     SIT = "SIT",
     UAT = "UAT",
@@ -33,6 +32,7 @@ export interface AmwalPayConfig {
     additionValues?: {
         [key: string]: string;
     };
+    merchantReference?: string;
     onResponse: (response: AmwalPayResponse) => void;
     onCustomerId: (customerId: string) => void;
 }
@@ -51,11 +51,12 @@ export interface AmwalPayNativeConfig {
     additionValues?: {
         [key: string]: string;
     };
+    merchantReference?: string;
 }
 export interface Spec extends TurboModule {
     initiate(config: AmwalPayNativeConfig): void;
-    onResponse: EventEmitter<AmwalPayResponse>;
-    onCustomerId: EventEmitter<string>;
+    addListener(eventName: string): void;
+    removeListeners(count: number): void;
 }
 declare const _default: Spec;
 export default _default;

package/lib/typescript/src/NativeReactAmwalPay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeReactAmwalPay.d.ts","sourceRoot":"","sources":["../../../src/NativeReactAmwalPay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAE9E,oBAAY,WAAW;IACrB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAED,oBAAY,QAAQ;IAClB,GAAG,QAAQ;CACZ;AAED,oBAAY,eAAe;IACzB,GAAG,QAAO;IACV,WAAW,gBAAe;IAC1B,SAAS,cAAa;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,UAAU,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACjD,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAGD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IAEvC,QAAQ,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC7C,UAAU,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;CACpC;;AAED,wBAAuE"}
+{"version":3,"file":"NativeReactAmwalPay.d.ts","sourceRoot":"","sources":["../../../src/NativeReactAmwalPay.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,oBAAY,WAAW;IACrB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,IAAI,SAAS;CACd;AAED,oBAAY,QAAQ;IAClB,GAAG,QAAQ;CACZ;AAED,oBAAY,eAAe;IACzB,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,SAAS,cAAc;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,CAAC;IACjD,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAGD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC3C,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,IAAK,SAAQ,WAAW;IAEvC,QAAQ,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAC7C,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtC;;AAED,wBAAuE"}

package/lib/typescript/src/index.d.ts

@@ -1,7 +1,7 @@
 import { Environment, Currency, TransactionType, type AmwalPayResponse, type AmwalPayConfig } from './NativeReactAmwalPay';
 import AmwalPaySDK from './AmwalPaySDK';
 import { UuidUtil } from './utils/UuidUtil';
-import type { EventSubscription } from 'react-native';
+import { type EventSubscription } from 'react-native';
 export declare function initiate(config: AmwalPayConfig): void;
 export declare function onResponse(callback: (response: AmwalPayResponse) => void): EventSubscription;
 export declare function onCustomerId(callback: (customerId: string) => void): EventSubscription;

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAsB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAItD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA4BrD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,GAAE,iBAAiB,CAE3F;AACD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAE,iBAAiB,CAErF;AAED,OAAO,EACL,WAAW,EACX,QAAQ,EACR,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,WAAW,EACX,QAAQ,GACT,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAsB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AAKtB,wBAAgB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CA6BrD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,gBAAgB,KAAK,IAAI,GAAG,iBAAiB,CAE5F;AACD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,GAAG,iBAAiB,CAEtF;AAED,OAAO,EACL,WAAW,EACX,QAAQ,EACR,eAAe,EACf,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,WAAW,EACX,QAAQ,GACT,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-amwal-pay",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "amwal pay",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/AmwalPaySDK.ts

@@ -1,27 +1,27 @@
 import { initiate, onCustomerId, onResponse, type AmwalPayConfig } from './index';
 import NetworkClient from './network/NetworkClient';
-import {  type EventSubscription } from 'react-native';
+import { type EventSubscription } from 'react-native';
 
 
 class AmwalPaySDK {
   private static instance: AmwalPaySDK;
 
-  private onResponseSubscription: EventSubscription|null = null;
+  private onResponseSubscription: EventSubscription | null = null;
+
+  private onCustomerIdSubscription: EventSubscription | null = null;
 
-  private onCustomerIdSubscription: EventSubscription|null = null;
-  
   private constructor() {
     // Initialize the event emitter
-    
+
   }
-  
+
   static getInstance(): AmwalPaySDK {
     if (!AmwalPaySDK.instance) {
       AmwalPaySDK.instance = new AmwalPaySDK();
     }
     return AmwalPaySDK.instance;
   }
-  
+
   /**
    * Initiates the payment process by first fetching a session token and then starting the payment flow
    * @param config The payment configuration
@@ -30,30 +30,34 @@ class AmwalPaySDK {
     try {
       // Set up event listeners before starting the payment process
       this.setupEventListeners(config);
-      
+
       // Get network client instance
       const networkClient = NetworkClient.getInstance();
-      
+
       // Fetch session token
+      console.log('Fetching session token for environment:', config.environment);
       const sessionToken = await networkClient.fetchSessionToken(
         config.environment,
         config.merchantId,
         config.customerId,
         config.secureHash
       );
-      
+
+      console.log('Session token result:', sessionToken ? 'Success' : 'Failed');
+
       if (!sessionToken) {
         // If session token is null, the error has already been shown by NetworkClient
         return;
       }
-      
+
       // Create complete config with session token
       const completeConfig: AmwalPayConfig = {
         ...config,
         sessionToken
       };
-      
+
       // Initiate the payment process
+      console.log('Initiating native payment with config:', JSON.stringify(completeConfig));
       initiate(completeConfig);
     } catch (error) {
       console.error('Error starting payment:', error);
@@ -64,7 +68,7 @@ class AmwalPaySDK {
     // Remove all event listeners
     this.removeEventListeners();
   }
-  
+
   /**
    * Sets up event listeners for AmwalPay events
    * @param config The payment configuration containing callback functions
@@ -72,7 +76,7 @@ class AmwalPaySDK {
   private setupEventListeners(config: Omit<AmwalPayConfig, 'sessionToken'>): void {
     // Remove any existing listeners
     this.removeEventListeners();
-    
+
     this.onResponseSubscription = onResponse((response) => {
       console.log('Received AmwalPayResponse:', response);
       config.onResponse(response);
@@ -83,7 +87,7 @@ class AmwalPaySDK {
       config.onCustomerId(customerId);
     });
   }
-  
+
   /**
    * Removes all event listeners
    */

package/src/NativeReactAmwalPay.ts

@@ -1,6 +1,5 @@
 import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
-import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
 
 export enum Environment {
   SIT = 'SIT',
@@ -13,9 +12,9 @@ export enum Currency {
 }
 
 export enum TransactionType {
-  NFC= 'NFC' ,
-  CARD_WALLET= 'CARD_WALLET',
-  APPLE_PAY= 'APPLE_PAY'
+  NFC = 'NFC',
+  CARD_WALLET = 'CARD_WALLET',
+  APPLE_PAY = 'APPLE_PAY'
 }
 
 export interface AmwalPayResponse {
@@ -38,6 +37,7 @@ export interface AmwalPayConfig {
   sessionToken?: string;
   transactionId?: string;
   additionValues?: { [key: string]: string };
+  merchantReference?: string;
   onResponse: (response: AmwalPayResponse) => void;
   onCustomerId: (customerId: string) => void;
 }
@@ -56,13 +56,14 @@ export interface AmwalPayNativeConfig {
   sessionToken?: string;
   transactionId?: string;
   additionValues?: { [key: string]: string };
+  merchantReference?: string;
 }
 
 export interface Spec extends TurboModule {
   // Change the parameter type to AmwalPayNativeConfig
   initiate(config: AmwalPayNativeConfig): void;
-  onResponse: EventEmitter<AmwalPayResponse>,
-  onCustomerId: EventEmitter<string>,
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('ReactAmwalPay');

package/src/index.tsx

@@ -8,16 +8,20 @@ import ReactAmwalPay, {
 } from './NativeReactAmwalPay';
 import AmwalPaySDK from './AmwalPaySDK';
 import { UuidUtil } from './utils/UuidUtil';
-import type { EventSubscription } from 'react-native';
+import {
+  NativeEventEmitter,
+  type EventSubscription,
+} from 'react-native';
 
 // Create an event emitter for the native module
+const eventEmitter = new NativeEventEmitter(ReactAmwalPay as any);
 
 export function initiate(config: AmwalPayConfig): void {
   // Create default additionValues with merchantIdentifier for iOS if not provided
   const defaultAdditionValues = {
     merchantIdentifier: 'merchant.applepay.amwalpay',
   };
-  
+
   const finalAdditionValues = {
     ...defaultAdditionValues,
     ...config.additionValues,
@@ -36,17 +40,18 @@ export function initiate(config: AmwalPayConfig): void {
     sessionToken: config.sessionToken,
     transactionId: config.transactionId ?? UuidUtil.generateTransactionId(),
     additionValues: finalAdditionValues,
+    merchantReference: config.merchantReference,
   };
 
   // Call the native module
   ReactAmwalPay.initiate(nativeConfig);
 }
 
-export function onResponse(callback: (response: AmwalPayResponse) => void):EventSubscription {
-  return ReactAmwalPay.onResponse(callback);
+export function onResponse(callback: (response: AmwalPayResponse) => void): EventSubscription {
+  return eventEmitter.addListener('onResponse', callback);
 }
-export function onCustomerId(callback: (customerId: string) => void):EventSubscription {
-  return ReactAmwalPay.onCustomerId(callback);
+export function onCustomerId(callback: (customerId: string) => void): EventSubscription {
+  return eventEmitter.addListener('onCustomerId', callback);
 }
 
 export {