feat: incoming transactions by network

app/actions/privacy/index.js

@@ -12,13 +12,6 @@ export function rejectHost(hostname) {
   };
 }
 
-export function setThirdPartyApiMode(enabled) {
-  return {
-    type: 'SET_THIRD_PARTY_API_MODE',
-    enabled,
-  };
-}
-
 export function recordSRPRevealTimestamp(timestamp) {
   return {
     type: 'RECORD_SRP_REVEAL_TIMESTAMP',

app/components/Nav/Main/index.js

@@ -63,13 +63,16 @@ import { useEnableAutomaticSecurityChecks } from '../../hooks/EnableAutomaticSec
 import { useMinimumVersions } from '../../hooks/MinimumVersions';
 import navigateTermsOfUse from '../../../util/termsOfUse/termsOfUse';
 import {
+  selectChainId,
   selectProviderConfig,
   selectProviderType,
 } from '../../../selectors/networkController';
 import WarningAlert from '../../../components/UI/WarningAlert/WarningAlert';
 import { LINEA_MAINNET } from '../../../constants/network';
 import jsonRpcRequest from '../../../util/jsonRpcRequest';
 import { LINEA_MAINNET_RPC_URL } from '../../../constants/urls';
+import { selectShowIncomingTransactionNetworks } from '../../../selectors/preferencesController';
+import { toHexadecimal } from '../../../util/number';
 
 const Stack = createStackNavigator();
 
@@ -106,13 +109,14 @@ const Main = (props) => {
 
   useEffect(() => {
     const { TransactionController } = Engine.context;
+    const currentHexChainId = `0x${toHexadecimal(props.chainId)}`;
 
-    if (props.thirdPartyApiMode) {
+    if (props.showIncomingTransactionsNetworks[currentHexChainId]) {
       TransactionController.startIncomingTransactionPolling();
     } else {
       TransactionController.stopIncomingTransactionPolling();
     }
-  }, [props.thirdPartyApiMode]);
+  }, [props.showIncomingTransactionsNetworks, props.chainId]);
 
   const connectionChangeHandler = useCallback(
     (state) => {
@@ -395,9 +399,9 @@ Main.propTypes = {
   hideCurrentNotification: PropTypes.func,
   removeNotificationById: PropTypes.func,
   /**
-   * Indicates whether third party API mode is enabled
+   * Indicates whether networks allows incoming transactions
    */
-  thirdPartyApiMode: PropTypes.bool,
+  showIncomingTransactionsNetworks: PropTypes.object,
   /**
    * Network provider type
    */
@@ -418,11 +422,17 @@ Main.propTypes = {
    * Object that represents the current route info like params passed to it
    */
   route: PropTypes.object,
+  /**
+   * Current chain id
+   */
+  chainId: PropTypes.string,
 };
 
 const mapStateToProps = (state) => ({
-  thirdPartyApiMode: state.privacy.thirdPartyApiMode,
+  showIncomingTransactionsNetworks:
+    selectShowIncomingTransactionNetworks(state),
   providerType: selectProviderType(state),
+  chainId: selectChainId(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({

app/components/UI/Transactions/index.test.tsx

@@ -10,9 +10,6 @@ const initialState = {
   engine: {
     backgroundState: initialBackgroundState,
   },
-  privacy: {
-    thirdPartyApiMode: true,
-  },
   settings: {
     primaryCurrency: 'USD',
   },

app/components/Views/NetworkSelector/NetworkSelector.test.tsx

@@ -35,7 +35,6 @@ jest.mock('../../../core/Engine', () => ({
 
 const initialState = {
   navigation: { currentBottomNavRoute: 'Wallet' },
-  privacy: { thirdPartyApiMode: true },
   settings: {
     primaryCurrency: 'usd',
   },
@@ -149,7 +148,6 @@ describe('Network Selector', () => {
   it('toggle test network is disabled and is on when a testnet is selected', () => {
     const { getByTestId } = renderComponent({
       navigation: { currentBottomNavRoute: 'Wallet' },
-      privacy: { thirdPartyApiMode: true },
       settings: {
         primaryCurrency: 'usd',
       },

app/components/Views/Settings/NetworksSettings/NetworkSettings/index.js

@@ -242,10 +242,6 @@ class NetworkSettings extends PureComponent {
      * returns an array of onboarded networks
      */
     networkOnboardedState: PropTypes.object,
-    /**
-     * Indicates whether third party API mode is enabled
-     */
-    thirdPartyApiMode: PropTypes.bool,
     /**
      * Checks if adding custom mainnet.
      */
@@ -1157,7 +1153,6 @@ const mapStateToProps = (state) => ({
   providerConfig: selectProviderConfig(state),
   networkConfigurations: selectNetworkConfigurations(state),
   networkOnboardedState: state.networkOnboarded.networkOnboardedState,
-  thirdPartyApiMode: state.privacy.thirdPartyApiMode,
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(NetworkSettings);

app/components/Views/Settings/NetworksSettings/NetworkSettings/index.test.tsx

@@ -13,9 +13,6 @@ const initialState = {
   networkOnboarded: {
     networkOnboardedState: { '1': true },
   },
-  privacy: {
-    thirdPartyApiMode: true,
-  },
 };
 const store = mockStore(initialState);
 

app/components/Views/Settings/NetworksSettings/index.js

@@ -133,10 +133,6 @@ class NetworksSettings extends PureComponent {
      * Current network provider configuration
      */
     providerConfig: PropTypes.object,
-    /**
-     * Indicates whether third party API mode is enabled
-     */
-    thirdPartyApiMode: PropTypes.bool,
   };
 
   actionSheet = null;
@@ -537,7 +533,6 @@ NetworksSettings.contextType = ThemeContext;
 const mapStateToProps = (state) => ({
   providerConfig: selectProviderConfig(state),
   networkConfigurations: selectNetworkConfigurations(state),
-  thirdPartyApiMode: state.privacy.thirdPartyApiMode,
 });
 
 export default connect(mapStateToProps)(NetworksSettings);

app/components/Views/Settings/NetworksSettings/index.test.tsx

@@ -10,9 +10,6 @@ const initialState = {
   engine: {
     backgroundState: initialBackgroundState,
   },
-  privacy: {
-    thirdPartyApiMode: true,
-  },
 };
 const store = mockStore(initialState);