quivio-transaction-processor 1.23.1-beta → 1.23.2

package/dist/example/MainScreen.js

@@ -33,7 +33,7 @@ var MainScreen = function (_a) {
     var config = _a.config;
     var _b = (0, react_1.useState)(false), showEMV = _b[0], setShowEMV = _b[1];
     if (showEMV) {
-        return react_1.default.createElement(EMVPaymentScreen_1.default, { posConfig: config });
+        return react_1.default.createElement(EMVPaymentScreen_1.default, null);
     }
     return (react_1.default.createElement(react_native_1.View, { style: styles.container },
         react_1.default.createElement(react_native_1.Text, { style: styles.title }, "Welcome to Quivio Payment Processor"),

package/dist/example/MainScreen.js.map

@@ -1 +1 @@
-{"version":3,"file":"MainScreen.js","sourceRoot":"","sources":["../../src/example/MainScreen.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,6CAA8D;AAC9D,wEAAkD;AAGlD,IAAM,UAAU,GAAoC,UAAC,EAAU;QAAR,MAAM,YAAA;IACrD,IAAA,KAAwB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IAE9C,IAAI,OAAO,EAAE;QACX,OAAO,8BAAC,0BAAgB,IAAC,SAAS,EAAE,MAAM,GAAG,CAAC;KAC/C;IAED,OAAO,CACL,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;QAC3B,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,0CAA4C;QACrE,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,uCAAyC;QACrE,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,eAAe;YACjC,8BAAC,qBAAM,IACL,KAAK,EAAC,YAAY,EAClB,OAAO,EAAE,cAAM,OAAA,UAAU,CAAC,IAAI,CAAC,EAAhB,CAAgB,GAC/B,CACG,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,IAAM,MAAM,GAAG,yBAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,eAAe,EAAE,SAAS;QAC1B,OAAO,EAAE,EAAE;KACZ;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,QAAQ;KACpB;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,QAAQ;KACpB;IACD,eAAe,EAAE;QACf,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,GAAG;KACd;CACF,CAAC,CAAC;AAEH,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"MainScreen.js","sourceRoot":"","sources":["../../src/example/MainScreen.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAwC;AACxC,6CAA8D;AAC9D,wEAAkD;AAGlD,IAAM,UAAU,GAAoC,UAAC,EAAU;QAAR,MAAM,YAAA;IACrD,IAAA,KAAwB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IAE9C,IAAI,OAAO,EAAE;QACX,OAAO,8BAAC,0BAAgB,OAAG,CAAC;KAC7B;IAED,OAAO,CACL,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,SAAS;QAC3B,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,0CAA4C;QACrE,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,uCAAyC;QACrE,8BAAC,mBAAI,IAAC,KAAK,EAAE,MAAM,CAAC,eAAe;YACjC,8BAAC,qBAAM,IACL,KAAK,EAAC,YAAY,EAClB,OAAO,EAAE,cAAM,OAAA,UAAU,CAAC,IAAI,CAAC,EAAhB,CAAgB,GAC/B,CACG,CACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,IAAM,MAAM,GAAG,yBAAU,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE;QACT,IAAI,EAAE,CAAC;QACP,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;QACpB,eAAe,EAAE,SAAS;QAC1B,OAAO,EAAE,EAAE;KACZ;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,QAAQ;KACpB;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,QAAQ;KACpB;IACD,eAAe,EAAE;QACf,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,GAAG;KACd;CACF,CAAC,CAAC;AAEH,kBAAe,UAAU,CAAC"}

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/POSTransactionExecutor.kt

@@ -10,18 +10,15 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import javax.security.auth.callback.Callback
 
-class POSTransactionExecutor(context: Context) {
+class POSTransactionExecutor(context: Context, posConfig: ConfigFactory) {
 
     private val dsiEMVAndroidLib  by lazy {
         DsiEMVInstanceBuilder.getInstance(context)
     }
     private val requestBuilder by lazy {
-        DsiEMVRequestBuilder()
+        DsiEMVRequestBuilder(posConfig)
     }
 
-    fun setPaymentConfig(posConfig: ConfigFactory){
-        requestBuilder.setPaymentConfig(posConfig)
-    }
     suspend fun doSale(amount: String) {
         withContext(Dispatchers.IO){
             val request = requestBuilder.buildEMVSaleRequest(amount)

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/builder/DsiEMVRequestBuilder.kt

@@ -3,26 +3,19 @@ package com.rohan.emvcardreaderlib.builder
 import com.rohan.emvcardreaderlib.ConfigFactory
 import com.rohan.emvcardreaderlib.TransType
 
-class DsiEMVRequestBuilder() {
-    private var merchantID = ""
-    private var operationMode = "CERT"
+class DsiEMVRequestBuilder(val config: ConfigFactory) {
+    private val merchantID = config.merchantID
+    private val operationMode = if (config.isSandBox) "CERT" else "PROD"
     private val comPort = 1
-    private var secureDevice = ""
-    private var posPackageID = ""
-    private var userTrace = ""
+    private val secureDevice = config.secureDeviceName
+    private val posPackageID = config.posPackageID
+
+    private val userTrace = config.operatorID
 
     private var sequenceNo = "0010010010"
 
     private fun createUniqueInvoiceNo() = "${userTrace}-${System.currentTimeMillis()}"
 
-    fun setPaymentConfig(config: ConfigFactory) {
-        this.merchantID = config.merchantID
-        this.operationMode = if(config.isSandBox) "CERT" else "PROD"
-        this.secureDevice = config.secureDeviceName
-        this.posPackageID = config.posPackageID
-        this.userTrace = config.operatorID
-    }
-
     fun buildPinPadResetRequest(): String {
         return """
             <?xml version="1.0"?>

package/libs/emvCardReaderLib/src/main/java/com/rohan/emvcardreaderlib/manager/EMVPaymentManager.kt

@@ -5,14 +5,15 @@ import android.util.Log
 import com.datacap.android.DisplayMessageListener
 import com.datacap.android.ProcessTransactionResponseListener
 import com.rohan.emvcardreaderlib.ConfigFactory
+import com.rohan.emvcardreaderlib.communicator.ConfigurationCommunicator
+import com.rohan.emvcardreaderlib.communicator.EMVTransactionCommunicator
 import com.rohan.emvcardreaderlib.POSTransactionExecutor
 import com.rohan.emvcardreaderlib.PRINT_TAG
 import com.rohan.emvcardreaderlib.ReaderState
 import com.rohan.emvcardreaderlib.XMLResponseExtractor
-import com.rohan.emvcardreaderlib.communicator.ConfigurationCommunicator
-import com.rohan.emvcardreaderlib.communicator.EMVTransactionCommunicator
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -21,7 +22,8 @@ import kotlinx.coroutines.withContext
 * 1. Handle case when raised a transaction again and response says In-Progress
 * */
 class EMVPaymentManager(
-    val context: Context
+    val context: Context,
+    posConfig: ConfigFactory
 ) {
     private val cancellationTimeout: Long = 2000
     private var currentPosState: ReaderState = ReaderState.IDLE
@@ -29,17 +31,13 @@ class EMVPaymentManager(
     private var configCommunicator: ConfigurationCommunicator? = null
 
     private val posTransactionExecutor by lazy {
-        POSTransactionExecutor(context)
+        POSTransactionExecutor(context, posConfig)
     }
 
     private val posXMLResponseExtractor by lazy {
         XMLResponseExtractor()
     }
 
-    fun setPaymentParams(posConfig: ConfigFactory){
-        posTransactionExecutor.setPaymentConfig(posConfig)
-    }
-
     private suspend fun resetPinPad() {
         currentPosState = ReaderState.Reset
         posTransactionExecutor.resetPinPad()
@@ -52,11 +50,11 @@ class EMVPaymentManager(
 
     suspend fun cancelTransaction(){
         try {
-            requestLog("Operation Cancelled Called")
+            Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Operation Cancelled Called")
             currentPosState = ReaderState.CancelTransaction
             posTransactionExecutor.cancelTransaction()
         } catch (e: Exception){
-            requestLog("Operation cancellation Failed: ${e.message}")
+            Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Operation cancellation Failed: ${e.message}")
             e.printStackTrace()
         }
     }
@@ -87,7 +85,7 @@ class EMVPaymentManager(
     }
     private suspend fun ignoreResponseIfProcessAlreadyRunning(res: String): Boolean {
         if (posXMLResponseExtractor.isProcessAlreadyRunning(res)) {
-            requestLog("Operation Collision: Process already running detected")
+            Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Process already running detected. Auto-cancelling transaction...")
             communicator?.processAlreadyRunning()
             return true
         } else {
@@ -97,13 +95,12 @@ class EMVPaymentManager(
     }
 
     private val displayMessageCallback = DisplayMessageListener { message ->
-        requestLog("Message from IDTECH: $message")
+        Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Display Message: $message")
         communicator?.onShowDisplayMessage(message)
     }
 
-
     private val processListener = ProcessTransactionResponseListener { res ->
-        requestLog("Response from IDTECH: $res")
+        Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Device Response: $res")
 
         CoroutineScope(Dispatchers.IO).launch {
 
@@ -150,7 +147,7 @@ class EMVPaymentManager(
             }
             ReaderState.DownloadingConfig -> {
                 configCommunicator?.onConfigCompleted()
-                currentPosState == ReaderState.IDLE
+                currentPosState != ReaderState.IDLE
             }
             ReaderState.CancelTransaction -> {
                 communicator?.transactionCancelled(null)
@@ -161,7 +158,7 @@ class EMVPaymentManager(
                 clientVersionDetails?.let {
                     communicator?.onDeviceDetailsRetrieved(it)
                 }
-                currentPosState == ReaderState.IDLE
+                currentPosState != ReaderState.IDLE
             }
             ReaderState.PrePaidCardDataCollect -> {
                 val cardData = posXMLResponseExtractor.extractCardResponse(xml)
@@ -213,7 +210,4 @@ class EMVPaymentManager(
         posTransactionExecutor.clearAllListeners()
     }
 
-    private fun requestLog(log: String){
-        Log.d(PRINT_TAG, "Class: ${this::class.java.simpleName} \n Message: $log")
-    }
 }

package/libs/emvNative/src/main/java/com/quivio_transaction_processor/EMVPaymentManagerModule.kt

@@ -45,17 +45,11 @@ class EMVPaymentManagerModule(private val reactContext: ReactApplicationContext)
     override fun getName() = NAME
 
     @ReactMethod
-    fun initializeLib() {
+    fun initialize(map: ReadableMap) {
+        val config = ConfigConverterFactory.processMap(map)
         val context = currentActivity ?: reactContext
-        dsiEMVManager = EMVPaymentManager(context)
+        dsiEMVManager = EMVPaymentManager(context, config)
         dsiEMVManager?.registerListener(this, this)
-        log("Payment Library Initialised!")
-    }
-
-    @ReactMethod
-    fun setMerchantDetails(map: ReadableMap){
-        val config = ConfigConverterFactory.processMap(map)
-        dsiEMVManager?.setPaymentParams(config)
         log("Configurational parameters sent to library: $map")
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quivio-transaction-processor",
-  "version": "1.23.1-beta",
+  "version": "1.23.2",
   "description": "React Native hook for Card payment integration with DataCap",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/emvPaymentProvider/EMVPaymentProvider.tsx

@@ -34,21 +34,9 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     'onTransactionCancelled',
   ];
 
-  // Initialization Flag
-  const [isLibraryInitialized, setIsInitialzed] = useState(false);
-
   // Device Connected State
   const { isDeviceConnected } = useUSBDevice();
 
-  const [deviceSerialNumber, setDeviceSerialNumber] = useState('');
-
-  // Buffered Device Connection Flag
-  const [isIDTECHConnected, setIDTECHConnected] = useState(isDeviceConnected);
-
-  const disconnectTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(
-    null,
-  );
-
   // Show Display Message Cache
   const [displayMessage, setDisplayMessage] = useState('');
 
@@ -74,61 +62,55 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     Map<EMVEventName, Set<(payload: any) => void>>
   >(new Map());
 
-  const clearDisconnectTimeout = () => {
-    if (disconnectTimeoutRef.current) {
-      clearTimeout(disconnectTimeoutRef.current);
-      disconnectTimeoutRef.current = null;
-    }
-  };
+  // Ref to maintain timeout during configuration
+  // Because after a successfull EMVParamDownload
+  // Device reboots which leads to USB disconnection
+  // and connection
+  const unconfigureTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(
+    null,
+  );
 
-  useEffect(() => {
-    pushLog('PAYMENT LIBRARY', `SERIAL NUMBER: ${deviceSerialNumber}`);
-  }, [deviceSerialNumber]);
+  // Ref to maintain device connection/disconnection
+  const isDeviceConnectedRef = useRef<boolean>(isDeviceConnected);
 
   useEffect(() => {
-    // Stop already running timeout
-    clearDisconnectTimeout();
-
-    // If device connects -> update immediately
-    if (isDeviceConnected) {
-      setIDTECHConnected(true);
-      return;
-    }
-
-    // If device disconnects -> delay 1500ms
-    disconnectTimeoutRef.current = setTimeout(() => {
-      setIDTECHConnected(false);
-    }, 2000);
-
-    return () => {
-      clearDisconnectTimeout();
-    };
-  }, [isDeviceConnected]);
+    // Always sync ref first
+    isDeviceConnectedRef.current = isDeviceConnected;
 
-  useEffect(() => {
-    if (!isIDTECHConnected) {
-      setIsConfigured(false);
+    // Handle disconnect logic
+    if (!isDeviceConnected) {
+      unconfigureDevice(false);
       setConfigurationInProgress(false);
       setTransactionCurrentlyRunning(false);
       setCancellationRunning(false);
-      setDeviceSerialNumber('');
-      setDisplayMessage('');
-    } else {
-      getDeviceDetails();
     }
-  }, [isIDTECHConnected]);
+  }, [isDeviceConnected]);
 
   // Logging helper
   const pushLog = (type: string, payload: any) => {
     setLogs(prev => [...prev, { type, payload, timestamp: Date.now() }]);
   };
 
-  // Clean up timeout references
-  useEffect(() => {
-    return () => {
-      clearDisconnectTimeout();
-    };
-  }, []);
+  // Exposed Method to unconfigure Device
+  const unconfigureDevice = (immediate: boolean = false) => {
+    // Cancel any pending delayed unconfigure
+    if (unconfigureTimeoutRef.current) {
+      clearTimeout(unconfigureTimeoutRef.current);
+      unconfigureTimeoutRef.current = null;
+    }
+
+    if (immediate) {
+      setIsConfigured(false);
+      return;
+    }
+
+    // Delayed unconfigure (handles IDTECH reboot)
+    unconfigureTimeoutRef.current = setTimeout(() => {
+      if (!isDeviceConnectedRef.current) {
+        setIsConfigured(false);
+      }
+    }, 2000);
+  };
 
   // Native to Provider EMV event listening
   useEffect(() => {
@@ -140,10 +122,6 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
           setDisplayMessage(payload);
         }
 
-        if (eventName === 'onDeviceDetailsRetrieved') {
-          setDeviceSerialNumber(payload?.serialNumber ?? '');
-        }
-
         if (eventName === 'onConfigCompleted') {
           setConfigurationInProgress(false);
           setCancellationRunning(false);
@@ -164,7 +142,7 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
         if (TRANSACTION_RESPONSE_EVENTS.includes(eventName)) {
           setTransactionCurrentlyRunning(false);
           setCancellationRunning(false);
-          setDisplayMessage('');
+          setDisplayMessage("")
         }
 
         const callbacks = subscriptionsRef.current.get(eventName);
@@ -181,7 +159,7 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
   // Exposed method to run EMV configuration
   const runConfiguration = (config: EMVConfig) => {
     const title = 'CONFIGURATION DENIED';
-    const message = !isIDTECHConnected
+    const message = !isDeviceConnected
       ? 'IDTECH device is not connected via USB'
       : config.merchantID == ''
       ? 'Merchant ID not found'
@@ -189,8 +167,6 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
       ? 'Operator ID not Found'
       : config.secureDeviceName == '' || config.posPackageID == ''
       ? 'Some configuration parameters are missing'
-      : !isLibraryInitialized
-      ? 'Payment Library not initialized. Call initializePaymentLib() first'
       : '';
 
     if (message != '') {
@@ -199,69 +175,53 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     }
 
     setConfigurationInProgress(true);
-    DsiEMVManagerBridge.setMerchantDetails(config);
+    console.log(
+      'Initialising::: ConfugurationProgress:',
+      isConfigurationInProgress,
+      'isDeviceConnected: ',
+      isDeviceConnected,
+    );
+    DsiEMVManagerBridge.clearTransactionListener();
+    DsiEMVManagerBridge.initialize(config);
     DsiEMVManagerBridge.configureDevice();
   };
 
-  const setMerchantDetails = (config: EMVConfig) => {
-    DsiEMVManagerBridge.setMerchantDetails(config);
-    if(!deviceSerialNumber?.trim())
-      getDeviceDetails()
-  };
-  // Initialize payment library
-  const initializePaymentLib = () => {
-    if (!isLibraryInitialized) {
-      DsiEMVManagerBridge.initializeLib();
-      setIsInitialzed(true);
-      pushLog('PAYMENT LIBRARY', 'Payment library has been initialised!');
-    } else {
-      pushLog('PAYMENT LIBRARY', 'Already initialized!');
-    }
-  };
   // Exposed method to run EMV CC Sale
   const creditCardSale = (amount: string) => {
-    if (!isIDTECHConnected || !isConfigured) return;
+    if (!isDeviceConnected || !isConfigured) return;
 
     setTransactionCurrentlyRunning(true);
     DsiEMVManagerBridge.runSaleTransaction(amount);
-    pushLog('EMV TRANSACTION', 'Credit card sale transaction initiated');
   };
 
   // Exposed method to run In House/ Prepaid Card Read
   const prepaidCardRead = () => {
-    if (!isIDTECHConnected || !isConfigured) return;
+    if (!isDeviceConnected || !isConfigured) return;
 
     setTransactionCurrentlyRunning(true);
     DsiEMVManagerBridge.collectCardDetails();
-    pushLog('PREPAID TRANSACTION', 'Prepaid card read initiated');
   };
 
   // Exposed method to run EMV CC Sale for Sale
   const creditCardRecurringSale = (amount: string) => {
-    if (!isIDTECHConnected || !isConfigured) return;
+    if (!isDeviceConnected || !isConfigured) return;
 
     setTransactionCurrentlyRunning(true);
     DsiEMVManagerBridge.runRecurringTransaction(amount);
-    pushLog(
-      'EMV TRANSACTION',
-      'Credit card sale transaction for recurring initiated',
-    );
   };
 
   // Exposed method to run EMV CC Zero Auth
   const zeroAuthTransaction = () => {
-    if (!isIDTECHConnected || !isConfigured) return;
+    if (!isDeviceConnected || !isConfigured) return;
 
     setTransactionCurrentlyRunning(true);
     DsiEMVManagerBridge.replaceCardInRecurring();
-    pushLog('EMV TRANSACTION', 'Zero auth transaction has been initiated');
   };
 
   // Exposed method to fetch device details
   const getDeviceDetails = () => {
-    if (!isIDTECHConnected) return;
+    if (!isDeviceConnected) return;
     DsiEMVManagerBridge.getDeviceDetails();
-    pushLog('PAYMENT LIBRARY', 'Retrieving IDTECH device details');
   };
 
   // Exposed method to cancel transaction
@@ -270,7 +230,6 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     setConfigurationInProgress(false);
     setCancellationRunning(true);
     DsiEMVManagerBridge.cancelTransaction();
-    pushLog('PAYMENT LIBRARY', 'Current Transaction cancelled by User');
   };
 
   // Exposed method to remove all attached listener
@@ -308,19 +267,25 @@ const EMVPaymentProvider: React.FC<{ children: React.ReactNode }> = ({
     [],
   );
 
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      if (unconfigureTimeoutRef.current) {
+        clearTimeout(unconfigureTimeoutRef.current);
+      }
+    };
+  }, []);
+
   // Context value builder
   const value: EMVPaymentContextType = {
     logs,
-    isDeviceConnected: isIDTECHConnected,
+    isDeviceConnected,
     isConfigured,
-    deviceSerialNumber,
     isTransactionCurrentlyRunning,
     isConfigurationInProgress,
     isCancellationRunning,
     displayMessage,
-    setIsConfigured,
-    setMerchantDetails,
-    initializePaymentLib,
+    unconfigureDevice,
     creditCardSale,
     prepaidCardRead,
     creditCardRecurringSale,

package/src/emvPaymentProvider/types.ts

@@ -24,15 +24,12 @@ export interface CallbackLog {
 export interface EMVPaymentHook {
     logs: CallbackLog[];
     isDeviceConnected: boolean;
-    deviceSerialNumber: string,
     isConfigured: boolean;
     isTransactionCurrentlyRunning: boolean,
     isConfigurationInProgress: boolean,
     isCancellationRunning: boolean,
     displayMessage: string,
-    setMerchantDetails: (config: EMVConfig) => void,
-    setIsConfigured: (isConfigured: boolean) => void,
-    initializePaymentLib: () => void,
+    unconfigureDevice: (immediate: boolean) => void,
     creditCardSale: (amount: string) => void;
     prepaidCardRead: () => void;
     creditCardRecurringSale: (amount: string) => void;

package/src/example/EMVPaymentScreen.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import {
   View,
   Text,
@@ -16,14 +16,12 @@ import { USBDeviceProvider } from '../usb/USBDeviceContext';
 import { EMVPaymentProvider } from '../emvPaymentProvider/EMVPaymentProvider';
 import { useEMVPayment } from '../emvPaymentProvider/useEMVPayment';
 import { EMVConfig } from '../emvPaymentProvider/types';
-import { getDeviceBySerial } from './helper/deviceStore';
 
 type IconCallback = {
   onPress: () => void;
 };
 
 type PaymentScreenIconsCallback = {
-  config: EMVConfig | null;
   onPressExternalSystem: () => void;
   onPressSettings: () => void;
 };
@@ -48,8 +46,8 @@ const CrossIcon = () => (
   <Text style={{ color: 'red', fontSize: 18, marginRight: 6 }}>❌</Text>
 );
 
-const EMVPaymentScreenExample = ( {posConfig}: {posConfig: EMVConfig}) => {
-  const [config, setConfig] = useState<EMVConfig | null>(posConfig);
+const EMVPaymentScreenExample = () => {
+  const [config, setConfig] = useState<EMVConfig | null>(null);
   const [showSettingsScreen, setShowSettingsScreen] = useState(false);
   const [showExternalSystemScreen, setShowExternalSystemScreen] =
     useState(false);
@@ -83,7 +81,6 @@ const EMVPaymentScreenExample = ( {posConfig}: {posConfig: EMVConfig}) => {
 
     return (
       <ExampleContent
-        config={config}
         onPressSettings={toggleSettingsScreen}
         onPressExternalSystem={toggleExternalSystemScreen}
       />
@@ -98,50 +95,22 @@ const EMVPaymentScreenExample = ( {posConfig}: {posConfig: EMVConfig}) => {
 };
 
 const ExampleContent = ({
-  config,
   onPressExternalSystem,
   onPressSettings,
 }: PaymentScreenIconsCallback) => {
   const [infoVisible, setInfoVisible] = useState(false);
   const {
     logs,
-    deviceSerialNumber,
-    initializePaymentLib,
-    setMerchantDetails,
     isConfigured,
     creditCardSale,
     prepaidCardRead,
     creditCardRecurringSale,
     zeroAuthTransaction,
     cancelOperation,
-    setIsConfigured,
     getDeviceDetails,
     isTransactionCurrentlyRunning,
-    displayMessage,
+    displayMessage
   } = useEMVPayment();
-  //Device Connected -> Serial Received -> Lookup Local Config -> Auto Configure -> Enable Transactions
-  useEffect(() => {
-    if (deviceSerialNumber) {
-      const matchedDevice = getDeviceBySerial(deviceSerialNumber);
-
-      if (matchedDevice?.isConfigured) {
-        setIsConfigured(true);
-      } else {
-        setIsConfigured(false);
-      }
-    } else {
-      setIsConfigured(false);
-    }
-  }, [deviceSerialNumber]);
-
-  const initialiseLib = () => {
-    initializePaymentLib();
-  };
-
-  useEffect(() => {
-    initialiseLib();
-    if (config != null) setMerchantDetails(config);
-  }, []);
 
   const showAlertIfNotConfigured = () => {
     if (isConfigured) return false;
@@ -171,6 +140,7 @@ const ExampleContent = ({
 
       {/** Button Row 1 */}
       <View style={styles.buttonRow}>
+
         <TouchableOpacity
           style={[
             styles.ctaButton,
@@ -194,9 +164,10 @@ const ExampleContent = ({
               : styles.ctaButtonEnabled,
           ]}
           onPress={() => {
-            if (!showAlertIfNotConfigured()) creditCardRecurringSale('1.50');
-          }}
-          disabled={isTransactionCurrentlyRunning}
+             if(!showAlertIfNotConfigured())
+              creditCardRecurringSale('1.50')
+            }}
+          disabled={isTransactionCurrentlyRunning }
         >
           <Text style={styles.ctaButtonText}>CC Sale (Recurring)</Text>
         </TouchableOpacity>
@@ -211,7 +182,7 @@ const ExampleContent = ({
           onPress={() => {
             if (!showAlertIfNotConfigured()) prepaidCardRead();
           }}
-          disabled={isTransactionCurrentlyRunning}
+          disabled={isTransactionCurrentlyRunning }
         >
           <Text style={styles.ctaButtonText}>Read Prepaid Card</Text>
         </TouchableOpacity>
@@ -226,10 +197,11 @@ const ExampleContent = ({
               ? styles.ctaButtonDisabled
               : styles.ctaButtonEnabled,
           ]}
-          onPress={() => {
-            if (!showAlertIfNotConfigured()) zeroAuthTransaction();
+          onPress={()=> {
+             if(!showAlertIfNotConfigured())
+              zeroAuthTransaction()
           }}
-          disabled={isTransactionCurrentlyRunning}
+          disabled={isTransactionCurrentlyRunning }
         >
           <Text style={styles.ctaButtonText}>CC $0 Auth</Text>
         </TouchableOpacity>
@@ -241,8 +213,8 @@ const ExampleContent = ({
               ? styles.ctaButtonDisabled
               : styles.ctaButtonEnabled,
           ]}
-          onPress={() => {
-            getDeviceDetails();
+          onPress={()=> {
+              getDeviceDetails()
           }}
           disabled={isTransactionCurrentlyRunning}
         >
@@ -260,9 +232,7 @@ const ExampleContent = ({
         <View style={styles.modalOverlay}>
           <View style={styles.modalContent}>
             <ActivityIndicator size="large" color="#007AFF" />
-            <Text style={styles.modalText}>
-              Processing...\n{displayMessage}
-            </Text>
+            <Text style={styles.modalText}>Processing...\n{displayMessage}</Text>
             <TouchableOpacity
               style={styles.cancelButton}
               onPress={cancelOperation}
@@ -481,7 +451,7 @@ const styles = StyleSheet.create({
     paddingVertical: 8,
     paddingHorizontal: 14,
     borderRadius: 6,
-  },
+  }
 });
 
 export default EMVPaymentScreenExample;