@metamask/subscription-controller 6.2.2 → 8.0.0

package/dist/SubscriptionController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"SubscriptionController.d.mts","sourceRoot":"","sources":["../src/SubscriptionController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubscriptionController.d.mts","sourceRoot":"","sources":["../src/SubscriptionController.ts"],"names":[],"mappings":"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"}

package/dist/SubscriptionController.mjs

@@ -1,20 +1,14 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SubscriptionController_instances, _SubscriptionController_subscriptionService, _SubscriptionController_getSubscriptionPriceAmount, _SubscriptionController_getSubscriptionBalanceAmount, _SubscriptionController_getProductPriceByProductAndPlan, _SubscriptionController_assertValidSubscriptionStateForCryptoApproval, _SubscriptionController_assertIsUserNotSubscribed, _SubscriptionController_assertIsUserSubscribed, _SubscriptionController_assertIsPaymentMethodCrypto, _SubscriptionController_getIsEligibleForTrialedSponsorship, _SubscriptionController_getChainSupportsSponsorship, _SubscriptionController_areTrialedProductsEqual, _SubscriptionController_areSubscriptionsEqual, _SubscriptionController_isSubscriptionEqual, _SubscriptionController_stringifySubscription;
+var _SubscriptionController_instances, _SubscriptionController_getSubscriptionPriceAmount, _SubscriptionController_getSubscriptionBalanceAmount, _SubscriptionController_getProductPriceByProductAndPlan, _SubscriptionController_assertValidSubscriptionStateForCryptoApproval, _SubscriptionController_assertIsUserNotSubscribed, _SubscriptionController_assertIsUserSubscribed, _SubscriptionController_assertIsPaymentMethodCrypto, _SubscriptionController_getIsEligibleForTrialedSponsorship, _SubscriptionController_getIsTrialRequested, _SubscriptionController_findCryptoPaymentMethod, _SubscriptionController_resolveCryptoPaymentMethodDefaults, _SubscriptionController_getChainSupportsSponsorship, _SubscriptionController_areTrialedProductsEqual, _SubscriptionController_areSubscriptionsEqual, _SubscriptionController_isSubscriptionEqual, _SubscriptionController_stringifySubscription;
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { TransactionType } from "@metamask/transaction-controller";
 import { BigNumber } from "bignumber.js";
 import { ACTIVE_SUBSCRIPTION_STATUSES, controllerName, DEFAULT_POLLING_INTERVAL, SubscriptionControllerErrorMessage } from "./constants.mjs";
-import { PAYMENT_TYPES, PRODUCT_TYPES, SUBSCRIPTION_STATUSES } from "./types.mjs";
+import { CRYPTO_AUTH_METHODS, PAYMENT_TYPES, PRODUCT_TYPES, SUBSCRIPTION_STATUSES } from "./types.mjs";
 /**
  * Get the default state for the Subscription Controller.
  *
@@ -84,10 +78,10 @@ const MESSENGER_EXPOSED_METHODS = [
     'getSubscriptionsEligibilities',
     'cancelSubscription',
     'unCancelSubscription',
-    'startShieldSubscriptionWithCard',
+    'startSubscriptionWithCard',
     'startSubscriptionWithCrypto',
     'stopAllPolling',
-    'submitShieldSubscriptionCryptoApproval',
+    'submitSubscriptionCryptoApproval',
     'getCryptoApproveTransactionParams',
     'updatePaymentMethod',
     'getBillingPortalUrl',
@@ -109,10 +103,10 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @param options - The options for the SubscriptionController.
      * @param options.messenger - A restricted messenger.
      * @param options.state - Initial state to set on this controller.
-     * @param options.subscriptionService - The subscription service for communicating with subscription server.
      * @param options.pollingInterval - The polling interval to use for the subscription controller.
      */
