swell-js 5.8.0 → 5.8.2

package/dist/swell.umd.min.js

@@ -12110,13 +12110,18 @@
 
 	async function loadPaypal(params) {
 	  if (!window.paypal) {
-	    const { currency, client_id, merchant_id } = params;
+	    const { vault, currency, client_id, merchant_id } = params;
+
 	    const paypalParams = {
 	      currency,
 	      'client-id': client_id,
 	      commit: false,
 	    };
 
+	    if (vault) {
+	      paypalParams.vault = vault;
+	    }
+
 	    if (merchant_id) {
 	      // paypal express and ppcp onboarded
 	      paypalParams['merchant-id'] = merchant_id;
@@ -12655,7 +12660,7 @@
 	  THB: 10,
 	};
 
-	const addressFieldsMap$1 = {
+	const addressFieldsMap = {
 	  city: 'city',
 	  country: 'country',
 	  line1: 'address1',
@@ -12693,7 +12698,7 @@
 	    details.email = cart.account.email;
 	  }
 
-	  const address = mapValues(addressFieldsMap$1, cart.billing);
+	  const address = mapValues(addressFieldsMap, cart.billing);
 	  if (!isEmpty(address)) {
 	    details.address = address;
 	  }
@@ -14243,7 +14248,7 @@
 
 	        // Update cart with new shipping address and force tax recalculation
 	        let cart = await this.updateCart({
-	          shipping: convertToSwellAddress$2(
+	          shipping: convertToSwellAddress$3(
 	            intermediatePaymentData.shippingAddress,
 	          ),
 	        });
@@ -14509,7 +14514,7 @@
 	 * @param {google.payments.api.Address} address
 	 * @returns {Address}
 	 */
-	function convertToSwellAddress$2(address) {
+	function convertToSwellAddress$3(address) {
 	  return {
 	    name: address.name,
 	    address1: address.address1,
@@ -14773,11 +14778,11 @@
 	          nonce,
 	          gateway: 'braintree',
 	        },
-	        ...convertToSwellAddress$2(billingAddress),
+	        ...convertToSwellAddress$3(billingAddress),
 	      },
 	      ...(shippingAddress && {
 	        shipping: {
-	          ...convertToSwellAddress$2(shippingAddress),
+	          ...convertToSwellAddress$3(shippingAddress),
 	          service: shippingOptionData?.id || undefined,
 	        },
 	      }),
@@ -14814,6 +14819,7 @@
 	/** @typedef {import('./payment').default} Payment */
 	/** @typedef {import('../../types').Cart} Cart */
 	/** @typedef {import('../../types').Address} Address */
+	/** @typedef {import('../../types').CartItemBillingSchedule} CartItemBillingSchedule */
 
 	/**
 	 * @this {Payment}
@@ -14825,7 +14831,7 @@
 	    // Update cart with Apple Pay shipping address to get shipping options and tax
 	    // This happens immediately when the sheet opens with the default address
 	    const cart = await this.updateCart({
-	      shipping: convertToSwellAddress$1(shippingContact),
+	      shipping: convertToSwellAddress$2(shippingContact),
 	    });
 
 	    if (!cart.shipment_rating?.services?.length) {
@@ -15114,7 +15120,7 @@
 	 * @param {ApplePayJS.ApplePayPaymentContact} [address]
 	 * @returns {Address}
 	 */
-	function convertToSwellAddress$1(address = {}) {
+	function convertToSwellAddress$2(address = {}) {
 	  return {
 	    first_name: address.givenName,
 	    last_name: address.familyName,
@@ -15157,6 +15163,99 @@
 	  return { requiredBillingContactFields, requiredShippingContactFields };
 	}
 
+	/**
+	 * @param {CartItemBillingSchedule} schedule
+	 * @returns {{ intervalUnit: ApplePayJS.ApplePayRecurringPaymentDateUnit, intervalCount: number }}
+	 */
+	function convertSwellScheduleToAppleRecurringInterval(schedule) {
+	  let intervalCount = schedule.interval_count || 1;
+	  let intervalUnit = 'day';
+
+	  switch (schedule.interval) {
+	    case 'daily':
+	      intervalUnit = 'day';
+	      break;
+
+	    case 'weekly':
+	      intervalUnit = 'day';
+	      intervalCount *= 7;
+	      break;
+
+	    case 'monthly':
+	      intervalUnit = 'month';
+	      break;
+
+	    case 'yearly':
+	      intervalUnit = 'year';
+	      break;
+	  }
+
+	  return { intervalUnit, intervalCount };
+	}
+
+	/**
+	 * @param {Cart} cart
+	 * @param {string} managementUrl
+	 * @returns {ApplePayJS.ApplePayRecurringPaymentRequest | undefined}
+	 */
+	function getRecurringPaymentRequest(cart, managementUrl) {
+	  if (!cart.subscription_delivery) {
+	    return undefined;
+	  }
+
+	  const item = cart.items.find(
+	    (item) =>
+	      item.purchase_option?.type === 'subscription' &&
+	      item.purchase_option.billing_schedule,
+	  );
+
+	  if (item === undefined) {
+	    return undefined;
+	  }
+
+	  const { intervalUnit, intervalCount } =
+	    convertSwellScheduleToAppleRecurringInterval(
+	      item.purchase_option.billing_schedule,
+	    );
+
+	  /** @type {ApplePayJS.ApplePayRecurringPaymentRequest} */
+	  const recurringPaymentRequest = {
+	    paymentDescription:
+	      item.purchase_option.plan_description ||
+	      item.purchase_option.plan_name ||
+	      item.product_name ||
+	      item.product?.name,
+	    regularBilling: {
+	      type: 'final',
+	      label: item.purchase_option.plan_name || 'Subscription',
+	      // Calculate the subscription price manually if a trial period is specified.
+	      // However, discounts are not included in the calculation due to the difficulty of taking into account all scenarios.
+	      amount: (item.purchase_option.billing_schedule.trial_days
+	        ? (item.price || 0) * (item.quantity || 1)
+	        : item.price_total
+	      ).toFixed(2),
+	      paymentTiming: 'recurring',
+	      recurringPaymentIntervalUnit: intervalUnit,
+	      recurringPaymentIntervalCount: intervalCount,
+	    },
+	    trialBilling: item.purchase_option.billing_schedule.trial_days
+	      ? {
+	          type: 'final',
+	          label: 'Trial',
+	          // When a trial period is set, price_total is 0 (usually)
+	          amount: Number(item.price_total || 0).toFixed(2),
+	          paymentTiming: 'recurring',
+	          recurringPaymentIntervalUnit: 'day',
+	          recurringPaymentIntervalCount:
+	            item.purchase_option.billing_schedule.trial_days,
+	        }
+	      : undefined,
+	    managementURL: managementUrl,
+	  };
+
+	  return recurringPaymentRequest;
+	}
+
 	/** @typedef {import('../../../types').Cart} Cart */
 
 	const VERSION$1 = 14;
@@ -15359,10 +15458,10 @@
 	            nonce: payload.nonce,
 	            gateway: 'braintree',
 	          },
-	          ...convertToSwellAddress$1(billingContact),
+	          ...convertToSwellAddress$2(billingContact),
 	        },
 	        ...(shippingContact && {
-	          shipping: convertToSwellAddress$1(shippingContact),
+	          shipping: convertToSwellAddress$2(shippingContact),
 	        }),
 	      });
 
@@ -15568,7 +15667,7 @@
 	   * @returns {Promise<object>}
 	   */
 	  // eslint-disable-next-line no-unused-vars
-	  async preparePaymentDataForCartUpdate(paymentData) {
+	  async processPaymentData(paymentData) {
 	    throw new Error('Implement this!');
 	  }
 
@@ -15590,9 +15689,7 @@
 	      throw new Error('Google Pay token is missing');
 	    }
 
-	    await this.preparePaymentDataForCartUpdate(paymentData).then((data) =>
-	      this.updateCart(data),
-	    );
+	    await this.processPaymentData(paymentData);
 
 	    this.onSuccess();
 	  }
@@ -15715,7 +15812,7 @@
 	   * @param {google.payments.api.PaymentData} paymentData
 	   * @returns {Promise<object>}
 	   */
-	  async preparePaymentDataForCartUpdate(paymentData) {
+	  async processPaymentData(paymentData) {
 	    const { email, shippingAddress, shippingOptionData, paymentMethodData } =
 	      paymentData;
 
@@ -15724,7 +15821,7 @@
 	      tokenizationData: { token },
 	    } = paymentMethodData;
 
-	    return {
+	    await this.updateCart({
 	      account: { email },
 	      billing: {
 	        method: 'google',
@@ -15734,15 +15831,15 @@
 	          gateway: 'authorizenet',
 	          token: base64Encode(token),
 	        },
-	        ...convertToSwellAddress$2(billingAddress),
+	        ...convertToSwellAddress$3(billingAddress),
 	      },
 	      ...(shippingAddress && {
 	        shipping: {
-	          ...convertToSwellAddress$2(shippingAddress),
+	          ...convertToSwellAddress$3(shippingAddress),
 	          service: shippingOptionData?.id || undefined,
 	        },
 	      }),
-	    };
+	    });
 	  }
 	}
 
