judokit-react-native 3.3.9 → 3.4.2

package/JudoPay.tsx

@@ -144,20 +144,30 @@ class JudoPay {
      *
      * @param mode - a JudoTransactionMode value that defines if the transaction is either a payment or pre-auth.
      * @param configuration - a JudoConfiguration object that is used to configure/customize the payment flow.
-     * @param token - the saved card token string.
+     * @param cardToken - the saved card token string.
+     * @param securityCode - the saved card token security code.
+     * @param cardholderName - the saved card token cardholder name.
+     * @param cardScheme - the saved card token scheme name.
      *
      * @returns an asynchronous JudoResponse object, containing the transaction results.
      */
     public async performTokenTransaction(
         mode: JudoTransactionMode,
         configuration: JudoConfiguration,
-        token: string
+        cardToken: string,
+        securityCode: string,
+        cardholderName: string,
+        cardScheme: string
     ): Promise<JudoResponse> {
         const params = this.generateTransactionModeParameters(
             mode,
             configuration
         )
-        params['cardToken'] = token
+        params['cardToken'] = cardToken
+        params['securityCode'] = securityCode
+        params['cardholderName'] = cardholderName
+        params['cardScheme'] = cardScheme
+
         return NativeModules.RNJudo.performTokenTransaction(params)
     }
 

package/RNJudopay.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/Classes/**/*.{h,m}"
   s.requires_arc = true
   s.dependency "React"
-  s.dependency "JudoKit-iOS", "2.4.6"
+  s.dependency "JudoKit-iOS", "3.1.0"
 
   s.test_spec 'RNJudoTests' do |test_spec|
     test_spec.source_files = 'ios/RNJudoTests/**/*.{h,m}'

package/android/build.gradle

@@ -86,6 +86,8 @@ repositories {
     mavenCentral()
     google()
 
+    maven { url 'https://vocalinkzapp.jfrog.io/artifactory/merchant-library-maven/' }
+
     maven { url "$projectDir/../node_modules/react-native/android" }
 }
 
@@ -99,7 +101,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation 'com.judopay:judokit-android:2.1.10'
+    implementation 'com.judopay:judokit-android:3.0.4'
 
     //JUnit 5
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"

package/android/src/main/java/com/reactlibrary/Extensions.kt

@@ -7,6 +7,18 @@ import com.facebook.react.bridge.ReadableMap
 import com.judopay.judokit.android.JUDO_OPTIONS
 import com.judopay.judokit.android.Judo
 import com.judopay.judokit.android.JudoActivity
+import com.judopay.judokit.android.model.CardNetwork
+
+const val CARD_SCHEME_VISA = "visa"
+const val CARD_SCHEME_MASTERCARD = "mastercard"
+const val CARD_SCHEME_AMEX = "amex"
+
+internal fun ReadableMap?.hasKey(key: String): Boolean {
+    if (this != null) {
+        return this.hasKey(key)
+    }
+    return false
+}
 
 internal val ReadableMap.configuration: ReadableMap?
     get() = getMap("configuration")
@@ -31,6 +43,30 @@ internal val ReadableMap.securityCode: String?
         return null
     }
 
