Merge branch 'main' into fix/remove-segmented-tab-on-confirm-import-token-page

Author: matteoscurati

shared/modules/selectors/index.test.ts

@@ -220,14 +220,35 @@ describe('Selectors', () => {
     );
 
     jestIt(
-      'returns false if feature flag is enabled, not a HW and is BSC network',
+      'returns true if feature flag is enabled, not a HW and is BSC network with a default RPC URL',
       () => {
         const state = createSwapsMockStore();
         const newState = {
           ...state,
           metamask: {
             ...state.metamask,
-            ...mockNetworkState({ chainId: CHAIN_IDS.BSC }),
+            ...mockNetworkState({
+              chainId: CHAIN_IDS.BSC,
+              rpcUrl: 'https://bsc-dataseed.binance.org/',
+            }),
+          },
+        };
+        expect(getSmartTransactionsEnabled(newState)).toBe(true);
+      },
+    );
+
+    jestIt(
+      'returns false if feature flag is enabled, not a HW and is BSC network with a non-default RPC URL',
+      () => {
+        const state = createSwapsMockStore();
+        const newState = {
+          ...state,
+          metamask: {
+            ...state.metamask,
+            ...mockNetworkState({
+              chainId: CHAIN_IDS.BSC,
+              rpcUrl: 'https://bsc-dataseed1.defibit.io/',
+            }),
           },
         };
         expect(getSmartTransactionsEnabled(newState)).toBe(false);

shared/modules/selectors/smart-transactions.ts

@@ -137,17 +137,19 @@ export const getCurrentChainSupportsSmartTransactions = (
 
 const getIsAllowedRpcUrlForSmartTransactions = (state: NetworkState) => {
   const chainId = getCurrentChainId(state);
+  // Allow in non-production or if chain ID is on skip list.
   if (!isProduction() || SKIP_STX_RPC_URL_CHECK_CHAIN_IDS.includes(chainId)) {
-    // Allow any STX RPC URL in development and testing environments or for specific chain IDs.
     return true;
   }
-  const currentNetwork = getCurrentNetwork(state);
-  if (!currentNetwork?.rpcUrl) {
+  const rpcUrl = getCurrentNetwork(state)?.rpcUrl;
+  if (!rpcUrl) {
     return false;
   }
-  const rpcUrl = new URL(currentNetwork.rpcUrl);
-  // Only allow STX in prod if an Infura RPC URL is being used.
-  return rpcUrl?.hostname?.endsWith('.infura.io');
+  const { hostname } = new URL(rpcUrl);
+  if (!hostname) {
+    return false;
+  }
+  return hostname.endsWith('.infura.io') || hostname.endsWith('.binance.org');
 };
 
 export const getSmartTransactionsEnabled = (