@@ -15857,6 +15954,10 @@
 	      requiredShippingContactFields,
 	      requiredBillingContactFields,
 	      supportsCouponCode: true,
+	      recurringPaymentRequest: getRecurringPaymentRequest(
+	        cart,
+	        this.params.managementUrl,
+	      ),
 	      lineItems: getLineItems(cart),
 	    };
 	  }
@@ -15879,7 +15980,7 @@
 	   * @returns {Promise<object>}
 	   */
 	  // eslint-disable-next-line no-unused-vars
-	  async preparePaymentDataForCartUpdate(event) {
+	  async processPaymentData(event) {
 	    throw new Error('Implement this!');
 	  }
 
@@ -15937,9 +16038,7 @@
 	        //
 	        // We store the payment token but DO NOT process the order yet.
 	        // The user must manually click "Place Order" to complete the transaction.
-	        await this.preparePaymentDataForCartUpdate(event).then((data) =>
-	          this.updateCart(data),
-	        );
+	        await this.processPaymentData(event);
 
 	        // Complete Apple Pay session successfully
 	        // This closes the Apple Pay sheet and shows success to the user
@@ -16075,12 +16174,12 @@
 	   * @param {ApplePayJS.ApplePayPaymentAuthorizedEvent} event
 	   * @returns {Promise<object>}
 	   */
-	  async preparePaymentDataForCartUpdate(event) {
+	  async processPaymentData(event) {
 	    const {
 	      payment: { token, shippingContact, billingContact },
 	    } = event;
 
-	    return {
+	    return this.updateCart({
 	      account: {
 	        email: shippingContact?.emailAddress || billingContact?.emailAddress,
 	      },
@@ -16092,12 +16191,12 @@
 	          gateway: 'authorizenet',
 	          token: base64Encode(JSON.stringify(token.paymentData)),
 	        },
-	        ...convertToSwellAddress$1(billingContact),
+	        ...convertToSwellAddress$2(billingContact),
 	      },
 	      ...(shippingContact && {
-	        shipping: convertToSwellAddress$1(shippingContact),
+	        shipping: convertToSwellAddress$2(shippingContact),
 	      }),
-	    };
+	    });
 	  }
 	}
 