+internal val ReadableMap.cardholderName: String?
+    get() {
+        if (hasKey("cardholderName")) {
+            return getString("cardholderName")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardType: CardNetwork
+    get() {
+        val cardScheme = if (hasKey("cardScheme")) {
+            getString("cardScheme") ?: ""
+        } else {
+            ""
+        }
+
+        return when (cardScheme.lowercase()) {
+            CARD_SCHEME_VISA -> CardNetwork.VISA
+            CARD_SCHEME_MASTERCARD -> CardNetwork.MASTERCARD
+            CARD_SCHEME_AMEX -> CardNetwork.AMEX
+            else -> CardNetwork.OTHER
+        }
+    }
+
 internal val ReadableMap.judoId: String?
     get() = configuration?.getString("judoId")
 
@@ -64,10 +100,144 @@ internal val ReadableMap.paymentReference: String?
 internal val ReadableMap.isInitialRecurringPayment: Boolean?
     get() = configuration?.getBoolean("isInitialRecurringPayment")
 
+internal val ReadableMap.networkTimeout: ReadableMap?
+    get() {
+        if (configuration.hasKey("networkTimeout")) {
+            return configuration?.getMap("networkTimeout")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardAddress: ReadableMap?
+    get() {
+        if (configuration.hasKey("cardAddress")) {
+            return configuration?.getMap("cardAddress")
+        }
+        return null
+    }
+
+internal val ReadableMap.cardAddressLine1: String?
+get() {
+    if (cardAddress.hasKey("line1")) {
+        return cardAddress?.getString("line1")
+    }
+
+    return null
+}
+
+internal val ReadableMap.cardAddressLine2: String?
+    get() {
+        if (cardAddress.hasKey("line2")) {
+            return cardAddress?.getString("line2")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressLine3: String?
+    get() {
+        if (cardAddress.hasKey("line3")) {
+            return cardAddress?.getString("line3")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressPostCode: String?
+    get() {
+        if (cardAddress.hasKey("postCode")) {
+            return cardAddress?.getString("postCode")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressTown: String?
+    get() {
+        if (cardAddress.hasKey("town")) {
+            return cardAddress?.getString("town")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.cardAddressCountryCode: Int?
+    get() {
+        if (cardAddress.hasKey("countryCode")) {
+            return cardAddress?.getInt("countryCode")
+        }
+
+        return null
+    }
+
+internal val ReadableMap.networkConnectTimeout: Long?
+    get() = networkTimeout?.getDouble("connectTimeout")?.toLong()
+
+internal val ReadableMap.networkReadTimeout: Long?
+    get() = networkTimeout?.getDouble("readTimeout")?.toLong()
+
+internal val ReadableMap.networkWriteTimeout: Long?
+    get() = networkTimeout?.getDouble("writeTimeout")?.toLong()
+
+internal val ReadableMap.challengeRequestIndicator: String?
+    get() {
+        if (configuration.hasKey("challengeRequestIndicator")) {
+            return configuration?.getString("challengeRequestIndicator")
+        }
+        return null
+    }
+
+internal val ReadableMap.scaExemption: String?
+    get() {
+        if (configuration.hasKey("scaExemption")) {
+            return configuration?.getString("scaExemption")
+        }
+        return null
+    }
+
+internal val ReadableMap.mobileNumber: String?
+    get() {
+        if (configuration.hasKey("mobileNumber")) {
+            return configuration?.getString("mobileNumber")
+        }
+        return null
+    }
+
+internal val ReadableMap.phoneCountryCode: String?
+    get() {
+        if (configuration.hasKey("phoneCountryCode")) {
+            return configuration?.getString("phoneCountryCode")
+        }
+        return null
+    }
+
+internal val ReadableMap.emailAddress: String?
+    get() {
+        if (configuration.hasKey("emailAddress")) {
+            return configuration?.getString("emailAddress")
+        }
+        return null
+    }
+
+internal val ReadableMap.threeDSTwoMaxTimeout: Int?
+    get() {
+        if (configuration.hasKey("threeDSTwoMaxTimeout")) {
+            return configuration?.getInt("threeDSTwoMaxTimeout")
+        }
+        return null
+    }
+
+internal val ReadableMap.threeDSTwoMessageVersion: String?
+    get() {
+        if (configuration.hasKey("threeDSTwoMessageVersion")) {
+            return configuration?.getString("threeDSTwoMessageVersion")
+        }
+        return null
+    }
+
 internal val ReadableMap.metadata: ReadableMap?
     get() {
-        val hasKey = reference?.hasKey("metadata") ?: false
-        if (hasKey) {
+        if (reference.hasKey("metadata")) {
             return reference?.getMap("metadata")
         }
         return null
@@ -75,8 +245,7 @@ internal val ReadableMap.metadata: ReadableMap?
 
 internal val ReadableMap.cardNetworkValue: Int?
     get() {
-        val hasKey = configuration?.hasKey("supportedCardNetworks") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("supportedCardNetworks")) {
             return configuration?.getInt("supportedCardNetworks")
         }
         return null
@@ -84,8 +253,7 @@ internal val ReadableMap.cardNetworkValue: Int?
 
 internal val ReadableMap.paymentMethodValue: Int?
     get() {
-        val hasKey = configuration?.hasKey("paymentMethods") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("paymentMethods")) {
             return configuration?.getInt("paymentMethods")
         }
         return null
@@ -93,8 +261,7 @@ internal val ReadableMap.paymentMethodValue: Int?
 
 internal val ReadableMap.uiConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("uiConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("uiConfiguration")) {
             return configuration?.getMap("uiConfiguration")
         }
         return null
@@ -112,10 +279,17 @@ internal val ReadableMap.shouldPaymentButtonDisplayAmount: Boolean?
 internal val ReadableMap.shouldPaymentMethodsVerifySecurityCode: Boolean?
     get() = uiConfiguration?.getBoolean("shouldPaymentMethodsVerifySecurityCode")
 
+internal val ReadableMap.shouldAskForBillingInformation: Boolean
+    get() {
+        if (uiConfiguration.hasKey("shouldAskForBillingInformation")) {
+            return uiConfiguration?.getBoolean("shouldAskForBillingInformation") ?: true
+        }
+        return true
+    }
+
 internal val ReadableMap.primaryAccountDetails: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("primaryAccountDetails") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("primaryAccountDetails")) {
             return configuration?.getMap("primaryAccountDetails")
         }
         return null
@@ -123,8 +297,7 @@ internal val ReadableMap.primaryAccountDetails: ReadableMap?
 
 internal val ReadableMap.name: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("name") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("name")) {
             return primaryAccountDetails?.getString("name")
         }
         return null
@@ -132,8 +305,7 @@ internal val ReadableMap.name: String?
 
 internal val ReadableMap.accountNumber: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("accountNumber") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("accountNumber")) {
             return primaryAccountDetails?.getString("accountNumber")
         }
         return null
@@ -141,8 +313,7 @@ internal val ReadableMap.accountNumber: String?
 
 internal val ReadableMap.dateOfBirth: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("dateOfBirth") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("dateOfBirth")) {
             return primaryAccountDetails?.getString("dateOfBirth")
         }
         return null
@@ -150,8 +321,7 @@ internal val ReadableMap.dateOfBirth: String?
 
 internal val ReadableMap.postCode: String?
     get() {
-        val hasKey = primaryAccountDetails?.hasKey("postCode") ?: false
-        if (hasKey) {
+        if (primaryAccountDetails.hasKey("postCode")) {
             return primaryAccountDetails?.getString("postCode")
         }
         return null
@@ -159,8 +329,7 @@ internal val ReadableMap.postCode: String?
 
 internal val ReadableMap.googlePayConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("googlePayConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("googlePayConfiguration")) {
             return configuration?.getMap("googlePayConfiguration")
         }
         return null
@@ -183,8 +352,7 @@ internal val ReadableMap.isShippingAddressRequired: Boolean?
 
 internal val ReadableMap.billingAddressParameters: ReadableMap?
     get() {
-        val hasKey = googlePayConfiguration?.hasKey("billingAddressParameters") ?: false
-        if (hasKey) {
+        if (googlePayConfiguration.hasKey("billingAddressParameters")) {
             return googlePayConfiguration?.getMap("billingAddressParameters")
         }
         return null
@@ -192,8 +360,7 @@ internal val ReadableMap.billingAddressParameters: ReadableMap?
 
 internal val ReadableMap.shippingAddressParameters: ReadableMap?
     get() {
-        val hasKey = googlePayConfiguration?.hasKey("shippingAddressParameters") ?: false
-        if (hasKey) {
+        if (googlePayConfiguration.hasKey("shippingAddressParameters")) {
             return googlePayConfiguration?.getMap("shippingAddressParameters")
         }
         return null
@@ -210,8 +377,7 @@ internal val ReadableMap.isShippingPhoneNumberRequired: Boolean?
 
 internal val ReadableMap.allowedCountryCodeList: ReadableArray?
     get() {
-        val hasKey = shippingAddressParameters?.hasKey("allowedCountryCodes") ?: false
-        if (hasKey) {
+        if (shippingAddressParameters.hasKey("allowedCountryCodes")) {
             return shippingAddressParameters?.getArray("allowedCountryCodes")
         }
         return null
@@ -219,17 +385,16 @@ internal val ReadableMap.allowedCountryCodeList: ReadableArray?
 
 internal val ReadableMap.pbbaConfiguration: ReadableMap?
     get() {
-        val hasKey = configuration?.hasKey("pbbaConfiguration") ?: false
-        if (hasKey) {
+        if (configuration.hasKey("pbbaConfiguration")) {
             return configuration?.getMap("pbbaConfiguration")
         }
         return null
     }
 
-internal val ReadableMap.mobileNumber: String?
+internal val ReadableMap.pbbaMobileNumber: String?
     get() = pbbaConfiguration?.getString("mobileNumber")
 
-internal val ReadableMap.emailAddress: String?
+internal val ReadableMap.pbbaEmailAddress: String?
     get() = pbbaConfiguration?.getString("emailAddress")
 
 internal val ReadableMap.deeplinkScheme: String?
@@ -237,8 +402,7 @@ internal val ReadableMap.deeplinkScheme: String?
 
 internal val ReadableMap.deeplinkURL: String?
     get() {
-        val hasKey = pbbaConfiguration?.hasKey("deeplinkURL") ?: false
-        return if (hasKey) {
+        return if (pbbaConfiguration.hasKey("deeplinkURL")) {
             pbbaConfiguration?.getString("deeplinkURL")
         } else {
             null
@@ -246,5 +410,5 @@ internal val ReadableMap.deeplinkURL: String?
     }
 
 fun Judo.toJudoActivityIntent(packageContext: Context): Intent =
-        Intent(packageContext, JudoActivity::class.java)
-                .also { it.putExtra(JUDO_OPTIONS, this) }
+    Intent(packageContext, JudoActivity::class.java)
+        .also { it.putExtra(JUDO_OPTIONS, this) }

package/android/src/main/java/com/reactlibrary/Helpers.kt

@@ -9,17 +9,8 @@ import com.judopay.judokit.android.Judo
 import com.judopay.judokit.android.api.model.Authorization
 import com.judopay.judokit.android.api.model.BasicAuthorization
 import com.judopay.judokit.android.api.model.PaymentSessionAuthorization
-import com.judopay.judokit.android.model.Amount
-import com.judopay.judokit.android.model.CardNetwork
-import com.judopay.judokit.android.model.Currency
-import com.judopay.judokit.android.model.GooglePayConfiguration
-import com.judopay.judokit.android.model.JudoResult
-import com.judopay.judokit.android.model.PBBAConfiguration
-import com.judopay.judokit.android.model.PaymentMethod
-import com.judopay.judokit.android.model.PaymentWidgetType
-import com.judopay.judokit.android.model.PrimaryAccountDetails
-import com.judopay.judokit.android.model.Reference
-import com.judopay.judokit.android.model.UiConfiguration
+import com.judopay.judokit.android.api.model.request.Address
+import com.judopay.judokit.android.model.*
 import com.judopay.judokit.android.model.googlepay.GooglePayAddressFormat
 import com.judopay.judokit.android.model.googlepay.GooglePayBillingAddressParameters
 import com.judopay.judokit.android.model.googlepay.GooglePayEnvironment
@@ -118,21 +109,70 @@ internal fun getJudoConfiguration(type: PaymentWidgetType, options: ReadableMap)
     val primaryAccountDetails = getPrimaryAccountDetails(options)
     val googlePayConfiguration = getGooglePayConfiguration(options)
     val pbbaConfiguration = getPBBAConfiguration(options)
+    val timeouts = getNetworkTimeout(options)
+    val challengeRequestIndicator = getChallengeRequestIndicator(options)
+    val scaExemption = getScaExemption(options)
+    val address = getAddress(options)
 
     return Judo.Builder(type)
-            .setAuthorization(authorization)
-            .setIsSandboxed(options.isSandboxed)
-            .setJudoId(options.judoId)
-            .setAmount(amount)
-            .setReference(reference)
-            .setSupportedCardNetworks(cardNetworks)
-            .setPaymentMethods(paymentMethods)
-            .setUiConfiguration(uiConfiguration)
-            .setPrimaryAccountDetails(primaryAccountDetails)
-            .setGooglePayConfiguration(googlePayConfiguration)
-            .setPBBAConfiguration(pbbaConfiguration)
-            .setInitialRecurringPayment(options.isInitialRecurringPayment)
+        .setAuthorization(authorization)
+        .setIsSandboxed(options.isSandboxed)
+        .setJudoId(options.judoId)
+        .setAmount(amount)
+        .setReference(reference)
+        .setSupportedCardNetworks(cardNetworks)
+        .setPaymentMethods(paymentMethods)
+        .setUiConfiguration(uiConfiguration)
+        .setPrimaryAccountDetails(primaryAccountDetails)
+        .setGooglePayConfiguration(googlePayConfiguration)
+        .setPBBAConfiguration(pbbaConfiguration)
+        .setInitialRecurringPayment(options.isInitialRecurringPayment)
+        .setNetworkTimeout(timeouts)
+        .setChallengeRequestIndicator(challengeRequestIndicator)
+        .setScaExemption(scaExemption)
+        .setMobileNumber(options.mobileNumber)
+        .setEmailAddress(options.emailAddress)
+        .setThreeDSTwoMaxTimeout(options.threeDSTwoMaxTimeout)
+        .setThreeDSTwoMessageVersion(options.threeDSTwoMessageVersion)
+        .setPhoneCountryCode(options.phoneCountryCode)
+        .setAddress(address)
+        .build()
+}
+
+internal fun getAddress(options: ReadableMap): Address? {
+    if (options.cardAddress != null) {
+        return Address.Builder()
+            .setLine1(options.cardAddressLine1)
+            .setLine2(options.cardAddressLine2)
+            .setLine3(options.cardAddressLine3)
+            .setTown(options.cardAddressTown)
+            .setPostCode(options.cardAddressPostCode)
+            .setCountryCode(options.cardAddressCountryCode)
             .build()
+    }
+    return null
+}
+
+internal fun getNetworkTimeout(options: ReadableMap): NetworkTimeout? {
+    val networkTimeout = options.networkTimeout
+    if (networkTimeout != null) {
+        return NetworkTimeout.Builder()
+            .setConnectTimeout(options.networkConnectTimeout)
+            .setReadTimeout(options.networkReadTimeout)
+            .setWriteTimeout(options.networkWriteTimeout)
+            .build()
+    }
+    return null
+}
+
+internal fun getChallengeRequestIndicator(options: ReadableMap): ChallengeRequestIndicator? {
+    val challengeRequestIndicator = ChallengeRequestIndicator.values().firstOrNull { it.value == options.challengeRequestIndicator }
+    return challengeRequestIndicator ?: ChallengeRequestIndicator.CHALLENGE_AS_MANDATE
+}
+
+internal fun getScaExemption(options: ReadableMap): ScaExemption {
+    val scaExemption = ScaExemption.values().firstOrNull { it.value == options.scaExemption }
+    return scaExemption ?: ScaExemption.LOW_VALUE
 }
 
 internal fun getAuthorization(options: ReadableMap): Authorization {
@@ -140,16 +180,16 @@ internal fun getAuthorization(options: ReadableMap): Authorization {
 
     options.secret?.let { secret ->
         return BasicAuthorization.Builder()
-                .setApiToken(token)
-                .setApiSecret(secret)
-                .build()
+            .setApiToken(token)
+            .setApiSecret(secret)
+            .build()
     }
 
     options.paymentSession?.let { paymentSession ->
         return PaymentSessionAuthorization.Builder()
-                .setApiToken(token)
-                .setPaymentSession(paymentSession)
-                .build()
+            .setApiToken(token)
+            .setPaymentSession(paymentSession)
+            .build()
     }
 
     throw IllegalArgumentException("No secret or payment session in the authorization")
@@ -174,16 +214,16 @@ internal fun getAmount(options: ReadableMap): Amount {
         else -> Currency.valueOf(currencyValue)
     }
     return Amount.Builder()
-            .setAmount(options.amountValue)
-            .setCurrency(currency)
-            .build()
+        .setAmount(options.amountValue)
+        .setCurrency(currency)
+        .build()
 }
 
 internal fun getReference(options: ReadableMap): Reference? {
 
     var builder = Reference.Builder()
-            .setConsumerReference(options.consumerReference)
-            .setPaymentReference(options.paymentReference)
+        .setConsumerReference(options.consumerReference)
+        .setPaymentReference(options.paymentReference)
 
     val metadataMap = options.metadata
     metadataMap?.let {
@@ -291,11 +331,12 @@ internal fun getPaymentMethods(options: ReadableMap): Array<PaymentMethod>? {
 internal fun getUIConfiguration(options: ReadableMap): UiConfiguration? {
     return if (options.uiConfiguration != null) {
         UiConfiguration.Builder()
-                .setAvsEnabled(options.isAVSEnabled)
-                .setShouldPaymentMethodsDisplayAmount(options.shouldPaymentMethodsDisplayAmount)
-                .setShouldPaymentButtonDisplayAmount(options.shouldPaymentButtonDisplayAmount)
-                .setShouldPaymentMethodsVerifySecurityCode(options.shouldPaymentMethodsVerifySecurityCode)
-                .build()
+            .setAvsEnabled(options.isAVSEnabled)
+            .setShouldPaymentMethodsDisplayAmount(options.shouldPaymentMethodsDisplayAmount)
+            .setShouldPaymentButtonDisplayAmount(options.shouldPaymentButtonDisplayAmount)
+            .setShouldPaymentMethodsVerifySecurityCode(options.shouldPaymentMethodsVerifySecurityCode)
+            .setShouldAskForBillingInformation(options.shouldAskForBillingInformation)
+            .build()
     } else {
         null
     }
@@ -326,14 +367,14 @@ internal fun getGooglePayConfiguration(options: ReadableMap): GooglePayConfigura
 
     return if (options.googlePayConfiguration != null) {
         GooglePayConfiguration.Builder()
-                .setTransactionCountryCode(options.countryCode)
-                .setEnvironment(environment)
-                .setIsEmailRequired(options.isEmailRequired)
-                .setIsBillingAddressRequired(options.isBillingAddressRequired)
-                .setBillingAddressParameters(billingParameters)
-                .setIsShippingAddressRequired(options.isShippingAddressRequired)
-                .setShippingAddressParameters(shippingParameters)
-                .build()
+            .setTransactionCountryCode(options.countryCode)
+            .setEnvironment(environment)
+            .setIsEmailRequired(options.isEmailRequired)
+            .setIsBillingAddressRequired(options.isBillingAddressRequired)
+            .setBillingAddressParameters(billingParameters)
+            .setIsShippingAddressRequired(options.isShippingAddressRequired)
+            .setShippingAddressParameters(shippingParameters)
+            .build()
     } else {
         null
     }
@@ -345,8 +386,8 @@ internal fun getBillingParameters(options: ReadableMap): GooglePayBillingAddress
         else -> GooglePayAddressFormat.FULL
     }
     return GooglePayBillingAddressParameters(
-            addressFormat,
-            options.isBillingPhoneNumberRequired
+        addressFormat,
+        options.isBillingPhoneNumberRequired
     )
 }
 
@@ -361,8 +402,8 @@ internal fun getShippingParameters(options: ReadableMap): GooglePayShippingAddre
     }
 
     return GooglePayShippingAddressParameters(
-            allowedCountryCodes,
-            options.isShippingPhoneNumberRequired
+        allowedCountryCodes,
+        options.isShippingPhoneNumberRequired
     )
 }
 
@@ -375,11 +416,11 @@ internal fun getPBBAConfiguration(options: ReadableMap): PBBAConfiguration? {
         }
 
         PBBAConfiguration.Builder()
-                .setMobileNumber(options.mobileNumber)
-                .setEmailAddress(options.emailAddress)
-                .setDeepLinkURL(deeplinkUri)
-                .setDeepLinkScheme(options.deeplinkScheme)
-                .build()
+            .setMobileNumber(options.pbbaMobileNumber)
+            .setEmailAddress(options.pbbaEmailAddress)
+            .setDeepLinkURL(deeplinkUri)
+            .setDeepLinkScheme(options.deeplinkScheme)
+            .build()
     } else {
         null
     }