-    constructor({ messenger, state, subscriptionService, pollingInterval = DEFAULT_POLLING_INTERVAL, }) {
+    constructor(options) {
+        const { messenger, state, pollingInterval = DEFAULT_POLLING_INTERVAL, } = options;
         super({
             name: controllerName,
             metadata: subscriptionControllerMetadata,
@@ -123,9 +117,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
             messenger,
         });
         _SubscriptionController_instances.add(this);
-        _SubscriptionController_subscriptionService.set(this, void 0);
         this.setIntervalLength(pollingInterval);
-        __classPrivateFieldSet(this, _SubscriptionController_subscriptionService, subscriptionService, "f");
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
@@ -134,7 +126,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @returns The pricing information.
      */
     async getPricing() {
-        const pricing = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").getPricing();
+        const pricing = await this.messenger.call('SubscriptionService:getPricing');
         this.update((state) => {
             state.pricing = pricing;
         });
@@ -146,7 +138,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         const currentCustomerId = this.state.customerId;
         const currentLastSubscription = this.state.lastSubscription;
         const currentRewardAccountId = this.state.rewardAccountId;
-        const { customerId: newCustomerId, subscriptions: newSubscriptions, trialedProducts: newTrialedProducts, lastSubscription: newLastSubscription, rewardAccountId: newRewardAccountId, } = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").getSubscriptions();
+        const { customerId: newCustomerId, subscriptions: newSubscriptions, trialedProducts: newTrialedProducts, lastSubscription: newLastSubscription, rewardAccountId: newRewardAccountId, } = await this.messenger.call('SubscriptionService:getSubscriptions');
         // check if the new subscriptions are different from the current subscriptions
         const areSubscriptionsEqual = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_areSubscriptionsEqual).call(this, currentSubscriptions, newSubscriptions);
         // check if the new trialed products are different from the current trialed products
@@ -190,11 +182,11 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @returns The subscriptions eligibilities.
      */
     async getSubscriptionsEligibilities(request) {
-        return await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").getSubscriptionsEligibilities(request);
+        return await this.messenger.call('SubscriptionService:getSubscriptionsEligibilities', request);
     }
     async cancelSubscription(request) {
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserSubscribed).call(this, { subscriptionId: request.subscriptionId });
-        const cancelledSubscription = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").cancelSubscription(request);
+        const cancelledSubscription = await this.messenger.call('SubscriptionService:cancelSubscription', request);
         this.update((state) => {
             state.subscriptions = state.subscriptions.map((subscription) => subscription.id === request.subscriptionId
                 ? { ...subscription, ...cancelledSubscription }
@@ -204,7 +196,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
     }
     async unCancelSubscription(request) {
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserSubscribed).call(this, { subscriptionId: request.subscriptionId });
-        const uncancelledSubscription = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").unCancelSubscription({
+        const uncancelledSubscription = await this.messenger.call('SubscriptionService:unCancelSubscription', {
             subscriptionId: request.subscriptionId,
         });
         this.update((state) => {
@@ -214,51 +206,107 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         });
         this.triggerAccessTokenRefresh();
     }
-    async startShieldSubscriptionWithCard(request) {
+    /**
+     * Starts a card-paid subscription checkout session for the requested products
+     * (e.g. Shield or Money Account Plus).
+     *
+     * `isTrialRequested` on the request is ignored and overwritten from pricing
+     * (`trialPeriodDays > 0`) and `trialedProducts`.
+     *
+     * @param request - The start subscription request.
+     * @returns The checkout session response.
+     */
+    async startSubscriptionWithCard(request) {
+        // get the latest subscriptions state before computing trial eligibility
+        await this.getSubscriptions();
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserNotSubscribed).call(this, { products: request.products });
-        const response = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").startSubscriptionWithCard(request);
+        const response = await this.messenger.call('SubscriptionService:startSubscriptionWithCard', {
+            ...request,
+            isTrialRequested: __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getIsTrialRequested).call(this, request.products, request.recurringInterval),
+        });
         // note: no need to trigger access token refresh after startSubscriptionWithCard request because this only return stripe checkout session url, subscription not created yet
         return response;
     }
+    /**
+     * Starts a crypto-paid subscription for the requested products
+     * (e.g. Shield or Money Account Plus). Unlike card checkout, this
+     * creates the subscription immediately, so local state is refreshed
+     * afterwards.
+     *
+     * `isTrialRequested` on the request is ignored and overwritten from pricing
+     * (`trialPeriodDays > 0`) and `trialedProducts`.
+     *
+     * @param request - The start crypto subscription request.
+     * @returns The start crypto subscription response.
+     * @throws If `products` is empty.
+     */
     async startSubscriptionWithCrypto(request) {
+        if (request.products.length === 0) {
+            throw new Error(SubscriptionControllerErrorMessage.SubscriptionProductsEmpty);
+        }
+        // get the latest subscriptions state before computing trial eligibility
+        await this.getSubscriptions();
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserNotSubscribed).call(this, { products: request.products });
-        const response = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").startSubscriptionWithCrypto(request);
+        const response = await this.messenger.call('SubscriptionService:startSubscriptionWithCrypto', {
+            ...request,
+            isTrialRequested: __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getIsTrialRequested).call(this, request.products, request.recurringInterval),
+        });
+        // Crypto start creates the subscription immediately (unlike card checkout).
+        await this.getSubscriptions();
         return response;
     }
     /**
-     * Handles shield subscription crypto approval transactions.
+     * Submits a Shield ERC-20 crypto approval transaction to start or update a
+     * crypto subscription.
      *
-     * @param txMeta - The transaction metadata.
-     * @param isSponsored - Whether the transaction is sponsored.
-     * @param rewardAccountId - The account ID of the reward subscription to link to the shield subscription.
+     * This handler is Shield / `TransactionType.shieldSubscriptionApprove` only.
+     * Delegation-based products (e.g. Money Account) must call
+     * `startSubscriptionWithCrypto` instead.
+     *
+     * @param request - The crypto approval request.
+     * @param request.productType - The subscription product. Typed as
+     * `typeof PRODUCT_TYPES.SHIELD` only at the moment (future might support more
+     * product).
+     * @param request.txMeta - The transaction metadata. Must have type
+     * `TransactionType.shieldSubscriptionApprove`.
+     * @param request.isSponsored - Whether the transaction is sponsored.
+     * @param request.rewardAccountId - The account ID of the reward subscription
+     * to link.
+     * @throws If `productType` is not Shield or `txMeta.type` is not
+     * `shieldSubscriptionApprove`.
      * @returns void
      */
