fix: remove redundant value

Author: tuna1207

packages/subscription-controller/src/SubscriptionController.test.ts

@@ -1889,50 +1889,6 @@ describe('SubscriptionController', () => {
       );
     });
 
-    it('should throw error when selected token price is not found', async () => {
-      await withController(
-        {
-          state: {
-            pricing: MOCK_PRICE_INFO_RESPONSE,
-            trialedProducts: [],
-            subscriptions: [],
-            lastSelectedPaymentMethod: {
-              [PRODUCT_TYPES.SHIELD]: {
-                type: PAYMENT_TYPES.byCrypto,
-                paymentTokenAddress: '0x123',
-                paymentTokenSymbol: 'USDT',
-                plan: RECURRING_INTERVALS.month,
-              },
-            },
-          },
-        },
-        async ({ controller, mockService }) => {
-          // Create a shield subscription approval transaction with token address that doesn't exist
-          const txMeta = {
-            ...generateMockTxMeta(),
-            type: TransactionType.shieldSubscriptionApprove,
-            chainId: '0x1' as Hex,
-            rawTx: '0x123',
-            txParams: {
-              data: '0x456',
-              from: '0x1234567890123456789012345678901234567890',
-              to: '0xnonexistent',
-            },
-            status: TransactionStatus.submitted,
-            hash: '0x123',
-          };
-
-          await expect(
-            controller.submitShieldSubscriptionCryptoApproval(txMeta),
-          ).rejects.toThrow('Selected token price not found');
-
-          expect(
-            mockService.startSubscriptionWithCrypto,
-          ).not.toHaveBeenCalled();
-        },
-      );
-    });
-
     it('should throw error when product price is not found', async () => {
       await withController(
         {
@@ -1968,7 +1924,9 @@ describe('SubscriptionController', () => {
 
           await expect(
             controller.submitShieldSubscriptionCryptoApproval(txMeta),
-          ).rejects.toThrow('Product price not found');
+          ).rejects.toThrow(
+            SubscriptionControllerErrorMessage.ProductPriceNotFound,
+          );
 
           expect(
             mockService.startSubscriptionWithCrypto,

packages/subscription-controller/src/SubscriptionController.ts

@@ -856,37 +856,16 @@ export class SubscriptionController extends StaticIntervalPollingController()<
     if (!lastSelectedPaymentMethod) {
       throw new Error('Last selected payment method not found');
     }
-    this.#assertIsPaymentMethodCrypto(
-      lastSelectedPaymentMethod[PRODUCT_TYPES.SHIELD],
-    );
+    const lastSelectedPaymentMethodShield =
+      lastSelectedPaymentMethod[PRODUCT_TYPES.SHIELD];
+    this.#assertIsPaymentMethodCrypto(lastSelectedPaymentMethodShield);
 
     const isTrialed = trialedProducts?.includes(PRODUCT_TYPES.SHIELD);
-    const pricingPlans = pricing?.products.find(
-      (product) => product.name === PRODUCT_TYPES.SHIELD,
-    )?.prices;
-    const cryptoPaymentMethod = pricing?.paymentMethods.find(
-      (paymentMethod) => paymentMethod.type === PAYMENT_TYPES.byCrypto,
-    );
-    const selectedTokenPrice = cryptoPaymentMethod?.chains
-      ?.find(
-        (chain) =>
-          chain.chainId.toLowerCase() === txMeta?.chainId.toLowerCase(),
-      )
-      ?.tokens.find(
-        (token) =>
-          token.address.toLowerCase() === txMeta?.txParams?.to?.toLowerCase(),
-      );
-    if (!selectedTokenPrice) {
-      throw new Error('Selected token price not found');
-    }
 
-    const productPrice = pricingPlans?.find(
-      (plan) =>
-        plan.interval === lastSelectedPaymentMethod[PRODUCT_TYPES.SHIELD]?.plan,
+    const productPrice = this.#getProductPriceByProductAndPlan(
+      PRODUCT_TYPES.SHIELD,
+      lastSelectedPaymentMethodShield.plan,
     );
-    if (!productPrice) {
-      throw new Error('Product price not found');
-    }
 
     const params = {
       products: [PRODUCT_TYPES.SHIELD],
@@ -895,7 +874,7 @@ export class SubscriptionController extends StaticIntervalPollingController()<
       billingCycles: productPrice.minBillingCycles,
       chainId,
       payerAddress: txMeta.txParams.from as Hex,
-      tokenSymbol: selectedTokenPrice.symbol,
+      tokenSymbol: lastSelectedPaymentMethodShield.paymentTokenSymbol,
       rawTransaction: rawTx as Hex,
       isSponsored,
     };