Merge branch 'main' into MMQA-1785-tier-4-rpc-mocks

Author: chrisleewilcox

.js.env.example

@@ -100,9 +100,6 @@ export MM_SAMPLE_FEATURE_COUNTER_ENABLED="true"
 # The endpoint used to submit errors and tracing data to Sentry for dev environment.
 # export MM_SENTRY_DSN_DEV=
 
-# Permissions Settings feature flag specific to UI changes
-export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""
-
 # Earn Variables
 ## Stablecoin Lending
 export MM_STABLECOIN_LENDING_UI_ENABLED="true"

app/components/Views/AccountsMenu/AccountsMenu.test.tsx

@@ -96,11 +96,6 @@ jest.mock('../../../../locales/i18n', () => ({
   strings: jest.fn((key: string) => key),
 }));
 
-jest.mock('../../../util/networks', () => ({
-  ...jest.requireActual('../../../util/networks'),
-  isPermissionsSettingsV1Enabled: true,
-}));
-
 jest.mock('../../UI/Ramp/hooks/useRampsUnifiedV1Enabled', () => ({
   __esModule: true,
   default: jest.fn(() => false),

app/components/Views/AccountsMenu/AccountsMenu.tsx

@@ -25,7 +25,6 @@ import Routes from '../../../constants/navigation/Routes';
 import { strings } from '../../../../locales/i18n';
 import { useAnalytics } from '../../hooks/useAnalytics/useAnalytics';
 import { AccountsMenuSelectorsIDs } from './AccountsMenu.testIds';
-import { isPermissionsSettingsV1Enabled } from '../../../util/networks';
 import useRampsUnifiedV1Enabled from '../../UI/Ramp/hooks/useRampsUnifiedV1Enabled';
 import useRampsUnifiedV2Enabled from '../../UI/Ramp/hooks/useRampsUnifiedV2Enabled';
 import AppConstants from '../../../core/AppConstants';
@@ -441,17 +440,15 @@ const AccountsMenu = () => {
         />
 
         {/* Permissions Row */}
-        {isPermissionsSettingsV1Enabled && (
-          <ActionListItem
-            startAccessory={
-              <Icon name={IconName.SecurityTick} size={IconSize.Lg} />
-            }
-            label={strings('accounts_menu.permissions')}
-            endAccessory={arrowRightIcon}
-            onPress={onPressPermissions}
-            testID={AccountsMenuSelectorsIDs.PERMISSIONS}
-          />
-        )}
+        <ActionListItem
+          startAccessory={
+            <Icon name={IconName.SecurityTick} size={IconSize.Lg} />
+          }
+          label={strings('accounts_menu.permissions')}
+          endAccessory={arrowRightIcon}
+          onPress={onPressPermissions}
+          testID={AccountsMenuSelectorsIDs.PERMISSIONS}
+        />
 
         {/* Networks Row */}
         <ActionListItem

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

@@ -52,11 +52,6 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-jest.mock('../../../util/networks', () => ({
-  ...jest.requireActual('../../../util/networks'),
-  isPermissionsSettingsV1Enabled: true,
-}));
-
 jest.mock('../../../util/notifications/constants/config', () => ({
   isNotificationsFeatureEnabled: jest.fn(() => true),
 }));

app/util/networks/index.js

@@ -802,9 +802,6 @@ export const getBlockExplorerTxUrl = (
 export const getIsNetworkOnboarded = (chainId, networkOnboardedState) =>
   networkOnboardedState[chainId];
 
-export const isPermissionsSettingsV1Enabled =
-  process.env.MM_PERMISSIONS_SETTINGS_V1_ENABLED === 'true';
-
 // The whitelisted network names for the given chain IDs to prevent showing warnings on Network Settings.
 export const WHILELIST_NETWORK_NAME = {
   [ChainId.mainnet]: 'Mainnet',

bitrise.yml

@@ -3493,9 +3493,6 @@ app:
     - opts:
         is_expand: false
       MM_NETWORK_UI_REDESIGN_ENABLED: false
-    - opts:
-        is_expand: false
-      MM_PERMISSIONS_SETTINGS_V1_ENABLED: false
     - opts:
         is_expand: false
       MM_SECURITY_ALERTS_API_ENABLED: true

builds.yml

@@ -40,7 +40,6 @@ _public_envs: &public_envs # Servers (production)
   IS_TEST: 'false'
   SEEDLESS_ONBOARDING_ENABLED: 'true'
   MM_NOTIFICATIONS_UI_ENABLED: 'true'
-  MM_PERMISSIONS_SETTINGS_V1_ENABLED: 'false'
   MM_PERPS_BLOCKED_REGIONS: 'US,CA-ON,GB,BE'
   MM_PERPS_HIP3_ALLOWLIST_MARKETS: ''
   MM_PERPS_HIP3_BLOCKLIST_MARKETS: ''