v6 - Removing onValid and adjusting isAvailable (#2578)

* feat: removing onValid and adjusting isAvailable * fix: reverting line removal
Adyen · Feb 28, 2024 · 623cdeb · 623cdeb
1 parent 10bb7f8
commit 623cdeb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 42 deletions.
diff --git a/packages/lib/src/components/GooglePay/GooglePay.tsx b/packages/lib/src/components/GooglePay/GooglePay.tsx
@@ -190,11 +190,11 @@ class GooglePay extends UIElement<GooglePayConfiguration> {
         return this.isReadyToPay()
             .then(response => {
                 if (!response.result) {
-                    throw new Error('Google Pay is not available');
+                    throw new AdyenCheckoutError('ERROR', 'GooglePay is not available');
                 }
 
                 if (response.paymentMethodPresent === false) {
-                    throw new Error('Google Pay - No paymentMethodPresent');
+                    throw new AdyenCheckoutError('ERROR', 'GooglePay - No paymentMethodPresent');
                 }
 
                 return Promise.resolve();

diff --git a/packages/lib/src/components/GooglePay/types.ts b/packages/lib/src/components/GooglePay/types.ts
@@ -40,7 +40,7 @@ export interface GooglePayConfiguration extends UIElementProps {
 
     /**
      * @see https://developers.google.com/pay/api/web/reference/request-objects#IsReadyToPayRequest
-     * @defaultValue true
+     * @defaultValue false
      */
     existingPaymentMethodRequired?: boolean;
 

diff --git a/packages/lib/src/components/helpers/IssuerListContainer/IssuerListContainer.tsx b/packages/lib/src/components/helpers/IssuerListContainer/IssuerListContainer.tsx
@@ -12,7 +12,6 @@ import type { ICore } from '../../../core/types';
 class IssuerListContainer extends UIElement<IssuerListConfiguration> {
     protected static defaultProps = {
         showImage: true,
-        onValid: () => {},
         issuers: [],
         highlightedIssuers: [],
         loadingContext: FALLBACK_CONTEXT,

diff --git a/packages/lib/src/components/internal/UIElement/UIElement.test.ts b/packages/lib/src/components/internal/UIElement/UIElement.test.ts
@@ -72,32 +72,6 @@ describe('UIElement', () => {
 
             expect(onChange.mock.calls.length).toBe(1);
         });
-
-        test('should not trigger onValid method if the component is not valid', () => {
-            const onValid = jest.fn();
-            const element = new MyElement(core, { onValid });
-
-            element.callOnChange();
-
-            expect(onValid.mock.calls.length).toBe(0);
-        });
-
-        test('should trigger the onValid method if the component is valid', () => {
-            class MyValidElement extends UIElement {
-                get isValid() {
-                    return true;
-                }
-                onChange(): object {
-                    return super.onChange();
-                }
-            }
-
-            const onValid = jest.fn();
-            const element = new MyValidElement(core, { onValid });
-            element.onChange();
-
-            expect(onValid.mock.calls.length).toBe(1);
-        });
     });
 
     describe('isValid()', () => {

diff --git a/packages/lib/src/components/internal/UIElement/UIElement.tsx b/packages/lib/src/components/internal/UIElement/UIElement.tsx
@@ -50,7 +50,6 @@ export abstract class UIElement<P extends UIElementProps = UIElementProps> exten
 
         this.submit = this.submit.bind(this);
         this.setState = this.setState.bind(this);
-        this.onValid = this.onValid.bind(this);
         this.onComplete = this.onComplete.bind(this);
         this.handleAction = this.handleAction.bind(this);
         this.handleOrder = this.handleOrder.bind(this);
@@ -127,8 +126,8 @@ export abstract class UIElement<P extends UIElementProps = UIElementProps> exten
     protected onChange(): object {
         const isValid = this.isValid;
         const state = { data: this.data, errors: this.state.errors, valid: this.state.valid, isValid };
-        if (this.props.onChange) this.props.onChange(state, this.elementRef);
-        if (isValid) this.onValid();
+
+        this.props.onChange?.(state, this.elementRef);
 
         return state;
     }
@@ -245,12 +244,6 @@ export abstract class UIElement<P extends UIElementProps = UIElementProps> exten
         // };
     }
 
-    private onValid() {
-        const state = { data: this.data };
-        if (this.props.onValid) this.props.onValid(state, this.elementRef);
-        return state;
-    }
-
     protected onComplete(state): void {
         if (this.props.onComplete) this.props.onComplete(state, this.elementRef);
     }

diff --git a/packages/lib/src/components/internal/UIElement/types.ts b/packages/lib/src/components/internal/UIElement/types.ts
@@ -28,14 +28,11 @@ export type UIElementProps = BaseElementProps &
     CoreCallbacks & {
         environment?: string;
         session?: Session;
-        onValid?: (state: any, element: UIElement) => void;
 
         onComplete?: (state, element: UIElement) => void;
 
         isInstantPayment?: boolean;
 
-        // brand?: string; // TODO confirm it this is needed
-
         /**
          * Flags if the element is Stored payment method
          * @internal