Merge branch 'develop' into hotfix/safari-modal-focus

src/components/modal/v2/parts/Calculator.jsx

@@ -151,7 +151,7 @@ const Calculator = ({ setExpandedState, calculator, aprDisclaimer }) => {
                     }`}
                 >
                     <div>
-                        {error ? <Icon name="warning" /> : null}
+                        {error && hasUsedInputField ? <Icon name="warning" /> : null}
                         <div>{error}</div>
                     </div>
                 </div>

src/components/modal/v2/styles/components/_header.scss

@@ -126,6 +126,10 @@
                         transform: translate(0, 0);
                     }
                 }
+
+                .pp-logo {
+                    pointer-events: none;
+                }
             }
         }
 
@@ -158,6 +162,7 @@
             svg {
                 height: 48px;
                 width: 48px;
+                pointer-events: none;
 
                 @include desktop {
                     margin: 0px;
@@ -190,6 +195,7 @@
             position: absolute;
             right: 0;
             bottom: 36px;
+            pointer-events: none;
 
             @include desktop {
                 &.background-mobile {

src/library/zoid/message/validation.js

@@ -70,13 +70,14 @@ export default {
         if (typeof merchantId !== 'undefined') {
             if (!validateType(Types.STRING, merchantId)) {
                 logInvalidType('merchantId', Types.STRING, merchantId);
-            } else if (merchantId.length !== 13 && merchantId.length !== 10) {
-                logInvalid('merchantId', 'Ensure the correct Merchant ID has been entered.');
             } else {
+                const isInvalid = merchantId.split(',').some(id => id.length !== 13 && id.length !== 10);
+                if (isInvalid) {
+                    logInvalid('merchantId', 'Ensure the correct Merchant ID has been entered.');
+                }
                 return merchantId;
             }
         }
-
         return undefined;
     },
     customerId: ({ props: { customerId } }) => {

src/utils/sdk.js

@@ -55,7 +55,7 @@ export function getMerchantConfig() {
 export function getAccount() {
     if (__MESSAGES__.__TARGET__ === 'SDK') {
         // TODO: Should we pass both up if they exist so that nodeweb can create a partner context?
-        return getMerchantID()[0] || `client-id:${getClientID()}`;
+        return getMerchantID().join(',') || `client-id:${getClientID()}`;
     } else {
         return undefined;
     }

tests/unit/spec/src/zoid/message/validation.test.js

@@ -56,9 +56,22 @@ describe('validate', () => {
         expect(merchantId).toEqual(merchantId);
         expect(console.warn).not.toHaveBeenCalled();
 
+        merchantId = validate.merchantId({ props: { merchantId: 'DEV00000000NI,DEV00000001NI' } });
+        expect(merchantId).toEqual(merchantId);
+        expect(console.warn).not.toHaveBeenCalled();
+
+        merchantId = validate.merchantId({ props: { merchantId: 'DEV00000000,DEV00000001NI' } });
+
+        expect(merchantId).toEqual(merchantId);
+        expect(console.warn).toHaveBeenCalledTimes(1);
+        expect(console.warn).toHaveBeenLastCalledWith(
+            expect.stringContaining('invalid_option_value'),
+            expect.objectContaining({ location: 'merchantId' })
+        );
+
         merchantId = validate.merchantId({ props: { merchantId: 'client-id:test_client_id' } });
 
-        expect(merchantId).toBeUndefined();
+        expect(merchantId).toEqual(merchantId);
         expect(console.warn).toHaveBeenCalledTimes(1);
         expect(console.warn).toHaveBeenLastCalledWith(
             expect.stringContaining('invalid_option_value'),