fix: remove unrelated changes

Author: cryptodev-2s

packages/account-tree-controller/src/backup-and-sync/utils/controller.ts

@@ -41,7 +41,7 @@ export const getLocalGroupForEntropyWallet = (
   const walletId = toMultichainAccountWalletId(entropySourceId);
   const wallet = context.controller.state.accountTree.wallets[walletId];
 
-  if (wallet?.type !== AccountWalletType.Entropy) {
+  if (!wallet || wallet.type !== AccountWalletType.Entropy) {
     backupAndSyncLogger(
       `Wallet ${walletId} not found or is not an entropy wallet`,
     );
@@ -65,7 +65,7 @@ export function getLocalGroupsForEntropyWallet(
   walletId: AccountWalletId,
 ): AccountGroupMultichainAccountObject[] {
   const wallet = context.controller.state.accountTree.wallets[walletId];
-  if (wallet?.type !== AccountWalletType.Entropy) {
+  if (!wallet || wallet.type !== AccountWalletType.Entropy) {
     backupAndSyncLogger(
       `Wallet ${walletId} not found or is not an entropy wallet`,
     );

packages/assets-controllers/src/DeFiPositionsController/DeFiPositionsController.ts

@@ -180,8 +180,9 @@ export class DeFiPositionsController extends StaticIntervalPollingController()<
         const selectedAddress = this.#getSelectedEvmAdress();
 
         if (
-          selectedAddress?.toLowerCase() !==
-          transactionMeta.txParams.from.toLowerCase()
+          !selectedAddress ||
+          selectedAddress.toLowerCase() !==
+            transactionMeta.txParams.from.toLowerCase()
         ) {
           return;
         }

packages/assets-controllers/src/TokenBalancesController.ts

@@ -1025,7 +1025,8 @@ export class TokenBalancesController extends StaticIntervalPollingController<{
       const stakingContractAddress =
         STAKING_CONTRACT_ADDRESS_BY_CHAINID[balance.chainId];
       return (
-        stakingContractAddress?.toLowerCase() === balance.token.toLowerCase()
+        stakingContractAddress &&
+        stakingContractAddress.toLowerCase() === balance.token.toLowerCase()
       );
     });
 

packages/assets-controllers/src/TokenListController.ts

@@ -251,7 +251,7 @@ export class TokenListController extends StaticIntervalPollingController<TokenLi
       const prevData = this.#previousTokensChainsCache[chainId];
 
       // Chain is new or timestamp changed (indicating data update)
-      if (prevData?.timestamp !== newData.timestamp) {
+      if (!prevData || prevData.timestamp !== newData.timestamp) {
         this.#changedChainsToPersist.add(chainId);
       }
     }

packages/keyring-controller/jest.environment.js

@@ -1,10 +1,10 @@
-const NodeEnvironment = require('jest-environment-node').default;
+const { TestEnvironment } = require('jest-environment-node');
 
 /**
  * KeyringController depends on @noble/hashes, which as of 1.3.2 relies on the
  * Web Crypto API in Node and browsers.
  */
-class CustomTestEnvironment extends NodeEnvironment {
+class CustomTestEnvironment extends TestEnvironment {
   async setup() {
     await super.setup();
     if (typeof this.global.crypto === 'undefined') {

packages/multichain-account-service/src/providers/SnapAccountProvider.ts

@@ -159,7 +159,8 @@ export abstract class SnapAccountProvider extends BaseBip44AccountProvider {
   ): Promise<void> {
     await this.withSnap(async ({ keyring }) => {
       const localSnapAccounts = accounts.filter(
-        (account) => account.metadata.snap?.id === this.snapId,
+        (account) =>
+          account.metadata.snap && account.metadata.snap.id === this.snapId,
       );
       const snapAccounts = new Set(
         (await this.#client.listAccounts()).map((account) => account.id),

packages/network-controller/src/NetworkController.ts

@@ -2701,7 +2701,10 @@ export class NetworkController extends BaseController<
       );
     }
 
-    if (networkFields.chainId !== existingNetworkConfiguration?.chainId) {
+    if (
+      existingNetworkConfiguration === null ||
+      networkFields.chainId !== existingNetworkConfiguration.chainId
+    ) {
       const existingNetworkConfigurationViaChainId =
         this.state.networkConfigurationsByChainId[networkFields.chainId];
       if (existingNetworkConfigurationViaChainId !== undefined) {

packages/ramps-controller/src/RampsController.ts

@@ -763,7 +763,8 @@ export class RampsController extends BaseController<
       for (const key of keys) {
         const entry = requests[key];
         if (
-          entry?.status === RequestStatus.SUCCESS &&
+          entry &&
+          entry.status === RequestStatus.SUCCESS &&
           isCacheExpired(entry, ttl)
         ) {
           delete requests[key];

packages/seedless-onboarding-controller/jest.environment.js

@@ -1,10 +1,10 @@
-const NodeEnvironment = require('jest-environment-node').default;
+const { TestEnvironment } = require('jest-environment-node');
 
 /**
  * SeedlessOnboardingController depends on @noble/hashes, which as of 1.7.1 relies on the
  * Web Crypto API in Node and browsers.
  */
-class CustomTestEnvironment extends NodeEnvironment {
+class CustomTestEnvironment extends TestEnvironment {
   async setup() {
     await super.setup();
     if (typeof this.global.crypto === 'undefined') {

packages/subscription-controller/src/SubscriptionController.ts

@@ -1041,7 +1041,8 @@ export class SubscriptionController extends StaticIntervalPollingController()<
     value: CachedLastSelectedPaymentMethod | undefined,
   ): asserts value is Required<CachedLastSelectedPaymentMethod> {
     if (
-      value?.type !== PAYMENT_TYPES.byCrypto ||
+      !value ||
+      value.type !== PAYMENT_TYPES.byCrypto ||
       !value.paymentTokenAddress ||
       !value.paymentTokenSymbol
     ) {