fix: Revert "feat: add privacy mode"

app/scripts/constants/sentry-state.ts

@@ -246,7 +246,6 @@ export const SENTRY_BACKGROUND_STATE = {
       showNativeTokenAsMainBalance: true,
       petnamesEnabled: true,
       showConfirmationAdvancedDetails: true,
-      privacyMode: false,
     },
     useExternalServices: false,
     selectedAddress: false,

app/scripts/controllers/preferences-controller.test.ts

@@ -730,7 +730,6 @@ describe('preferences controller', () => {
       expect(controller.state.preferences).toStrictEqual({
         autoLockTimeLimit: undefined,
         showExtensionInFullSizeView: false,
-        privacyMode: false,
         showFiatInTestnets: false,
         showTestNetworks: false,
         smartTransactionsOptInStatus: true,
@@ -766,7 +765,6 @@ describe('preferences controller', () => {
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
-        privacyMode: false,
         redesignedConfirmationsEnabled: true,
         redesignedTransactionsEnabled: true,
         shouldShowAggregatedBalancePopover: true,

app/scripts/controllers/preferences-controller.ts

@@ -112,7 +112,6 @@ export type Preferences = {
   redesignedTransactionsEnabled: boolean;
   featureNotificationsEnabled: boolean;
   showMultiRpcModal: boolean;
-  privacyMode: boolean;
   isRedesignedConfirmationsDeveloperEnabled: boolean;
   showConfirmationAdvancedDetails: boolean;
   tokenSortConfig: {
@@ -222,7 +221,6 @@ export const getDefaultPreferencesControllerState =
       isRedesignedConfirmationsDeveloperEnabled: false,
       showConfirmationAdvancedDetails: false,
       showMultiRpcModal: false,
-      privacyMode: false,
       shouldShowAggregatedBalancePopover: true, // by default user should see popover;
       tokenSortConfig: {
         key: 'tokenFiatAmount',

app/scripts/fixtures/with-preferences.js

@@ -13,7 +13,6 @@ export const FIXTURES_PREFERENCES = {
     showNftAutodetectModal: false,
     isRedesignedConfirmationsDeveloperEnabled: false,
     showConfirmationAdvancedDetails: false,
-    privacyMode: false,
   },
   featureFlags: {
     sendHexData: true,

test/e2e/fixture-builder.js

@@ -75,7 +75,6 @@ function onboardingFixture() {
           hideZeroBalanceTokens: false,
           showExtensionInFullSizeView: false,
           showFiatInTestnets: false,
-          privacyMode: false,
           showTestNetworks: false,
           smartTransactionsOptInStatus: true,
           showNativeTokenAsMainBalance: true,

test/e2e/tests/metrics/errors.spec.js

@@ -885,7 +885,6 @@ describe('Sentry errors', function () {
       preferences: {
         autoLockTimeLimit: true, // Initialized as undefined
         showConfirmationAdvancedDetails: true,
-        privacyMode: false,
       },
       smartTransactionsState: {
         fees: {

test/integration/data/onboarding-completion-route.json

@@ -227,8 +227,7 @@
     "hideZeroBalanceTokens": false,
     "petnamesEnabled": true,
     "redesignedConfirmationsEnabled": true,
-    "featureNotificationsEnabled": false,
-    "privacyMode": false
+    "featureNotificationsEnabled": false
   },
   "preventPollingOnNetworkRestart": false,
   "previousAppVersion": "",

ui/components/app/assets/asset-list/native-token/native-token.tsx

@@ -8,19 +8,18 @@ import {
   getMultichainIsMainnet,
   getMultichainSelectedAccountCachedBalance,
 } from '../../../../../selectors/multichain';
-import { getPreferences } from '../../../../../selectors';
 import { TokenListItem } from '../../../../multichain';
 import { useIsOriginalNativeTokenSymbol } from '../../../../../hooks/useIsOriginalNativeTokenSymbol';
 import { AssetListProps } from '../asset-list';
 import { useNativeTokenBalance } from './use-native-token-balance';
+// import { getPreferences } from '../../../../../selectors';
 
 const NativeToken = ({ onClickAsset }: AssetListProps) => {
   const nativeCurrency = useSelector(getMultichainNativeCurrency);
   const isMainnet = useSelector(getMultichainIsMainnet);
   const { chainId, ticker, type, rpcUrl } = useSelector(
     getMultichainCurrentNetwork,
   );
-  const { privacyMode } = useSelector(getPreferences);
   const isOriginalNativeSymbol = useIsOriginalNativeTokenSymbol(
     chainId,
     ticker,
@@ -53,7 +52,6 @@ const NativeToken = ({ onClickAsset }: AssetListProps) => {
       isNativeCurrency
       isStakeable={isStakeable}
       showPercentage
-      privacyMode={privacyMode}
     />
   );
 };

ui/components/app/assets/token-cell/token-cell.test.tsx

@@ -5,7 +5,7 @@ import { fireEvent } from '@testing-library/react';
 import { useSelector } from 'react-redux';
 import { renderWithProvider } from '../../../../../test/lib/render-helpers';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
-import { getTokenList, getPreferences } from '../../../../selectors';
+import { getTokenList } from '../../../../selectors';
 import {
   getMultichainCurrentChainId,
   getMultichainIsEvm,
@@ -98,9 +98,6 @@ describe('Token Cell', () => {
   };
   const useSelectorMock = useSelector;
   (useSelectorMock as jest.Mock).mockImplementation((selector) => {
-    if (selector === getPreferences) {
-      return { privacyMode: false };
-    }
     if (selector === getTokenList) {
       return MOCK_GET_TOKEN_LIST;
     }

ui/components/app/assets/token-cell/token-cell.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
-import { getTokenList, getPreferences } from '../../../../selectors';
+import { getTokenList } from '../../../../selectors';
 import { useTokenFiatAmount } from '../../../../hooks/useTokenFiatAmount';
 import { TokenListItem } from '../../../multichain';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
@@ -23,7 +23,6 @@ export default function TokenCell({
   onClick,
 }: TokenCellProps) {
   const tokenList = useSelector(getTokenList);
-  const { privacyMode } = useSelector(getPreferences);
   const tokenData = Object.values(tokenList).find(
     (token) =>
       isEqualCaseInsensitive(token.symbol, symbol) &&
@@ -52,7 +51,6 @@ export default function TokenCell({
       isOriginalTokenSymbol={isOriginalTokenSymbol}
       address={address}
       showPercentage
-      privacyMode={privacyMode}
     />
   );
 }

ui/components/app/confirm/info/row/__snapshots__/currency.test.tsx.snap

@@ -12,7 +12,6 @@ exports[`ConfirmInfoRowCurrency should display in currency passed 1`] = `
     >
       <span
         class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-        data-testid="account-value-and-suffix"
       >
         $82.65
       </span>
@@ -38,7 +37,6 @@ exports[`ConfirmInfoRowCurrency should display value in user preferred currency
     >
       <span
         class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-        data-testid="account-value-and-suffix"
       >
         0.14861879
       </span>

ui/components/app/currency-input/__snapshots__/currency-input.test.js.snap

@@ -36,7 +36,6 @@ exports[`CurrencyInput Component rendering should disable unit input 1`] = `
       >
         <span
           class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-          data-testid="account-value-and-suffix"
         >
           $0.00
         </span>
@@ -90,7 +89,6 @@ exports[`CurrencyInput Component rendering should render properly with a fiat va
       >
         <span
           class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-          data-testid="account-value-and-suffix"
         >
           0.004327880204275946
         </span>
@@ -185,7 +183,6 @@ exports[`CurrencyInput Component rendering should render properly with an ETH va
       >
         <span
           class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-          data-testid="account-value-and-suffix"
         >
           $231.06
         </span>
@@ -240,7 +237,6 @@ exports[`CurrencyInput Component rendering should render properly without a suff
       >
         <span
           class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-          data-testid="account-value-and-suffix"
         >
           $0.00
         </span>

ui/components/app/modals/cancel-transaction/cancel-transaction-gas-fee/__snapshots__/cancel-transaction-gas-fee.component.test.js.snap

@@ -11,7 +11,6 @@ exports[`CancelTransactionGasFee Component should render 1`] = `
     >
       <span
         class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-        data-testid="account-value-and-suffix"
       >
         &lt;0.000001
       </span>
@@ -27,7 +26,6 @@ exports[`CancelTransactionGasFee Component should render 1`] = `
     >
       <span
         class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-        data-testid="account-value-and-suffix"
       >
         &lt;0.000001
       </span>

ui/components/app/user-preferenced-currency-display/__snapshots__/user-preferenced-currency-display.test.js.snap

@@ -8,7 +8,6 @@ exports[`UserPreferencedCurrencyDisplay Component rendering should match snapsho
   >
     <span
       class="mm-box mm-text currency-display-component__text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
-      data-testid="account-value-and-suffix"
     >
       0
     </span>

ui/components/app/wallet-overview/aggregated-percentage-overview.test.tsx

@@ -7,7 +7,6 @@ import {
   getSelectedAccount,
   getShouldHideZeroBalanceTokens,
   getTokensMarketData,
-  getPreferences,
 } from '../../../selectors';
 import { useAccountTotalFiatBalance } from '../../../hooks/useAccountTotalFiatBalance';
 import { AggregatedPercentageOverview } from './aggregated-percentage-overview';
@@ -23,7 +22,6 @@ jest.mock('../../../ducks/locale/locale', () => ({
 jest.mock('../../../selectors', () => ({
   getCurrentCurrency: jest.fn(),
   getSelectedAccount: jest.fn(),
-  getPreferences: jest.fn(),
   getShouldHideZeroBalanceTokens: jest.fn(),
   getTokensMarketData: jest.fn(),
 }));
@@ -34,7 +32,6 @@ jest.mock('../../../hooks/useAccountTotalFiatBalance', () => ({
 
 const mockGetIntlLocale = getIntlLocale as unknown as jest.Mock;
 const mockGetCurrentCurrency = getCurrentCurrency as jest.Mock;
-const mockGetPreferences = getPreferences as jest.Mock;
 const mockGetSelectedAccount = getSelectedAccount as unknown as jest.Mock;
 const mockGetShouldHideZeroBalanceTokens =
   getShouldHideZeroBalanceTokens as jest.Mock;
@@ -162,7 +159,6 @@ describe('AggregatedPercentageOverview', () => {
   beforeEach(() => {
     mockGetIntlLocale.mockReturnValue('en-US');
     mockGetCurrentCurrency.mockReturnValue('USD');
-    mockGetPreferences.mockReturnValue({ privacyMode: false });
     mockGetSelectedAccount.mockReturnValue(selectedAccountMock);
     mockGetShouldHideZeroBalanceTokens.mockReturnValue(false);
     mockGetTokensMarketData.mockReturnValue(marketDataMock);