@@ -16465,7 +16564,7 @@
 	   * @param {ApplePayJS.ApplePayPaymentAuthorizedEvent} event
 	   * @returns {Promise<object>}
 	   */
-	  async preparePaymentDataForCartUpdate(event) {
+	  async processPaymentData(event) {
 	    const {
 	      payment: { token, shippingContact, billingContact },
 	    } = event;
@@ -16489,7 +16588,7 @@
 	      },
 	    );
 
-	    return {
+	    return this.updateCart({
 	      account: {
 	        email: shippingContact?.emailAddress || billingContact?.emailAddress,
 	      },
@@ -16504,12 +16603,12 @@
 	        convesiopay: {
 	          return_url: this.params.returnUrl,
 	        },
-	        ...convertToSwellAddress$1(billingContact),
+	        ...convertToSwellAddress$2(billingContact),
 	      },
 	      ...(shippingContact && {
-	        shipping: convertToSwellAddress$1(shippingContact),
+	        shipping: convertToSwellAddress$2(shippingContact),
 	      }),
-	    };
+	    });
 	  }
 	}
 
@@ -16635,7 +16734,7 @@
 	   * @param {google.payments.api.PaymentData} paymentData
 	   * @returns {Promise<object>}
 	   */
-	  async preparePaymentDataForCartUpdate(paymentData) {
+	  async processPaymentData(paymentData) {
 	    const { email, shippingAddress, shippingOptionData, paymentMethodData } =
 	      paymentData;
 
@@ -16663,7 +16762,7 @@
 	      },
 	    );
 