-    async submitShieldSubscriptionCryptoApproval(txMeta, isSponsored, rewardAccountId) {
-        if (txMeta.type !== TransactionType.shieldSubscriptionApprove) {
-            return;
+    async submitSubscriptionCryptoApproval(request) {
+        const { productType, txMeta, isSponsored, rewardAccountId } = request;
+        if (
+        // Widen for the runtime guard: JS / unsound callers may still pass a
+        // non-Shield product.
+        productType !== PRODUCT_TYPES.SHIELD ||
+            txMeta.type !== TransactionType.shieldSubscriptionApprove) {
+            throw new Error(SubscriptionControllerErrorMessage.CryptoApprovalRequiresShieldApprove);
         }
         const { chainId, rawTx } = txMeta;
         if (!chainId || !rawTx) {
             throw new Error('Chain ID or raw transaction not found');
         }
-        const { pricing, trialedProducts, lastSelectedPaymentMethod } = this.state;
+        const { pricing, lastSelectedPaymentMethod } = this.state;
         if (!pricing) {
             throw new Error('Subscription pricing not found');
         }
         if (!lastSelectedPaymentMethod) {
             throw new Error('Last selected payment method not found');
         }
-        const lastSelectedPaymentMethodShield = lastSelectedPaymentMethod[PRODUCT_TYPES.SHIELD];
-        __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsPaymentMethodCrypto).call(this, lastSelectedPaymentMethodShield);
-        const productPrice = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getProductPriceByProductAndPlan).call(this, PRODUCT_TYPES.SHIELD, lastSelectedPaymentMethodShield.plan);
-        const isTrialed = trialedProducts?.includes(PRODUCT_TYPES.SHIELD);
-        // get the latest subscriptions state to check if the user has an active shield subscription
+        const lastSelectedPaymentMethodForProduct = lastSelectedPaymentMethod[productType];
+        __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsPaymentMethodCrypto).call(this, lastSelectedPaymentMethodForProduct);
+        const productPrice = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getProductPriceByProductAndPlan).call(this, productType, lastSelectedPaymentMethodForProduct.plan);
+        // get the latest subscriptions state before computing trial eligibility
         await this.getSubscriptions();
