Merge branch 'main' into refactor/encryptor-class

Author: gantunesr

app/actions/experimental/index.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/prefer-default-export */
-import { PPOMInitialisationStatusType } from '@metamask/ppom-validator';
 import type { Action } from 'redux';
 
 export enum ActionType {
@@ -11,12 +9,3 @@ export interface SetSecurityAlertsEnabled
   extends Action<ActionType.SET_SECURITY_ALERTS_ENABLED> {
   securityAlertsEnabled: boolean;
 }
-
-export function UpdatePPOMInitializationStatus(
-  ppomInitialisationStatus?: PPOMInitialisationStatusType,
-) {
-  return {
-    type: ActionType.SET_PPOM_INITIALIZATION_STATUS,
-    ppomInitialisationStatus,
-  };
-}

app/components/Nav/App/index.js

@@ -86,7 +86,6 @@ import EthSignFriction from '../../../components/Views/Settings/AdvancedSettings
 import WalletActions from '../../Views/WalletActions';
 import NetworkSelector from '../../../components/Views/NetworkSelector';
 import ReturnToAppModal from '../../Views/ReturnToAppModal';
-import BlockaidIndicator from '../../Views/Settings/SecuritySettings/BlockaidIndicator';
 import EditAccountName from '../../Views/EditAccountName/EditAccountName';
 import WC2Manager, {
   isWC2Enabled,
@@ -569,10 +568,6 @@ const App = ({ userLoggedIn }) => {
         name={Routes.SHEET.RETURN_TO_DAPP_MODAL}
         component={ReturnToAppModal}
       />
-      <Stack.Screen
-        name={Routes.SHEET.BLOCKAID_INDICATOR}
-        component={BlockaidIndicator}
-      />
       <Stack.Screen
         name={Routes.SHEET.AMBIGUOUS_ADDRESS}
         component={AmbiguousAddressSheet}

app/components/UI/Ramp/Views/BuildQuote/BuildQuote.tsx

@@ -458,8 +458,6 @@ const BuildQuote = () => {
   const handleChangePaymentMethod = useCallback(
     (paymentMethodId) => {
       if (paymentMethodId) {
-        setAmount('0');
-        setAmountNumber(0);
         setSelectedPaymentMethodId(paymentMethodId);
       }
       hidePaymentMethodModal();
@@ -666,12 +664,9 @@ const BuildQuote = () => {
     );
   }
 
-  let displayAmount;
-  if (isBuy) {
-    displayAmount = amountFocused ? amount : formatAmount(amountNumber);
-  } else {
-    displayAmount = `${amount} ${selectedAsset?.symbol}`;
-  }
+  const displayAmount = isBuy
+    ? formatAmount(amountNumber)
+    : `${amount} ${selectedAsset?.symbol}`;
 
   let quickAmounts: QuickAmount[] = [];
 

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

@@ -9,9 +9,7 @@ import Text, {
   TextVariant,
   TextColor,
 } from '../../../../component-library/components/Texts/Text';
-import { UpdatePPOMInitializationStatus } from '../../../../actions/experimental';
 import { getNavigationOptionsTitle } from '../../../UI/Navbar';
-import { useDispatch } from 'react-redux';
 import { Props } from './ExperimentalSettings.types';
 import createStyles from './ExperimentalSettings.styles';
 import Button, {
@@ -29,8 +27,6 @@ const storage = new MMKV(); // id: mmkv.default
  * Main view for app Experimental Settings
  */
 const ExperimentalSettings = ({ navigation, route }: Props) => {
-  const dispatch = useDispatch();
-
   const [sesEnabled, setSesEnabled] = useState(
     storage.getBoolean('is-ses-enabled'),
   );
@@ -46,10 +42,6 @@ const ExperimentalSettings = ({ navigation, route }: Props) => {
   const { colors } = theme;
   const styles = createStyles(colors);
 
-  useEffect(() => {
-    dispatch(UpdatePPOMInitializationStatus());
-  }, [dispatch]);
-
   useEffect(
     () => {
       navigation.setOptions(

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

@@ -25,6 +25,7 @@ import {
   setUseBlockieIcon,
   setHideZeroBalanceTokens,
 } from '../../../../actions/settings';
+import PickComponent from '../../PickComponent';
 import { toDataUrl } from '../../../../util/blockies.js';
 import Jazzicon from 'react-native-jazzicon';
 import { ThemeContext, mockTheme } from '../../../../util/theme';
@@ -149,6 +150,10 @@ class Settings extends PureComponent {
      * Active search engine
      */
     searchEngine: PropTypes.string,
+    /**
+     * Active primary currency
+     */
+    primaryCurrency: PropTypes.string,
     /**
      * Show a BlockieIcon instead of JazzIcon
      */
@@ -279,6 +284,7 @@ class Settings extends PureComponent {
   render() {
     const {
       currentCurrency,
+      primaryCurrency,
       useBlockieIcon,
       setUseBlockieIcon,
       selectedAddress,
@@ -313,6 +319,34 @@ class Settings extends PureComponent {
               </View>
             </View>
           </View>
+          <View style={styles.setting}>
+            <Text variant={TextVariant.BodyLGMedium}>
+              {strings('app_settings.primary_currency_title')}
+            </Text>
+            <Text
+              variant={TextVariant.BodyMD}
+              color={TextColor.Alternative}
+              style={styles.desc}
+            >
+              {strings('app_settings.primary_currency_desc')}
+            </Text>
+            {this.primaryCurrencyOptions && (
+              <View style={styles.accessory}>
+                <PickComponent
+                  pick={this.selectPrimaryCurrency}
+                  textFirst={strings(
+                    'app_settings.primary_currency_text_first',
+                  )}
+                  valueFirst={'ETH'}
+                  textSecond={strings(
+                    'app_settings.primary_currency_text_second',
+                  )}
+                  valueSecond={'Fiat'}
+                  selectedValue={primaryCurrency}
+                />
+              </View>
+            )}
+          </View>
           <View style={styles.setting}>
             <Text variant={TextVariant.BodyLGMedium}>
               {strings('app_settings.current_language')}