-	    return {
+	    return this.updateCart({
 	      account: { email },
 	      billing: {
 	        method: 'google',
@@ -16676,15 +16775,15 @@
 	        convesiopay: {
 	          return_url: this.params.returnUrl,
 	        },
-	        ...convertToSwellAddress$2(billingAddress),
+	        ...convertToSwellAddress$3(billingAddress),
 	      },
 	      ...(shippingAddress && {
 	        shipping: {
-	          ...convertToSwellAddress$2(shippingAddress),
+	          ...convertToSwellAddress$3(shippingAddress),
 	          service: shippingOptionData?.id || undefined,
 	        },
 	      }),
-	    };
+	    });
 	  }
 	}
 
@@ -16830,105 +16929,6 @@
 	  }
 	}
 
-	const addressFieldsMap = {
-	  given_name: 'first_name',
-	  family_name: 'last_name',
-	  city: 'city',
-	  country: 'country',
-	  phone: 'phone',
-	  postal_code: 'zip',
-	  street_address: 'address1',
-	  street_address2: 'address2',
-	  region: 'state',
-	};
-
-	const mapFields = (fieldsMap, data) =>
-	  reduce(
-	    fieldsMap,
-	    (acc, srcKey, destKey) => {
-	      const value = data[srcKey];
-	      if (value) {
-	        acc[destKey] = value;
-	      }
-	      return acc;
-	    },
-	    {},
-	  );
-
-	const mapAddressFields = (cart, addressField) => ({
-	  ...mapFields(addressFieldsMap, cart[addressField]),
-	  email: get(cart, 'account.email'),
-	});
-
-	function getOrderLines(cart) {
-	  const items = map(cart.items, (item) => ({
-	    type: 'physical',
-	    name: get(item, 'product.name'),
-	    reference: get(item, 'product.sku') || get(item, 'product.slug'),
-	    quantity: item.quantity,
-	    unit_price: Math.round(toNumber(item.price - item.discount_each) * 100),
-	    total_amount: Math.round(
-	      toNumber(item.price_total - item.discount_total) * 100,
-	    ),
-	    tax_rate: 0,
-	    total_tax_amount: 0,
-	  }));
-
-	  const tax = get(cart, 'tax_included_total');
-	  const taxAmount = toNumber(tax) * 100;
-	  if (tax) {
-	    items.push({
-	      type: 'sales_tax',
-	      name: 'Taxes',
-	      quantity: 1,
-	      unit_price: taxAmount,
-	      total_amount: taxAmount,
-	      tax_rate: 0,
-	      total_tax_amount: 0,
-	    });
-	  }
-
-	  const shipping = get(cart, 'shipping', {});
-	  const shippingTotal = get(cart, 'shipment_total', {});
-	  const shippingAmount = toNumber(shippingTotal) * 100;
-	  if (shipping.price) {
-	    items.push({
-	      type: 'shipping_fee',
-	      name: shipping.service_name,
-	      quantity: 1,
-	      unit_price: shippingAmount,
-	      total_amount: shippingAmount,
-	      tax_rate: 0,
-	      total_tax_amount: 0,
-	    });
-	  }
-
-	  return items;
-	}
-
-	function getKlarnaSessionData(cart) {
-	  const returnUrl = `${window.location.origin}${window.location.pathname}?gateway=klarna_direct&sid={{session_id}}`;
-	  const successUrl = `${returnUrl}&authorization_token={{authorization_token}}`;
-
-	  return {
-	    locale: cart.display_locale || get(cart, 'settings.locale') || 'en-US',
-	    purchase_country:
-	      get(cart, 'billing.country') || get(cart, 'shipping.country'),
-	    purchase_currency: cart.currency,
-	    billing_address: mapAddressFields(cart, 'billing'),
-	    shipping_address: mapAddressFields(cart, 'shipping'),
-	    order_amount: Math.round(get(cart, 'capture_total', 0) * 100),
-	    order_lines: JSON.stringify(getOrderLines(cart)),
-	    merchant_urls: {
-	      success: successUrl,
-	      back: returnUrl,
-	      cancel: returnUrl,
-	      error: returnUrl,
-	      failure: returnUrl,
-	    },
-	  };
-	}
-
 	class KlarnaDirectPayment extends Payment {
 	  constructor(api, options, params, methods) {
 	    super(api, options, params, methods.klarna);
@@ -16937,6 +16937,7 @@
 	  async tokenize() {
 	    const cart = await this.getCart();
 	    const sessionData = getKlarnaSessionData(cart);
+
 	    const session = await this.createIntent({
 	      gateway: 'klarna',
 	      intent: sessionData,
@@ -16969,12 +16970,42 @@
 	  }
 	}
 
+	function getKlarnaSessionData(cart) {
+	  const returnUrl = `${window.location.origin}${window.location.pathname}?gateway=klarna_direct&sid={{session_id}}`;
+	  const successUrl = `${returnUrl}&authorization_token={{authorization_token}}`;
+
+	  return {
+	    cart_id: cart.id,
+	    merchant_urls: {
+	      success: successUrl,
+	      back: returnUrl,
+	      cancel: returnUrl,
+	      error: returnUrl,
+	      failure: returnUrl,
+	    },
+	  };
+	}
+
+	/** @typedef {import('@paypal/paypal-js').PayPalNamespace} PayPal */
+	/** @typedef {import('@paypal/paypal-js').ShippingAddress} ShippingAddress */
+	/** @typedef {import('@paypal/paypal-js').CreateOrderData} CreateOrderData */
+	/** @typedef {import('@paypal/paypal-js').CreateOrderActions} CreateOrderActions */
+	/** @typedef {import('@paypal/paypal-js').OnShippingAddressChangeData} OnShippingAddressChangeData */
+	/** @typedef {import('@paypal/paypal-js').OnShippingAddressChangeActions} OnShippingAddressChangeActions */
+	/** @typedef {import('@paypal/paypal-js').OnShippingOptionsChangeData} OnShippingOptionsChangeData */
+	/** @typedef {import('@paypal/paypal-js').OnShippingOptionsChangeActions} OnShippingOptionsChangeActions */
+	/** @typedef {import('@paypal/paypal-js').OnApproveData} OnApproveData */
+	/** @typedef {import('@paypal/paypal-js').OnApproveActions} OnApproveActions */
+	/** @typedef {import('../../../types').Cart} Cart */
+	/** @typedef {import('../../../types').Address} Address */
+
 	class PaypalDirectPayment extends Payment {
 	  constructor(api, options, params, methods) {
 	    super(api, options, params, methods.paypal);
 	  }
 
-	  get scripts() {
+	  /** @param {Cart} cart */
+	  getScripts(cart) {
 	    const { client_id } = this.method;
 
 	    return [
@@ -16984,11 +17015,13 @@
 	          client_id,
 	          merchant_id: this.merchantId,
 	          cart: ['currency'],
+	          vault: cart.subscription_delivery,
 	        },
 	      },
 	    ];
 	  }
 
+	  /** @returns {PayPal} */
 	  get paypal() {
 	    if (!window.paypal) {
 	      throw new LibraryNotLoadedError('PayPal');
@@ -17012,7 +17045,6 @@
 	  async createElements(cart) {
 	    const {
 	      elementId = 'paypal-button',
-	      locale = 'en_US',
 	      style: {
 	        layout = 'horizontal',
 	        height = 45,
@@ -17021,15 +17053,16 @@
 	        label = 'paypal',
 	        tagline = false,
 	      } = {},
+	      require: { shipping: requireShipping = true } = {},
 	    } = this.params;
 
 	    this.setElementContainer(elementId);
 
 	    this._validateCart(cart);
-	    await this.loadScripts(this.scripts);
+	    await this.loadScripts(this.getScripts(cart));
 
-	    this.element = this.paypal.Buttons({
-	      locale,
+	    /** @type {import('@paypal/paypal-js').PayPalButtonsComponentOptions} */
+	    const buttonsOptions = {
 	      style: {
 	        layout,
 	        height,
@@ -17038,11 +17071,27 @@
 	        label,
 	        tagline,
 	      },
+	      fundingSource: this.paypal.FUNDING.PAYPAL,
 	      createOrder: this._onCreateOrder.bind(this, cart),
-	      onShippingChange: this._onShippingChange.bind(this),
 	      onApprove: this._onApprove.bind(this),
 	      onError: this.onError.bind(this),
-	    });
+	    };
+
+	    if (requireShipping) {
+	      buttonsOptions.onShippingAddressChange =
+	        this._onShippingAddressChange.bind(this);
+
+	      buttonsOptions.onShippingOptionsChange =
+	        this._onShippingOptionsChange.bind(this);
+	    }
+
+	    const component = this.paypal.Buttons(buttonsOptions);
+
+	    if (!component.isEligible()) {
+	      throw new Error('PayPal button with provided options is not eligible.');
+	    }
+
+	    this.element = component;
 	  }
 
 	  mountElements() {
@@ -17056,6 +17105,7 @@
 	    }
 	  }
 
+	  /** @param {Cart} cart */
 	  _validateCart(cart) {
 	    const hasSubscriptionProduct = Boolean(cart.subscription_delivery);
 
@@ -17065,27 +17115,35 @@
 	      );
 	    }
 
-	    if (!(cart.capture_total > 0)) {
+	    if ((cart.capture_total || 0) <= 0) {
 	      throw new Error(
 	        'Invalid PayPal button amount. Value should be greater than zero.',
 	      );
 	    }
 	  }
 
+	  /**
+	   * @param {Cart} cart
+	   * @param {CreateOrderData} _data
+	   * @param {CreateOrderActions} _actions
+	   * @returns {Promise<string>}
+	   */
 	  async _onCreateOrder(cart, _data, _actions) {
-	    const { require: { shipping: requireShipping = true } = {} } = this.params;
+	    const {
+	      locale = 'en-US',
+	      require: { shipping: requireShipping = true } = {},
+	    } = this.params;
+
 	    const { capture_total, currency, subscription_delivery } = cart;
 	    const hasSubscriptionProduct = Boolean(subscription_delivery);
 	    const merchantId = this.merchantId;
 	    const returnUrl = this.returnUrl;
-	    const orderData = {
-	      application_context: {
-	        shipping_preference: requireShipping ? 'GET_FROM_FILE' : 'NO_SHIPPING',
-	      },
-	    };
+	    /** @type {import('@paypal/paypal-js').CreateOrderRequestBody} */
+	    const orderData = {};
+	    /** @type {import('@paypal/paypal-js').PurchaseUnit} */
 	    const purchaseUnit = {
 	      amount: {
-	        value: Number(capture_total.toFixed(2)),
+	        value: Number(capture_total).toFixed(2),
 	        currency_code: currency,
 	      },
 	    };
@@ -17093,29 +17151,44 @@
 	    if (merchantId) {
 	      // express checkout and ppcp
 	      orderData.intent = 'AUTHORIZE';
+
+	      orderData.payment_source = {
+	        paypal: {
+	          experience_context: {
+	            locale,
+	            shipping_preference: requireShipping
+	              ? 'GET_FROM_FILE'
+	              : 'NO_SHIPPING',
+	          },
+	        },
+	      };
+
 	      purchaseUnit.payee = {
 	        merchant_id: merchantId,
 	      };
 
 	      if (hasSubscriptionProduct) {
-	        orderData.payment_source = {
-	          paypal: {
-	            attributes: {
-	              vault: {
-	                store_in_vault: 'ON_SUCCESS',
-	                usage_type: 'MERCHANT',
-	              },
-	            },
-	            experience_context: {
-	              return_url: `${returnUrl}&redirect_status=succeeded`,
-	              cancel_url: `${returnUrl}&redirect_status=canceled`,
-	            },
+	        orderData.payment_source.paypal.attributes = {
+	          vault: {
+	            store_in_vault: 'ON_SUCCESS',
+	            usage_type: 'MERCHANT',
 	          },
 	        };
+
+	        Object.assign(orderData.payment_source.paypal.experience_context, {
+	          return_url: `${returnUrl}&redirect_status=succeeded`,
+	          cancel_url: `${returnUrl}&redirect_status=canceled`,
+	        });
 	      }
 	    } else {
 	      // progressive checkout
 	      orderData.intent = 'CAPTURE';
+
+	      orderData.application_context = {
+	        locale,
+	        shipping_preference: requireShipping ? 'GET_FROM_FILE' : 'NO_SHIPPING',
+	      };
+
 	      purchaseUnit.payee = {
 	        email_address: this.method.store_owner_email,
 	      };
@@ -17131,44 +17204,37 @@
 	    return order.id;
 	  }
 
-	  async _onShippingChange(data, actions) {
+	  /**
+	   * @param {OnShippingAddressChangeData} data
+	   * @param {OnShippingAddressChangeActions} actions
+	   */
+	  async _onShippingAddressChange(data, actions) {
 	    try {
-	      const { orderID, shipping_address, selected_shipping_option } = data;
-	      const updateData = {
+	      const { orderID, shippingAddress } = data;
+
+	      const cart = await this.updateCart({
 	        shipping: {
-	          state: shipping_address.state,
-	          city: shipping_address.city,
-	          zip: shipping_address.postal_code,
-	          country: shipping_address.country_code,
+	          state: shippingAddress.state,
+	          city: shippingAddress.city,
+	          zip: shippingAddress.postalCode,
+	          country: shippingAddress.countryCode,
 	        },
 	        shipment_rating: null,
-	      };
-
-	      if (selected_shipping_option) {
-	        updateData.shipping.service = selected_shipping_option.id;
-	        updateData.$taxes = true;
-	      }
+	      });
 
-	      const cart = await this.updateCart(updateData);
-	      const shippingServices = get(cart, 'shipment_rating.services');
+	      const shippingServices = cart.shipment_rating?.services;
 
-	      // can't fulfill shipping to selected address
+	      // Can't fulfill shipping to selected address
 	      if (isEmpty(shippingServices)) {
 	        return actions.reject();
 	      }
 
-	      let selectedShippingService;
-
-	      if (selected_shipping_option) {
-	        selectedShippingService = shippingServices.find(
-	          (shippingService) =>
-	            shippingService.id === selected_shipping_option.id,
-	        );
-	      }
+	      let selectedShippingService = cart.shipping?.service;
 
 	      // need to set first service for cart by default
 	      if (!selectedShippingService) {
 	        const [firstShippingService] = shippingServices;
+	        selectedShippingService = firstShippingService.id;
 
 	        await this.updateCart({
 	          shipping: {
@@ -17185,8 +17251,33 @@
 	          paypal_order_id: orderID,
 	        },
 	      });
+	    } catch (error) {
+	      this.onError(error);
+
+	      return actions.reject();
+	    }
+	  }
+
+	  /**
+	   * @param {OnShippingOptionsChangeData} data
+	   * @param {OnShippingOptionsChangeActions} actions
+	   */
+	  async _onShippingOptionsChange(data, actions) {
+	    try {
+	      const { orderID, selectedShippingOption } = data;
+
+	      const cart = await this.updateCart({
+	        shipping: { service: selectedShippingOption.id },
+	        $taxes: true,
+	      });
 
-	      return orderID;
+	      await this.updateIntent({
+	        gateway: 'paypal',
+	        intent: {
+	          cart_id: cart.id,
+	          paypal_order_id: orderID,
+	        },
+	      });
 	    } catch (error) {
 	      this.onError(error);
 
@@ -17194,14 +17285,17 @@
 	    }
 	  }
 
+	  /**
+	   * @param {OnApproveData} data
+	   * @param {OnApproveActions} actions
+	   */
 	  async _onApprove(data, actions) {
-	    const { require: { shipping: requireShipping = true } = {} } = this.params;
 	    const order = await actions.order.get();
 	    const orderId = order.id;
-	    const payer = order.payer;
+	    const payer = order.payment_source?.paypal || order.payer;
 	    const billing = payer.address;
-	    const shipping = get(order, 'purchase_units[0].shipping');
-	    const name = `${payer.name.given_name} ${payer.name.surname}`;
+	    const shipping = order.purchase_units?.[0]?.shipping;
+	    const name = `${payer.name?.given_name} ${payer.name?.surname}`;
 
 	    await this.updateCart({
 	      account: {
@@ -17213,31 +17307,35 @@
 	          order_id: orderId,
 	        },
 	        name,
-	        ...this._mapAddress(billing),
+	        ...convertToSwellAddress$1(billing),
 	      },
-	      ...(requireShipping && {
+	      ...(shipping?.address && {
 	        shipping: {
 	          first_name: payer.name.given_name,
 	          last_name: payer.name.surname,
 	          name: shipping.name.full_name,
-	          ...this._mapAddress(shipping.address),
+	          ...convertToSwellAddress$1(shipping.address),
 	        },
 	      }),
 	    });
 
 	    this.onSuccess();
 	  }
+	}
 
-	  _mapAddress(address) {
-	    return {
-	      address1: address.address_line_1,
-	      address2: address.address_line_2,
-	      state: address.admin_area_1,
-	      city: address.admin_area_2,
-	      zip: address.postal_code,
-	      country: address.country_code,
-	    };
-	  }
+	/**
+	 * @param {ShippingAddress} address
+	 * @returns {Address}
+	 */
+	function convertToSwellAddress$1(address) {
+	  return {
+	    address1: address.address_line_1,
+	    address2: address.address_line_2,
+	    state: address.admin_area_1,
+	    city: address.admin_area_2,
+	    zip: address.postal_code,
+	    country: address.country_code,
+	  };
 	}
 
 	class AmazonDirectPayment extends Payment {
@@ -18558,7 +18656,7 @@
 	  const api = {};
 
 	  Object.assign(api, {
-	    version: '5.8.0',
+	    version: '5.8.2',
 	    options,
 	    request,