-        const currentSubscription = this.state.subscriptions.find((subscription) => subscription.products.some((product) => product.name === PRODUCT_TYPES.SHIELD));
+        const isTrialRequested = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getIsTrialRequested).call(this, [productType], lastSelectedPaymentMethodForProduct.plan);
+        const currentSubscription = this.getSubscriptionByProduct(productType);
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertValidSubscriptionStateForCryptoApproval).call(this, {
-            productType: PRODUCT_TYPES.SHIELD,
+            productType,
         });
-        // if shield subscription exists, this transaction is for changing payment method
+        // if subscription exists, this transaction is for changing payment method
         const isChangePaymentMethod = Boolean(currentSubscription);
         if (isChangePaymentMethod) {
             await this.updatePaymentMethod({
@@ -266,7 +314,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
                 subscriptionId: currentSubscription.id,
                 chainId,
                 payerAddress: txMeta.txParams.from,
-                tokenSymbol: lastSelectedPaymentMethodShield.paymentTokenSymbol,
+                tokenSymbol: lastSelectedPaymentMethodForProduct.paymentTokenSymbol,
                 rawTransaction: rawTx,
                 recurringInterval: productPrice.interval,
                 billingCycles: productPrice.minBillingCycles,
@@ -274,16 +322,17 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         }
         else {
             const params = {
-                products: [PRODUCT_TYPES.SHIELD],
-                isTrialRequested: !isTrialed,
+                products: [productType],
+                isTrialRequested,
                 recurringInterval: productPrice.interval,
                 billingCycles: productPrice.minBillingCycles,
                 chainId,
                 payerAddress: txMeta.txParams.from,
-                tokenSymbol: lastSelectedPaymentMethodShield.paymentTokenSymbol,
+                tokenSymbol: lastSelectedPaymentMethodForProduct.paymentTokenSymbol,
                 rawTransaction: rawTx,
+                cryptoAuthMethod: CRYPTO_AUTH_METHODS.ERC20_APPROVAL,
                 isSponsored,
-                useTestClock: lastSelectedPaymentMethodShield.useTestClock,
+                useTestClock: lastSelectedPaymentMethodForProduct.useTestClock,
                 rewardAccountId,
             };
             await this.startSubscriptionWithCrypto(params);
@@ -314,7 +363,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         if (!price) {
             throw new Error('Price not found');
         }
-        const chainsPaymentInfo = pricing.paymentMethods.find((paymentMethod) => paymentMethod.type === PAYMENT_TYPES.byCrypto);
+        const chainsPaymentInfo = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_findCryptoPaymentMethod).call(this, request.productType, CRYPTO_AUTH_METHODS.ERC20_APPROVAL);
         if (!chainsPaymentInfo) {
             throw new Error('Chains payment info not found');
         }
@@ -338,11 +387,11 @@ export class SubscriptionController extends StaticIntervalPollingController() {
     async updatePaymentMethod(opts) {
         if (opts.paymentType === PAYMENT_TYPES.byCard) {
             const { paymentType, ...cardRequest } = opts;
-            return await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").updatePaymentMethodCard(cardRequest);
+            return await this.messenger.call('SubscriptionService:updatePaymentMethodCard', cardRequest);
         }
         else if (opts.paymentType === PAYMENT_TYPES.byCrypto) {
             const { paymentType, ...cryptoRequest } = opts;
-            await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").updatePaymentMethodCrypto(cryptoRequest);
+            await this.messenger.call('SubscriptionService:updatePaymentMethodCrypto', cryptoRequest);
             return await this.getSubscriptions();
         }
         throw new Error('Invalid payment type');
@@ -353,19 +402,20 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @returns The billing portal URL
      */
     async getBillingPortalUrl() {
-        return await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").getBillingPortalUrl();
+        return await this.messenger.call('SubscriptionService:getBillingPortalUrl');
     }
     /**
      * Cache the last selected payment method for a specific product.
      *
-     * @param product - The product to cache the payment method for.
-     * @param paymentMethod - The payment method to cache.
-     * @param paymentMethod.type - The type of the payment method.
-     * @param paymentMethod.paymentTokenAddress - The payment token address.
-     * @param paymentMethod.plan - The plan of the payment method.
-     * @param paymentMethod.product - The product of the payment method.
+     * @param request - The request object.
+     * @param request.product - The product to cache the payment method for.
+     * @param request.paymentMethod - The payment method to cache.
+     * @param request.paymentMethod.type - The type of the payment method.
+     * @param request.paymentMethod.paymentTokenAddress - The payment token address.
+     * @param request.paymentMethod.plan - The plan of the payment method.
      */
-    cacheLastSelectedPaymentMethod(product, paymentMethod) {
+    cacheLastSelectedPaymentMethod(request) {
+        const { product, paymentMethod } = request;
         if (paymentMethod.type === PAYMENT_TYPES.byCrypto &&
             (!paymentMethod.paymentTokenAddress || !paymentMethod.paymentTokenSymbol)) {
             throw new Error(SubscriptionControllerErrorMessage.PaymentTokenAddressAndSymbolRequiredForCrypto);
@@ -404,7 +454,8 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      *   recurringInterval: RecurringInterval.Month,
      *   billingCycles: 1,
      * }
-     * @returns resolves to true if the sponsorship is supported and intents were submitted successfully, false otherwise
+     * @returns resolves to true if the sponsorship is supported and intents were submitted successfully, false if the chain does not support sponsorship or the user has already trialed
+     * @throws If the crypto payment method or chain is missing from pricing
      */
     async submitSponsorshipIntents(request) {
         if (request.products.length === 0) {
@@ -413,7 +464,9 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserNotSubscribed).call(this, { products: request.products });
         const selectedPaymentMethod = this.state.lastSelectedPaymentMethod?.[request.products[0]];
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsPaymentMethodCrypto).call(this, selectedPaymentMethod);
-        const isEligibleForTrialedSponsorship = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getIsEligibleForTrialedSponsorship).call(this, request.chainId, request.products);
+        const cryptoAuthMethod = selectedPaymentMethod.cryptoAuthMethod ??
+            CRYPTO_AUTH_METHODS.ERC20_APPROVAL;
+        const isEligibleForTrialedSponsorship = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getIsEligibleForTrialedSponsorship).call(this, request.chainId, request.products, cryptoAuthMethod);
         if (!isEligibleForTrialedSponsorship) {
             return false;
         }
@@ -422,7 +475,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         // we only support one product at a time for now
         request.products[0], plan);
         const billingCycles = productPrice.minBillingCycles;
-        await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").submitSponsorshipIntents({
+        await this.messenger.call('SubscriptionService:submitSponsorshipIntents', {
             ...request,
             paymentTokenSymbol,
             billingCycles,
@@ -437,7 +490,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @example { event: SubscriptionUserEvent.ShieldEntryModalViewed, cohort: 'post_tx' }
      */
     async submitUserEvent(request) {
-        await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").submitUserEvent(request);
+        await this.messenger.call('SubscriptionService:submitUserEvent', request);
     }
     /**
      * Assign user to a cohort.
@@ -446,7 +499,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @example { cohort: 'post_tx' }
      */
     async assignUserToCohort(request) {
-        await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").assignUserToCohort(request);
+        await this.messenger.call('SubscriptionService:assignUserToCohort', request);
     }
     /**
      * Link rewards to a subscription.
@@ -461,7 +514,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         // assert that the user is subscribed to the subscription
         __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_assertIsUserSubscribed).call(this, { subscriptionId: request.subscriptionId });
         // link rewards to the subscription
-        const response = await __classPrivateFieldGet(this, _SubscriptionController_subscriptionService, "f").linkRewards({
+        const response = await this.messenger.call('SubscriptionService:linkRewards', {
             rewardAccountId: request.rewardAccountId,
         });
         if (!response.success) {
@@ -479,7 +532,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @returns The token approve amount
      */
     getTokenApproveAmount(price, tokenPaymentInfo) {
-        const conversionRate = tokenPaymentInfo.conversionRate[price.currency];
+        const conversionRate = tokenPaymentInfo.conversionRate?.[price.currency];
         if (!conversionRate) {
             throw new Error('Conversion rate not found');
         }
@@ -499,7 +552,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
      * @returns The token balance amount
      */
     getTokenMinimumBalanceAmount(price, tokenPaymentInfo) {
-        const conversionRate = tokenPaymentInfo.conversionRate[price.currency];
+        const conversionRate = tokenPaymentInfo.conversionRate?.[price.currency];
         if (!conversionRate) {
             throw new Error('Conversion rate not found');
         }
@@ -529,7 +582,7 @@ export class SubscriptionController extends StaticIntervalPollingController() {
         this.messenger.call('AuthenticationController:performSignOut');
     }
 }
-_SubscriptionController_subscriptionService = new WeakMap(), _SubscriptionController_instances = new WeakSet(), _SubscriptionController_getSubscriptionPriceAmount = function _SubscriptionController_getSubscriptionPriceAmount(price) {
+_SubscriptionController_instances = new WeakSet(), _SubscriptionController_getSubscriptionPriceAmount = function _SubscriptionController_getSubscriptionPriceAmount(price) {
     // no need to use BigInt since max unitDecimals are always 2 for price
     const amount = new BigNumber(price.unitAmount)
         .div(10 ** price.unitDecimals)
@@ -581,15 +634,74 @@ _SubscriptionController_subscriptionService = new WeakMap(), _SubscriptionContro
         !value.paymentTokenSymbol) {
         throw new Error(SubscriptionControllerErrorMessage.PaymentMethodNotCrypto);
     }
-}, _SubscriptionController_getIsEligibleForTrialedSponsorship = function _SubscriptionController_getIsEligibleForTrialedSponsorship(chainId, products) {
-    const isSponsorshipSupported = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getChainSupportsSponsorship).call(this, chainId);
+}, _SubscriptionController_getIsEligibleForTrialedSponsorship = function _SubscriptionController_getIsEligibleForTrialedSponsorship(chainId, products, cryptoAuthMethod) {
+    const isSponsorshipSupported = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getChainSupportsSponsorship).call(this, chainId, products[0], cryptoAuthMethod);
     // verify if the user has trialed the provided products before
     const hasTrialedBefore = this.state.trialedProducts.some((product) => products.includes(product));
     return isSponsorshipSupported && !hasTrialedBefore;
-}, _SubscriptionController_getChainSupportsSponsorship = function _SubscriptionController_getChainSupportsSponsorship(chainId) {
-    const cryptoPaymentInfo = this.state.pricing?.paymentMethods.find((paymentMethod) => paymentMethod.type === PAYMENT_TYPES.byCrypto);
-    const isSponsorshipSupported = cryptoPaymentInfo?.chains?.find((chain) => chain.chainId === chainId)?.isSponsorshipSupported;
-    return Boolean(isSponsorshipSupported);
+}, _SubscriptionController_getIsTrialRequested = function _SubscriptionController_getIsTrialRequested(products, plan) {
+    return products.every((productType) => {
+        if (this.state.trialedProducts.includes(productType)) {
+            return false;
+        }
+        const productPrice = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_getProductPriceByProductAndPlan).call(this, productType, plan);
+        return productPrice.trialPeriodDays > 0;
+    });
+}, _SubscriptionController_findCryptoPaymentMethod = function _SubscriptionController_findCryptoPaymentMethod(productType, cryptoAuthMethod) {
+    const matches = [];
+    for (const paymentMethod of this.state.pricing?.paymentMethods ?? []) {
+        if (paymentMethod.type !== PAYMENT_TYPES.byCrypto) {
+            continue;
+        }
+        const resolved = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_resolveCryptoPaymentMethodDefaults).call(this, paymentMethod);
+        if (!resolved) {
+            continue;
+        }
+        if (resolved.cryptoAuthMethod === cryptoAuthMethod &&
+            resolved.products.includes(productType)) {
+            matches.push({
+                method: paymentMethod,
+                explicit: resolved.explicit,
+            });
+        }
+    }
+    if (matches.length === 0) {
+        return undefined;
+    }
+    const explicitMatches = matches.filter((match) => match.explicit);
+    const candidates = explicitMatches.length > 0 ? explicitMatches : matches;
+    if (candidates.length > 1) {
+        throw new Error('Multiple matching crypto payment methods found');
+    }
+    return candidates[0].method;
+}, _SubscriptionController_resolveCryptoPaymentMethodDefaults = function _SubscriptionController_resolveCryptoPaymentMethodDefaults(paymentMethod) {
+    const productsPresent = paymentMethod.products !== undefined;
+    const authPresent = paymentMethod.cryptoAuthMethod !== undefined;
+    if (!productsPresent && !authPresent) {
+        return {
+            products: [PRODUCT_TYPES.SHIELD],
+            cryptoAuthMethod: CRYPTO_AUTH_METHODS.ERC20_APPROVAL,
+            explicit: false,
+        };
+    }
+    if (!paymentMethod.products?.length || !paymentMethod.cryptoAuthMethod) {
+        return undefined;
+    }
+    return {
+        products: paymentMethod.products,
+        cryptoAuthMethod: paymentMethod.cryptoAuthMethod,
+        explicit: true,
+    };
+}, _SubscriptionController_getChainSupportsSponsorship = function _SubscriptionController_getChainSupportsSponsorship(chainId, productType, cryptoAuthMethod) {
+    const cryptoPaymentInfo = __classPrivateFieldGet(this, _SubscriptionController_instances, "m", _SubscriptionController_findCryptoPaymentMethod).call(this, productType, cryptoAuthMethod);
+    if (!cryptoPaymentInfo) {
+        throw new Error('Chains payment info not found');
+    }
+    const chainPaymentInfo = cryptoPaymentInfo.chains?.find((chain) => chain.chainId === chainId);
+    if (!chainPaymentInfo) {
+        throw new Error('Invalid chain id');
+    }
+    return Boolean(chainPaymentInfo.isSponsorshipSupported);
 }, _SubscriptionController_areTrialedProductsEqual = function _SubscriptionController_areTrialedProductsEqual(oldTrialedProducts, newTrialedProducts) {
     return (oldTrialedProducts.length === newTrialedProducts?.length &&
         oldTrialedProducts.every((product) => newTrialedProducts?.includes(product)));